HV-1742 Upgrade to WildFly 18.0.0.Final

hibernate · Oct 18, 2019 · 8b92994 · 8b92994
1 parent ce6c698
commit 8b92994
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/src/script/setupModules.groovy b/modules/src/script/setupModules.groovy
@@ -26,10 +26,10 @@ bvModuleXml = new File( wildflyPatchedTargetDir, 'modules/system/layers/base/jav
 def bvArtifactName = 'jakarta.validation-api-' + project.properties['version.jakarta.validation-api'] + '.jar';
 println "[INFO] Using Jakarta Bean Validation version " + bvArtifactName;
 processFileInplace( bvModuleXml ) { text ->
-    text.replaceAll( /validation-api.*jar/, bvArtifactName )
+    text.replaceAll( /<resource-root path=".*validation-api.*jar/, '<resource-root path="' + bvArtifactName )
 }
 
-deleteFiles( new FileNameFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/javax/validation/api/main', 'validation-api-*.jar' ) )
+deleteFiles( new FileNameFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/javax/validation/api/main', '*.jar' ) )
 
 // HV
 hvModuleXml = new File( wildflyPatchedTargetDir, 'modules/system/layers/base/org/hibernate/validator/main/module.xml' )

diff --git a/pom.xml b/pom.xml
@@ -122,9 +122,9 @@
         <version.org.jboss.logging.jboss-logging-tools>2.1.0.Final</version.org.jboss.logging.jboss-logging-tools>
 
         <!-- Currently supported version of WildFly -->
-        <version.wildfly>17.0.1.Final</version.wildfly>
+        <version.wildfly>18.0.0.Final</version.wildfly>
         <!-- Used to create a patch file for the second version of WildFly we support -->
-        <version.wildfly.secondary>16.0.0.Final</version.wildfly.secondary>
+        <version.wildfly.secondary>17.0.1.Final</version.wildfly.secondary>
         <!-- Version used to run the TCK in incontainer mode -->
         <version.wildfly.tck>${version.wildfly}</version.wildfly.tck>