Merge remote-tracking branch 'origin/main'

AlexProgrammerDE · AlexProgrammerDE · commit 63ec84a768c1 · 2025-04-23T19:57:18.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,42 +48,47 @@ jobs:
         configurationJson: |
           {
             "template": "#{{CHANGELOG}}",
+            "commit_template": "- [`#{{SHORT_MERGE_SHA}}`](https://github.com/AlexProgrammerDE/PistonChat/commit/#{{MERGE_SHA}}) #{{TITLE}} by @#{{AUTHOR}}",
             "categories": [
               {
-                  "title": "## Feature",
+                  "title": "## 🚀 Features",
                   "labels": ["feat", "feature"]
               },
               {
-                  "title": "## Fix",
+                  "title": "## 🐛 Fixes",
                   "labels": ["fix", "bug"]
               },
               {
-                  "title": "## Performance",
+                  "title": "## 🏎️ Performance",
                   "labels": ["perf"]
               },
               {
-                  "title": "## Refactor",
+                  "title": "## 🏗 Refactor",
                   "labels": ["refactor"]
               },
               {
-                  "title": "## Documentation",
+                  "title": "## 📝 Documentation",
                   "labels": ["docs"]
               },
               {
-                  "title": "## Build",
+                  "title": "## 🔨 Build",
                   "labels": ["build", "chore", "ci"]
               },
               {
-                  "title": "## Style",
+                  "title": "## 💅 Style",
                   "labels": ["style"]
               },
               {
-                  "title": "## Test",
+                  "title": "## 🧪 Tests",
                   "labels": ["test"]
               },
               {
-                  "title": "## Other",
+                  "title": "## 💬 Other",
                   "labels": []
+              },
+              {
+                "title": "## 📦 Dependencies",
+                "labels": ["dependencies"]
               }
             ],
             "label_extractor": [
@@ -92,6 +97,16 @@ jobs:
                 "on_property": "title",
                 "target": "$1"
               }
+            ],
+            "custom_placeholders": [
+              {
+                "name": "SHORT_MERGE_SHA",
+                "source": "MERGE_SHA",
+                "transformer": {
+                  "pattern": "^([0-9a-f]{7})[0-9a-f]*$",
+                  "target": "$1"
+                }
+              }
             ]
           }
       env:
diff --git a/PistonFilter/build.gradle.kts b/PistonFilter/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2")
     implementation("org.bstats:bstats-bukkit:3.1.0")
-    implementation("org.apache.commons:commons-collections4:4.4")
+    implementation("org.apache.commons:commons-collections4:4.5.0")
 }
 
 tasks {
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 
-maven_version=2.0.1
+maven_version=2.0.2-SNAPSHOT

Original file line number	Diff line number	Diff line change
`@@ -48,42 +48,47 @@ jobs:`
`48`	`48`	`configurationJson: \|`
`49`	`49`	`{`
`50`	`50`	`"template": "#{{CHANGELOG}}",`
	`51`	+ "commit_template": "- [`#{{SHORT_MERGE_SHA}}`](https://github.com/AlexProgrammerDE/PistonChat/commit/#{{MERGE_SHA}}) #{{TITLE}} by @#{{AUTHOR}}",
`51`	`52`	`"categories": [`
`52`	`53`	`{`
`53`		`- "title": "## Feature",`
	`54`	`+ "title": "## 🚀 Features",`
`54`	`55`	`"labels": ["feat", "feature"]`
`55`	`56`	`},`
`56`	`57`	`{`
`57`		`- "title": "## Fix",`
	`58`	`+ "title": "## 🐛 Fixes",`
`58`	`59`	`"labels": ["fix", "bug"]`
`59`	`60`	`},`
`60`	`61`	`{`
`61`		`- "title": "## Performance",`
	`62`	`+ "title": "## 🏎️ Performance",`
`62`	`63`	`"labels": ["perf"]`
`63`	`64`	`},`
`64`	`65`	`{`
`65`		`- "title": "## Refactor",`
	`66`	`+ "title": "## 🏗 Refactor",`
`66`	`67`	`"labels": ["refactor"]`
`67`	`68`	`},`
`68`	`69`	`{`
`69`		`- "title": "## Documentation",`
	`70`	`+ "title": "## 📝 Documentation",`
`70`	`71`	`"labels": ["docs"]`
`71`	`72`	`},`
`72`	`73`	`{`
`73`		`- "title": "## Build",`
	`74`	`+ "title": "## 🔨 Build",`
`74`	`75`	`"labels": ["build", "chore", "ci"]`
`75`	`76`	`},`
`76`	`77`	`{`
`77`		`- "title": "## Style",`
	`78`	`+ "title": "## 💅 Style",`
`78`	`79`	`"labels": ["style"]`
`79`	`80`	`},`
`80`	`81`	`{`
`81`		`- "title": "## Test",`
	`82`	`+ "title": "## 🧪 Tests",`
`82`	`83`	`"labels": ["test"]`
`83`	`84`	`},`
`84`	`85`	`{`
`85`		`- "title": "## Other",`
	`86`	`+ "title": "## 💬 Other",`
`86`	`87`	`"labels": []`
	`88`	`+ },`
	`89`	`+ {`
	`90`	`+ "title": "## 📦 Dependencies",`
	`91`	`+ "labels": ["dependencies"]`
`87`	`92`	`}`
`88`	`93`	`],`
`89`	`94`	`"label_extractor": [`
`@@ -92,6 +97,16 @@ jobs:`
`92`	`97`	`"on_property": "title",`
`93`	`98`	`"target": "$1"`
`94`	`99`	`}`
	`100`	`+ ],`
	`101`	`+ "custom_placeholders": [`
	`102`	`+ {`
	`103`	`+ "name": "SHORT_MERGE_SHA",`
	`104`	`+ "source": "MERGE_SHA",`
	`105`	`+ "transformer": {`
	`106`	`+ "pattern": "^([0-9a-f]{7})[0-9a-f]*$",`
	`107`	`+ "target": "$1"`
	`108`	`+ }`
	`109`	`+ }`
`95`	`110`	`]`
`96`	`111`	`}`
`97`	`112`	`env:`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ dependencies {`
`15`	`15`	`testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2")`
`16`	`16`	`testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2")`
`17`	`17`	`implementation("org.bstats:bstats-bukkit:3.1.0")`
`18`		`- implementation("org.apache.commons:commons-collections4:4.4")`
	`18`	`+ implementation("org.apache.commons:commons-collections4:4.5.0")`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`tasks {`