User: rednesto
Date: 16 Jun 23 22:38
Revision: 8083227bf6b4ca01efd3609039e7fb9aed077551
Summary:
Use underscores in maven version keys

It seems the Velocity engine update now forbids hyphens by default

Fixes #2063


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8520&personal=false

Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision c1b832a2185b7c138dbba1c4b4b37d81c1e6094f)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 8083227bf6b4ca01efd3609039e7fb9aed077551)
@@ -53,6 +53,7 @@
 private val pluginVersions by lazy {
     runBlocking {
         getVersionJson<Map<String, String>>("maven.json")
+            .mapKeys { (k, _) -> k.replace('-', '_') }
     }
 }
 
Index: src/main/resources/fileTemplates/j2ee/bukkit/Bukkit pom.xml.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/bukkit/Bukkit pom.xml.ft	(revision c1b832a2185b7c138dbba1c4b4b37d81c1e6094f)
+++ src/main/resources/fileTemplates/j2ee/bukkit/Bukkit pom.xml.ft	(revision 8083227bf6b4ca01efd3609039e7fb9aed077551)
@@ -21,7 +21,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin-version}</version>
+        <version>${maven_compiler_plugin_version}</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -30,7 +30,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>${maven-shade-plugin-version}</version>
+        <version>${maven_shade_plugin_version}</version>
         <executions>
           <execution>
             <phase>package</phase>
Index: src/main/resources/fileTemplates/j2ee/bungeecord/BungeeCord pom.xml.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/bungeecord/BungeeCord pom.xml.ft	(revision c1b832a2185b7c138dbba1c4b4b37d81c1e6094f)
+++ src/main/resources/fileTemplates/j2ee/bungeecord/BungeeCord pom.xml.ft	(revision 8083227bf6b4ca01efd3609039e7fb9aed077551)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin-version}</version>
+        <version>${maven_compiler_plugin_version}</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -31,7 +31,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>${maven-shade-plugin-version}</version>
+        <version>${maven_shade_plugin_version}</version>
         <executions>
           <execution>
             <phase>package</phase>
Index: src/main/resources/fileTemplates/j2ee/sponge/Sponge pom.xml.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/sponge/Sponge pom.xml.ft	(revision c1b832a2185b7c138dbba1c4b4b37d81c1e6094f)
+++ src/main/resources/fileTemplates/j2ee/sponge/Sponge pom.xml.ft	(revision 8083227bf6b4ca01efd3609039e7fb9aed077551)
@@ -24,7 +24,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>${maven-source-plugin-version}</version>
+                        <version>${maven_source_plugin_version}</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -37,7 +37,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>${maven-javadoc-plugin-version}</version>
+                        <version>${maven_javadoc_plugin_version}</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -50,7 +50,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven-gpg-plugin-version}</version>
+                        <version>${maven_gpg_plugin_version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -83,7 +83,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin-version}</version>
+                <version>${maven_compiler_plugin_version}</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>templating-maven-plugin</artifactId>
-                <version>${templating-maven-plugin-version}</version>
+                <version>${templating_maven_plugin_version}</version>
                 <executions>
                     <execution>
                         <id>filter-src</id>
@@ -105,24 +105,24 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>${maven-site-plugin-version}</version>
+                <version>${maven_site_plugin_version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>net.trajano.wagon</groupId>
                         <artifactId>wagon-git</artifactId>
-                        <version>${wagon-git-version}</version>
+                        <version>${wagon_git_version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.apache.maven.doxia</groupId>
                         <artifactId>doxia-module-markdown</artifactId>
-                        <version>${doxia-module-markdown-version}</version>
+                        <version>${doxia_module_markdown_version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>${maven-release-plugin-version}</version>
+                <version>${maven_release_plugin_version}</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <tagNameFormat>@{project.version}</tagNameFormat>
@@ -139,7 +139,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin-version}</version>
+                <version>${maven_javadoc_plugin_version}</version>
             </plugin>
         </plugins>
     </reporting>
Index: src/main/resources/fileTemplates/j2ee/velocity/Velocity pom.xml.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/velocity/Velocity pom.xml.ft	(revision c1b832a2185b7c138dbba1c4b4b37d81c1e6094f)
+++ src/main/resources/fileTemplates/j2ee/velocity/Velocity pom.xml.ft	(revision 8083227bf6b4ca01efd3609039e7fb9aed077551)
@@ -24,7 +24,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>${maven-source-plugin-version}</version>
+                        <version>${maven_source_plugin_version}</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -37,7 +37,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>${maven-javadoc-plugin-version}</version>
+                        <version>${maven_javadoc_plugin_version}</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -50,7 +50,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven-gpg-plugin-version}</version>
+                        <version>${maven_gpg_plugin_version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -83,7 +83,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin-version}</version>
+                <version>${maven_compiler_plugin_version}</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>templating-maven-plugin</artifactId>
-                <version>${templating-maven-plugin-version}</version>
+                <version>${templating_maven_plugin_version}</version>
                 <executions>
                     <execution>
                         <id>filter-src</id>
@@ -105,24 +105,24 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>${maven-site-plugin-version}</version>
+                <version>${maven_site_plugin_version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>net.trajano.wagon</groupId>
                         <artifactId>wagon-git</artifactId>
-                        <version>${wagon-git-version}</version>
+                        <version>${wagon_git_version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.apache.maven.doxia</groupId>
                         <artifactId>doxia-module-markdown</artifactId>
-                        <version>${doxia-module-markdown-version}</version>
+                        <version>${doxia_module_markdown_version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>${maven-release-plugin-version}</version>
+                <version>${maven_release_plugin_version}</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <tagNameFormat>@{project.version}</tagNameFormat>
@@ -139,7 +139,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin-version}</version>
+                <version>${maven_javadoc_plugin_version}</version>
             </plugin>
         </plugins>
     </reporting>