fix: trying to set property to use with Maven Release Plugin

tomasbjerre · Sep 26, 2023 · 0ee2298 · 0ee2298
1 parent a9e1fef
commit 0ee2298
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -126,8 +126,9 @@ Summary
 Release and sign with:
 
 ```sh
- ./mvnw release:prepare release:perform -B \
- se.bjurr.gitchangelog:git-changelog-maven-plugin:git-changelog \
+ ./mvnw se.bjurr.gitchangelog:git-changelog-maven-plugin:semantic-version \
+  && ./mvnw release:prepare release:perform -B \
+  && ./mvnw se.bjurr.gitchangelog:git-changelog-maven-plugin:git-changelog \
   && git commit -a -m "chore: updating changelog" \
   && git push \
   || git clean -f

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>se.bjurr.bom</groupId>
 	<artifactId>bjurr-bom</artifactId>
-	<version>0.8.7-SNAPSHOT</version>
+	<version>0.9.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Bjurr BOM</name>
 	<description>My BOM.</description>
@@ -133,24 +133,16 @@
 				<artifactId>maven-release-plugin</artifactId>
 				<version>3.0.1</version>
 				<configuration>
-					<scmShallowClone>false</scmShallowClone>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release-sign-artifacts</releaseProfiles>
-					<preparationGoals>
-						se.bjurr.gitchangelog:git-changelog-maven-plugin:semantic-version</preparationGoals>
-					<completionGoals>
-						se.bjurr.gitchangelog:git-changelog-maven-plugin:git-changelog</completionGoals>
-					<checkModificationExcludeList>
-						CHANGELOG.md,pom.xml
-					</checkModificationExcludeList>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>se.bjurr.gitchangelog</groupId>
 				<artifactId>git-changelog-maven-plugin</artifactId>
 				<version>${changelog.version}</version>
 				<configuration>
-					<updatePomWithNextSemanticVersionSuffixSnapshot>false</updatePomWithNextSemanticVersionSuffixSnapshot>
+					<updatePomWithCurrentSemanticVersionSuffixSnapshot>true</updatePomWithCurrentSemanticVersionSuffixSnapshot>
 					<updatePomWithCurrentSemanticVersionSuffixSnapshotIfNotTagged>
 						false</updatePomWithCurrentSemanticVersionSuffixSnapshotIfNotTagged>
 					<readableTagName>.*-(.*)$</readableTagName>
@@ -286,31 +278,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>se.bjurr.gitchangelog</groupId>
-						<artifactId>git-changelog-maven-plugin</artifactId>
-						<version>${changelog.version}</version>
-						<executions>
-							<execution>
-								<id>GitChangelogStuff</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>semantic-version</goal>
-									<goal>git-changelog</goal>
-								</goals>
-								<configuration>
-									<updatePomWithNextSemanticVersionSuffixSnapshot>
-										false</updatePomWithNextSemanticVersionSuffixSnapshot>
-									<updatePomWithCurrentSemanticVersionSuffixSnapshotIfNotTagged>
-										false</updatePomWithCurrentSemanticVersionSuffixSnapshotIfNotTagged>
-									<readableTagName>.*-(.*)$</readableTagName>
-									<ignoreCommitsIfMessageMatches>
-										^\[maven-release-plugin\].*|^Merge.*
-									</ignoreCommitsIfMessageMatches>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>