feat: using new build scripts

tomasbjerre · tomasbjerre · commit ad7cb428b3d9 · 2024-10-03T19:54:02.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -1,39 +1,20 @@
-apply plugin: 'java-library'
-
-buildscript {
- repositories {
-  mavenCentral()
-  mavenLocal()
- }
- dependencies {
-  classpath 'se.bjurr.gradle:gradle-scripts:2.+'
- }
+plugins {
+	id "se.bjurr.gradle.conventional-release" version "0.+"
+	id "se.bjurr.gradle.update-versions" version "0.+"
+	id "se.bjurr.gradle.java-convention" version "0.+"
 }
-project.ext.buildConfig = [
-  repoType: "COMMAND",
-  publishing: [
-    relocate: [
-      "org:org",
-      "com:com"
-    ]
-  ],
-  manifest: [
-    mainClass: 'se.bjurr.gitchangelog.main.Main'
-  ]
-]
-apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
 
 shadowJar {
-  exclude 'META-INF/versions/21/**'
+	exclude 'META-INF/versions/21/**'
 }
 
 dependencies {
- implementation 'se.bjurr.gitchangelog:git-changelog-lib:2.1.3'
- implementation 'se.softhouse:jargo:0.4.14'
- implementation 'org.slf4j:slf4j-simple:2.0.6'
- implementation 'com.google.code.gson:gson:2.10.1'
- implementation 'org.openjdk.nashorn:nashorn-core:15.4'
+	implementation 'se.bjurr.gitchangelog:git-changelog-lib:2.1.3'
+	implementation 'se.softhouse:jargo:0.4.14'
+	implementation 'org.slf4j:slf4j-simple:2.0.6'
+	implementation 'com.google.code.gson:gson:2.10.1'
+	implementation 'org.openjdk.nashorn:nashorn-core:15.4'
 
- testImplementation 'junit:junit:4.13.2'
+	testImplementation 'junit:junit:4.13.2'
 }
 
diff --git a/changelog.json b/changelog.json
@@ -1,27 +1,33 @@
 {
- "templatePath": "changelog.json",
-
- "fromRepo": ".",
- "fromCommit": "0000000000000000000000000000000000000000",
- "toRef": "refs/heads/master",
- 
- "ignoreCommitsIfMessageMatches": "^\\[maven-release-plugin\\].*|^\\[Gradle Release Plugin\\].*|^Merge.*",
- "readableTagName": "/([^/]+?)$",
- "dateFormat": "YYYY-MM-dd HH:mm:ss",
- "untaggedName": "Next release",
- "noIssueName": "Other changes",
- "timeZone": "UTC",
- "removeIssueFromMessage": "true",
-
- "jiraServer": "https://jiraserver/jira",
- "jiraIssuePattern": "\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b",
-
- "gitHubApi": "https://api.github.com/repos/tomasbjerre/git-changelog-command-line",
- "gitHubIssuePattern": "#([0-9]+)",
-
- "customIssues": [
-  { "name": "Incident", "pattern": "INC[0-9]*", "link": "http://inc/${PATTERN_GROUP}" },
-  { "name": "CQ", "pattern": "CQ([0-9]+)", "link": "http://cq/${PATTERN_GROUP_1}" },
-  { "name": "Bugs", "pattern": "#bug" }
- ]
+  "templatePath": "changelog.json",
+  "fromRepo": ".",
+  "fromCommit": "0000000000000000000000000000000000000000",
+  "toRef": "refs/heads/master",
+  "ignoreCommitsIfMessageMatches": "^\\[maven-release-plugin\\].*|^\\[Gradle Release Plugin\\].*|^Merge.*",
+  "readableTagName": "/([^/]+?)$",
+  "dateFormat": "YYYY-MM-dd HH:mm:ss",
+  "untaggedName": "Next release",
+  "noIssueName": "Other changes",
+  "timeZone": "UTC",
+  "removeIssueFromMessage": "true",
+  "jiraServer": "https://jiraserver/jira",
+  "jiraIssuePattern": "\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b",
+  "gitHubApi": "https://api.github.com/repos/tomasbjerre/git-changelog-command-line",
+  "gitHubIssuePattern": "#([0-9]+)",
+  "customIssues": [
+    {
+      "name": "Incident",
+      "pattern": "INC[0-9]*",
+      "link": "http://inc/${PATTERN_GROUP}"
+    },
+    {
+      "name": "CQ",
+      "pattern": "CQ([0-9]+)",
+      "link": "http://cq/${PATTERN_GROUP_1}"
+    },
+    {
+      "name": "Bugs",
+      "pattern": "#bug"
+    }
+  ]
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,8 @@
-#Sun Jul 07 08:01:20 CEST 2024
+#
+#Thu Oct 03 19:53:35 CEST 2024
 description="Command line tool that generates changelog from a GIT repository."
-version=2.3.0
 group=se.bjurr.gitchangelog
+mainClass=se.bjurr.gitchangelog.main.Main
+relocate=org\:org,com\:com
+repoType=COMMAND
+version=2.3.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,7 @@
+pluginManagement {
+	repositories {
+		gradlePluginPortal()
+		mavenCentral()
+		mavenLocal()
+	}
+}
diff --git a/src/main/java/se/bjurr/gitchangelog/main/Main.java b/src/main/java/se/bjurr/gitchangelog/main/Main.java
@@ -649,7 +649,8 @@ public static void main(final String args[]) throws Exception {
       }
       if (arg.wasGiven(ignoreCommitsOlderThanArgument)) {
         final Date date =
-            new SimpleDateFormat(DEFAULT_DATEFORMAT).parse(arg.get(ignoreCommitsOlderThanArgument));
+            new SimpleDateFormat(DEFAULT_DATEFORMAT) // NOPMD
+                .parse(arg.get(ignoreCommitsOlderThanArgument));
         changelogApiBuilder.withIgnoreCommitsOlderThan(date);
       }
       if (arg.wasGiven(ignoreTagsIfNameMatchesArgument)) {
@@ -826,49 +827,50 @@ public static void main(final String args[]) throws Exception {
       }
 
       if (arg.wasGiven(showDebugInfo)) {
-        System.out.println(
+        System.out.println( // NOPMD
             "Settings:\n"
                 + new GsonBuilder()
                     .setPrettyPrinting()
                     .create()
                     .toJson(changelogApiBuilder.getSettings()));
-        System.out.println("Template:\n\n" + changelogApiBuilder.getTemplateString() + "\n\n");
+        System.out.println( // NOPMD
+            "Template:\n\n" + changelogApiBuilder.getTemplateString() + "\n\n"); // NOPMD
         final byte[] template =
             changelogApiBuilder.getTemplateString().getBytes(StandardCharsets.UTF_8);
         for (final byte element : template) {
           System.out.format("%02X ", element);
         }
-        System.out.println();
+        System.out.println(); // NOPMD
       }
 
       if (arg.wasGiven(printHighestVersion)) {
         final String version = changelogApiBuilder.getHighestSemanticVersion().toString();
-        System.out.println(version);
+        System.out.println(version); // NOPMD
         System.exit(0);
       }
 
       if (arg.wasGiven(printHighestVersionTag)) {
         final SemanticVersion highestSemanticVersion =
             changelogApiBuilder.getHighestSemanticVersion();
         final String tag = highestSemanticVersion.findTag().orElse("");
-        System.out.println(tag);
+        System.out.println(tag); // NOPMD
         System.exit(0);
       }
 
       if (arg.wasGiven(printNextVersion)) {
         final String version = changelogApiBuilder.getNextSemanticVersion().toString();
-        System.out.println(version);
+        System.out.println(version); // NOPMD
         System.exit(0);
       }
 
       if (arg.wasGiven(printCurrentVersion)) {
         final String version = changelogApiBuilder.getCurrentSemanticVersion().toString();
-        System.out.println(version);
+        System.out.println(version); // NOPMD
         System.exit(0);
       }
 
     } catch (final ArgumentException exception) {
-      System.out.println(exception.getMessageAndUsage());
+      System.out.println(exception.getMessageAndUsage()); // NOPMD
       System.exit(1);
     }
   }
@@ -891,7 +893,7 @@ private static void systemOutPrintln(final String systemOutPrintln) {
     if (Main.recordSystemOutPrintln) {
       Main.systemOutPrintln = systemOutPrintln;
     } else {
-      System.out.println(systemOutPrintln);
+      System.out.println(systemOutPrintln); // NOPMD
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`# See the License for the specific language governing permissions and`
`16`	`16`	`# limitations under the License.`
`17`	`17`	`#`
	`18`	`+# SPDX-License-Identifier: Apache-2.0`
	`19`	`+#`
`18`	`20`
`19`	`21`	`##############################################################################`
`20`	`22`	`#`
`@@ -55,7 +57,7 @@`
`55`	`57`	`# Darwin, MinGW, and NonStop.`
`56`	`58`	`#`
`57`	`59`	`# (3) This script is generated from the Groovy template`
`58`		`-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
	`60`	`+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
`59`	`61`	`# within the Gradle project.`
`60`	`62`	`#`
`61`	`63`	`# You can find Gradle at https://github.com/gradle/gradle/.`
`@@ -84,7 +86,8 @@ done`
`84`	`86`	`# shellcheck disable=SC2034`
`85`	`87`	`APP_BASE_NAME=${0##*/}`
`86`	`88`	`# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)`
`87`		`-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) \|\| exit`
	`89`	`+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s`
	`90`	`+' "$PWD" ) \|\| exit`
`88`	`91`
`89`	`92`	`# Use the maximum available, or set MAX_FD != -1 to use that value.`
`90`	`93`	`MAX_FD=maximum`
Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,8 @@ public static void main(final String args[]) throws Exception {`
`649`	`649`	`}`
`650`	`650`	`if (arg.wasGiven(ignoreCommitsOlderThanArgument)) {`
`651`	`651`	`final Date date =`
`652`		`- new SimpleDateFormat(DEFAULT_DATEFORMAT).parse(arg.get(ignoreCommitsOlderThanArgument));`
	`652`	`+ new SimpleDateFormat(DEFAULT_DATEFORMAT) // NOPMD`
	`653`	`+ .parse(arg.get(ignoreCommitsOlderThanArgument));`
`653`	`654`	`changelogApiBuilder.withIgnoreCommitsOlderThan(date);`
`654`	`655`	`}`
`655`	`656`	`if (arg.wasGiven(ignoreTagsIfNameMatchesArgument)) {`
`@@ -826,49 +827,50 @@ public static void main(final String args[]) throws Exception {`
`826`	`827`	`}`
`827`	`828`
`828`	`829`	`if (arg.wasGiven(showDebugInfo)) {`
`829`		`- System.out.println(`
	`830`	`+ System.out.println( // NOPMD`
`830`	`831`	`"Settings:\n"`
`831`	`832`	`+ new GsonBuilder()`
`832`	`833`	`.setPrettyPrinting()`
`833`	`834`	`.create()`
`834`	`835`	`.toJson(changelogApiBuilder.getSettings()));`
`835`		`- System.out.println("Template:\n\n" + changelogApiBuilder.getTemplateString() + "\n\n");`
	`836`	`+ System.out.println( // NOPMD`
	`837`	`+ "Template:\n\n" + changelogApiBuilder.getTemplateString() + "\n\n"); // NOPMD`
`836`	`838`	`final byte[] template =`
`837`	`839`	`changelogApiBuilder.getTemplateString().getBytes(StandardCharsets.UTF_8);`
`838`	`840`	`for (final byte element : template) {`
`839`	`841`	`System.out.format("%02X ", element);`
`840`	`842`	`}`
`841`		`- System.out.println();`
	`843`	`+ System.out.println(); // NOPMD`
`842`	`844`	`}`
`843`	`845`
`844`	`846`	`if (arg.wasGiven(printHighestVersion)) {`
`845`	`847`	`final String version = changelogApiBuilder.getHighestSemanticVersion().toString();`
`846`		`- System.out.println(version);`
	`848`	`+ System.out.println(version); // NOPMD`
`847`	`849`	`System.exit(0);`
`848`	`850`	`}`
`849`	`851`
`850`	`852`	`if (arg.wasGiven(printHighestVersionTag)) {`
`851`	`853`	`final SemanticVersion highestSemanticVersion =`
`852`	`854`	`changelogApiBuilder.getHighestSemanticVersion();`
`853`	`855`	`final String tag = highestSemanticVersion.findTag().orElse("");`
`854`		`- System.out.println(tag);`
	`856`	`+ System.out.println(tag); // NOPMD`
`855`	`857`	`System.exit(0);`
`856`	`858`	`}`
`857`	`859`
`858`	`860`	`if (arg.wasGiven(printNextVersion)) {`
`859`	`861`	`final String version = changelogApiBuilder.getNextSemanticVersion().toString();`
`860`		`- System.out.println(version);`
	`862`	`+ System.out.println(version); // NOPMD`
`861`	`863`	`System.exit(0);`
`862`	`864`	`}`
`863`	`865`
`864`	`866`	`if (arg.wasGiven(printCurrentVersion)) {`
`865`	`867`	`final String version = changelogApiBuilder.getCurrentSemanticVersion().toString();`
`866`		`- System.out.println(version);`
	`868`	`+ System.out.println(version); // NOPMD`
`867`	`869`	`System.exit(0);`
`868`	`870`	`}`
`869`	`871`
`870`	`872`	`} catch (final ArgumentException exception) {`
`871`		`- System.out.println(exception.getMessageAndUsage());`
	`873`	`+ System.out.println(exception.getMessageAndUsage()); // NOPMD`
`872`	`874`	`System.exit(1);`
`873`	`875`	`}`
`874`	`876`	`}`
`@@ -891,7 +893,7 @@ private static void systemOutPrintln(final String systemOutPrintln) {`
`891`	`893`	`if (Main.recordSystemOutPrintln) {`
`892`	`894`	`Main.systemOutPrintln = systemOutPrintln;`
`893`	`895`	`} else {`
`894`		`- System.out.println(systemOutPrintln);`
	`896`	`+ System.out.println(systemOutPrintln); // NOPMD`
`895`	`897`	`}`
`896`	`898`	`}`
`897`	`899`	`}`