Merge branch 'release/1.0.0'

This commit is contained in:
Emanuel Zienecker 2019-04-29 08:43:30 +02:00
commit 30363bf2bc
2 changed files with 11 additions and 11 deletions

View File

@ -88,9 +88,7 @@ Now if you call the actuator endpoint `actuator/health` you should see the follo
Creating a new release involves the following steps: Creating a new release involves the following steps:
. `./mvnw -DenableSshAgent=true jgitflow:release-start jgitflow:release-finish` + . `./mvnw gitflow:release-start gitflow:release-finish`
[NOTE]
The `-DenableSshAgent=true` is only necessary, if you cloned the repository via SSH.
. `git push origin master` . `git push origin master`
. `git push --tags` . `git push --tags`
. `git push origin develop` . `git push origin develop`

18
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.deviceinsight.kafka</groupId> <groupId>com.deviceinsight.kafka</groupId>
<artifactId>kafka-health-check</artifactId> <artifactId>kafka-health-check</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Kafka Health Check</name> <name>Kafka Health Check</name>
@ -25,7 +25,7 @@
<!-- Versions --> <!-- Versions -->
<junit.jupiter.version>5.3.2</junit.jupiter.version> <junit.jupiter.version>5.3.2</junit.jupiter.version>
<docker-maven-plugin.version>0.27.2</docker-maven-plugin.version> <docker-maven-plugin.version>0.27.2</docker-maven-plugin.version>
<jgitflow-maven-plugin.version>1.0-m5.1</jgitflow-maven-plugin.version> <gitflow-maven-plugin.version>1.12.0</gitflow-maven-plugin.version>
<spring-boot.version>2.1.3.RELEASE</spring-boot.version> <spring-boot.version>2.1.3.RELEASE</spring-boot.version>
<spring.kafka.version>2.2.4.RELEASE</spring.kafka.version> <spring.kafka.version>2.2.4.RELEASE</spring.kafka.version>
@ -114,13 +114,15 @@
<version>${maven-surefire-plugin.version}</version> <version>${maven-surefire-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>external.atlassian.jgitflow</groupId> <groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>jgitflow-maven-plugin</artifactId> <artifactId>gitflow-maven-plugin</artifactId>
<version>${jgitflow-maven-plugin.version}</version> <version>${gitflow-maven-plugin.version}</version>
<configuration> <configuration>
<autoVersionSubmodules>true</autoVersionSubmodules> <pushRemote>false</pushRemote>
<noDeploy>true</noDeploy> <gitFlowConfig>
<useReleaseProfile>false</useReleaseProfile> <developmentBranch>develop</developmentBranch>
</gitFlowConfig>
<versionDigitToIncrement>1</versionDigitToIncrement>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>