HV-1168 Parameterize WildFly version in the patch generation

hibernate · Dec 1, 2016 · 985485f · 985485f
1 parent 87c1541
commit 985485f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -160,7 +160,7 @@
                                     <groupId>org.hibernate</groupId>
                                     <artifactId>hibernate-validator-modules</artifactId>
                                     <version>${project.version}</version>
-                                    <classifier>wildfly-10-patch</classifier>
+                                    <classifier>wildfly-${wildfly.version}-patch</classifier>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                 </artifactItem>
@@ -192,7 +192,7 @@
                         <configuration>
                             <fail-on-error>false</fail-on-error>
                             <commands>
-                                <command>patch apply --path ${project.build.directory}/hibernate-validator-modules-${project.version}-wildfly-10-patch.zip</command>
+                                <command>patch apply --path ${project.build.directory}/hibernate-validator-modules-${project.version}-wildfly-${wildfly.version}-patch.zip</command>
                             </commands>
                         </configuration>
                     </execution>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -87,7 +87,7 @@
                                 <artifact>
                                     <file>${patchFile}</file>
                                     <type>zip</type>
-                                    <classifier>wildfly-10-patch</classifier>
+                                    <classifier>wildfly-${wildfly.version}-patch</classifier>
                                 </artifact>
                             </artifacts>
                         </configuration>

diff --git a/modules/src/main/modules/patch.xml b/modules/src/main/modules/patch.xml
@@ -1,11 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <patch-config xmlns="urn:jboss:patch-config:1.0">
-    <name>wildfly-10-hibernate-validator-${project.version}</name>
-    <description>This patch upgrades Hibernate Validator ${project.version} within WildFly 10 installation</description>
-    <one-off />
-    <element patch-id="layer-base-wildfly-10-hibernate-validor-${project.version}">
+    <name>wildfly-${wildfly.version}-hibernate-validator-${project.version}</name>
+    <description>This patch upgrades Hibernate Validator ${project.version} within WildFly ${wildfly.version} installation</description>
+    <element patch-id="layer-base-wildfly-${wildfly.version}-hibernate-validor-${project.version}">
         <one-off name="base" />
-        <description>This patch upgrades Hibernate Validator ${project.version} within WildFly 10 installation</description>
+        <description>This patch upgrades Hibernate Validator ${project.version} within WildFly ${wildfly.version} installation</description>
         <specified-content>
             <modules>
                 <updated name="org.hibernate.validator" />

diff --git a/pom.xml b/pom.xml
@@ -110,8 +110,10 @@
         <!-- Don't upgrade chronos to 1.1.0 yet. Dependencies get copied to wrong location -->
         <org.codehaus.mojo.chronos.version>1.0-beta-3</org.codehaus.mojo.chronos.version>
 
+        <wildfly.version>10.1.0.Final</wildfly.version>
+
         <!--
-            These dependencies should be aligned with the ones from the Wildfly version we support
+            These dependencies should be aligned with the ones from the WildFly version we support
             See http://search.maven.org/#search|gav|1|g%3A"org.wildfly"%20AND%20a%3A"wildfly-parent"
         -->
         <classmate.version>1.3.1</classmate.version>
@@ -127,7 +129,6 @@
             They should be aligned with the ones from the Wildfly version we support
             See http://search.maven.org/#search|gav|1|g%3A"org.wildfly"%20AND%20a%3A"wildfly-parent"
         -->
-        <wildfly.version>10.1.0.Final</wildfly.version>
         <cdi-api.version>1.2</cdi-api.version>
         <weld.version>2.3.5.Final</weld.version>
         <wildfly-arquillian.version>2.0.0.Final</wildfly-arquillian.version>