Merge pull request 'Новая система релизов' (#8) from refact/new-releases-system into develop
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #8
This commit is contained in:
commit
cc9e296daf
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.struchkov.bot.gitlab</groupId>
|
<groupId>dev.struchkov.bot.gitlab</groupId>
|
||||||
<artifactId>gitlab-bot</artifactId>
|
<artifactId>gitlab-bot</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>bot-context</artifactId>
|
<artifactId>bot-context</artifactId>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.struchkov.bot.gitlab</groupId>
|
<groupId>dev.struchkov.bot.gitlab</groupId>
|
||||||
<artifactId>gitlab-bot</artifactId>
|
<artifactId>gitlab-bot</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>bot-core</artifactId>
|
<artifactId>bot-core</artifactId>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.struchkov.bot.gitlab</groupId>
|
<groupId>dev.struchkov.bot.gitlab</groupId>
|
||||||
<artifactId>gitlab-bot</artifactId>
|
<artifactId>gitlab-bot</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>bot-data</artifactId>
|
<artifactId>bot-data</artifactId>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.struchkov.bot.gitlab</groupId>
|
<groupId>dev.struchkov.bot.gitlab</groupId>
|
||||||
<artifactId>gitlab-bot</artifactId>
|
<artifactId>gitlab-bot</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>gitlab-app</artifactId>
|
<artifactId>gitlab-app</artifactId>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.struchkov.bot.gitlab</groupId>
|
<groupId>dev.struchkov.bot.gitlab</groupId>
|
||||||
<artifactId>gitlab-bot</artifactId>
|
<artifactId>gitlab-bot</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>gitlab-sdk</artifactId>
|
<artifactId>gitlab-sdk</artifactId>
|
||||||
|
47
pom.xml
47
pom.xml
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<groupId>dev.struchkov.bot.gitlab</groupId>
|
<groupId>dev.struchkov.bot.gitlab</groupId>
|
||||||
<artifactId>gitlab-bot</artifactId>
|
<artifactId>gitlab-bot</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@ -44,13 +44,16 @@
|
|||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
|
||||||
<godfather.telegram.core.version>0.0.44</godfather.telegram.core.version>
|
<godfather.telegram.core.version>0.0.47</godfather.telegram.core.version>
|
||||||
|
|
||||||
<javax.persistance.version>2.2</javax.persistance.version>
|
<javax.persistance.version>2.2</javax.persistance.version>
|
||||||
|
|
||||||
<google.guava.version>31.1-jre</google.guava.version>
|
<google.guava.version>31.1-jre</google.guava.version>
|
||||||
<jackson.databind.version>2.14.1</jackson.databind.version>
|
<jackson.databind.version>2.14.1</jackson.databind.version>
|
||||||
<jackson.datatype.jsr310.version>2.14.1</jackson.datatype.jsr310.version>
|
<jackson.datatype.jsr310.version>2.14.1</jackson.datatype.jsr310.version>
|
||||||
|
|
||||||
|
<plugin.maven.compiler.version>3.10.1</plugin.maven.compiler.version>
|
||||||
|
<plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
@ -202,21 +205,59 @@
|
|||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.9.0</version>
|
<version>${plugin.maven.compiler.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>${java.version}</source>
|
<source>${java.version}</source>
|
||||||
<target>${java.version}</target>
|
<target>${java.version}</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-release-plugin</artifactId>
|
||||||
|
<version>${plugin.maven.release.ver}</version>
|
||||||
|
<configuration>
|
||||||
|
<preparationGoals>clean compile</preparationGoals>
|
||||||
|
<goals>package</goals>
|
||||||
|
<tagNameFormat>v.@{project.version}</tagNameFormat>
|
||||||
|
<autoVersionSubmodules>true</autoVersionSubmodules>
|
||||||
|
<pushChanges>false</pushChanges>
|
||||||
|
<localCheckout>true</localCheckout>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>release</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-release-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
<developer>
|
<developer>
|
||||||
<id>uPagge</id>
|
<id>uPagge</id>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.struchkov.bot.gitlab</groupId>
|
<groupId>dev.struchkov.bot.gitlab</groupId>
|
||||||
<artifactId>gitlab-bot</artifactId>
|
<artifactId>gitlab-bot</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>telegram-bot</artifactId>
|
<artifactId>telegram-bot</artifactId>
|
||||||
|
Loading…
Reference in New Issue
Block a user