Replace relocation Groovy artifact

hibernate · Apr 18, 2024 · 67eb2fd · 67eb2fd
1 parent 98021a2
commit 67eb2fd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -72,7 +72,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -142,7 +142,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/modules/src/script/setupModules.groovy b/modules/src/script/setupModules.groovy
@@ -29,7 +29,7 @@ processFileInplace( bvModuleXml ) { text ->
     text.replaceAll( /<resource-root path=".*validation-api.*jar/, '<resource-root path="' + bvArtifactName )
 }
 
-deleteFiles( new FileNameFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/jakarta/validation/api/main', '*.jar' ) )
+deleteFiles( new FileNameByRegexFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/jakarta/validation/api/main', '.*\\.jar' ) )
 
 // HV
 hvModuleXml = new File( wildflyPatchedTargetDir, 'modules/system/layers/base/org/hibernate/validator/main/module.xml' )
@@ -46,7 +46,7 @@ appendDependency( hvModuleXml, "javax.api", false )
 appendDependency( hvModuleXml, "javax.money.api", true )
 appendDependency( hvModuleXml, "javafx.api", true )
 
-deleteFiles( new FileNameFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/org/hibernate/validator/main', 'hibernate-validator-*.jar' ) )
+deleteFiles( new FileNameByRegexFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/org/hibernate/validator/main', 'hibernate-validator-.*\\.jar' ) )
 
 // HV CDI
 hvCdiModuleXml = new File( wildflyPatchedTargetDir, 'modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml' )
@@ -56,6 +56,6 @@ processFileInplace( hvCdiModuleXml ) { text ->
     text.replaceAll( /hibernate-validator-cdi.*jar/, hvCdiArtifactName )
 }
 
-deleteFiles( new FileNameFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/org/hibernate/validator/cdi/main', 'hibernate-validator-cdi-*.jar' ) )
+deleteFiles( new FileNameByRegexFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/org/hibernate/validator/cdi/main', 'hibernate-validator-cdi-.*\\.jar' ) )
 
 println "[INFO] ------------------------------------------------------------------------";
diff --git a/osgi/integrationtest/pom.xml b/osgi/integrationtest/pom.xml
@@ -85,7 +85,7 @@
 
         <!-- script engines -->
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -175,7 +175,7 @@
         <version.junit>4.13.1</version.junit>
         <version.org.easymock>3.4</version.org.easymock>
         <version.io.rest-assured>4.1.2</version.io.rest-assured>
-        <version.org.codehaus.groovy>2.4.12</version.org.codehaus.groovy>
+        <version.org.apache.groovy>4.0.21</version.org.apache.groovy>
         <version.com.google.guava>31.1-jre</version.com.google.guava>
         <version.org.springframework.spring-expression>5.3.22</version.org.springframework.spring-expression>
         <version.org.jboss.arquillian.container.arquillian-weld-embedded>3.0.2.Final</version.org.jboss.arquillian.container.arquillian-weld-embedded>
@@ -224,7 +224,7 @@
         <version.deploy.plugin>2.8.2</version.deploy.plugin>
         <version.enforcer.plugin>3.0.0</version.enforcer.plugin>
         <version.forbiddenapis.plugin>3.2</version.forbiddenapis.plugin>
-        <version.gmavenplus.plugin>1.6</version.gmavenplus.plugin>
+        <version.gmavenplus.plugin>3.0.2</version.gmavenplus.plugin>
         <version.gpg.plugin>3.0.1</version.gpg.plugin>
         <version.install.plugin>2.5.2</version.install.plugin>
         <version.japicmp.plugin>0.11.0</version.japicmp.plugin>
@@ -464,9 +464,9 @@
                 <version>${version.org.testng}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-jsr223</artifactId>
-                <version>${version.org.codehaus.groovy}</version>
+                <version>${version.org.apache.groovy}</version>
             </dependency>
             <dependency>
                 <groupId>org.easymock</groupId>
@@ -1055,9 +1055,10 @@
                     <version>${version.gmavenplus.plugin}</version>
                     <dependencies>
                         <dependency>
-                            <groupId>org.codehaus.groovy</groupId>
-                            <artifactId>groovy-all</artifactId>
-                            <version>${version.org.codehaus.groovy}</version>
+                            <groupId>org.apache.groovy</groupId>
+                            <artifactId>groovy</artifactId>
+                            <version>${version.org.apache.groovy}</version>
+                            <scope>runtime</scope>
                         </dependency>
                     </dependencies>
                 </plugin>