Merge pull request #3732 from jamezp/wildfly-upgrade-6.2

Upgrade WildFly testing to 29.0.0.Final.
resteasy · Aug 3, 2023 · b938d19 · b938d19
2 parents 4b99018 + 7cc626c
commit b938d19
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -41,7 +41,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest ]
         java: ['11', '17']
-        wildfly-version: ['28.0.1.Final', '29.0.0.Alpha1']
+        wildfly-version: ['28.0.1.Final', '29.0.0.Final']
 
     steps:
       - uses: actions/checkout@v3
@@ -74,7 +74,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['11']
-        wildfly-version: ['28.0.1.Final', '29.0.0.Alpha1']
+        wildfly-version: ['28.0.1.Final', '29.0.0.Final']
         profile:
           - '-Dsecurity.manager'
           - '-Dprovision.preview'

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
         <dep.arquillian-bom.version>1.7.0.Final</dep.arquillian-bom.version>
         <version.org.jboss.arquillian.container.arquillian-weld-embedded>3.0.2.Final</version.org.jboss.arquillian.container.arquillian-weld-embedded>
         <version.org.jboss.resteasy.checkstyle>1.0.0.Final</version.org.jboss.resteasy.checkstyle>
-        <server.version>28.0.1.Final</server.version>
+        <server.version>29.0.0.Final</server.version>
         <version.org.wildfly>${server.version}</version.org.wildfly>
         <version.org.wildfly.arquillian.wildfly-arquillian>5.0.1.Final</version.org.wildfly.arquillian.wildfly-arquillian>
 
@@ -50,9 +50,9 @@
         <!-- Plugins versions -->
         <version.javadoc.plugin>3.3.1</version.javadoc.plugin>
         <version.org.jacoco.plugin>0.8.10</version.org.jacoco.plugin>
-        <version.org.jboss.galleon>5.1.0.Final</version.org.jboss.galleon>
+        <version.org.jboss.galleon>5.2.0.Final</version.org.jboss.galleon>
         <version.org.wildfly.galleon-plugins>6.4.2.Final</version.org.wildfly.galleon-plugins>
-        <version.org.wildfly.plugins.wildfly-maven-plugin>4.0.0.Final</version.org.wildfly.plugins.wildfly-maven-plugin>
+        <version.org.wildfly.plugins.wildfly-maven-plugin>4.2.0.Final</version.org.wildfly.plugins.wildfly-maven-plugin>
 
         <!-- Test options -->
         <additionalJvmArgs>-Djava.io.tmpdir=${project.build.directory}</additionalJvmArgs>

diff --git a/...tegration-tests/src/test/java/org/jboss/resteasy/test/crypto/PKCS7SignatureSmokeTest.java b/...tegration-tests/src/test/java/org/jboss/resteasy/test/crypto/PKCS7SignatureSmokeTest.java
@@ -1,5 +1,6 @@
 package org.jboss.resteasy.test.crypto;
 
+import java.security.SecurityPermission;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.security.smime.PKCS7SignatureInput;
 import org.jboss.resteasy.test.crypto.resource.PKCS7SignatureSmokeResource;
+import org.jboss.resteasy.utils.PermissionUtil;
 import org.jboss.resteasy.utils.PortProviderUtil;
 import org.jboss.resteasy.utils.TestUtil;
 import org.jboss.shrinkwrap.api.Archive;
@@ -51,6 +53,10 @@ public static Archive<?> deploy() {
         WebArchive war = TestUtil.prepareArchive(PKCS7SignatureSmokeTest.class.getSimpleName());
         List<Class<?>> singletons = new ArrayList<>(1);
         singletons.add(PKCS7SignatureSmokeResource.class);
+        // This can be removed once RESTEASY-3344 is resolved and the WildFly upgrade (WFLY-18231) is done
+        war.addAsManifestResource(PermissionUtil.createPermissionsXmlAsset(
+                new SecurityPermission("removeProviderProperty.BC"),
+                new SecurityPermission("putProviderProperty.BC")), "permissions.xml");
         return TestUtil.finishContainerPrepare(war, null, singletons, (Class<?>[]) null);
     }
 

diff --git a/...ite/integration-tests/src/test/java/org/jboss/resteasy/test/crypto/VerifyDecryptTest.java b/...ite/integration-tests/src/test/java/org/jboss/resteasy/test/crypto/VerifyDecryptTest.java
@@ -3,6 +3,7 @@
 import java.io.FileInputStream;
 import java.lang.reflect.ReflectPermission;
 import java.security.PrivateKey;
+import java.security.SecurityPermission;
 import java.security.cert.X509Certificate;
 
 import jakarta.ws.rs.client.ClientBuilder;
@@ -81,7 +82,10 @@ public static Archive<?> deploy() throws Exception {
                 new RuntimePermission("getClassLoader"),
                 new RuntimePermission("getenv.org.apache.james.mime4j.defaultStorageProvider"),
                 new ReflectPermission("suppressAccessChecks"),
-                new RuntimePermission("accessDeclaredMembers")), "permissions.xml");
+                new RuntimePermission("accessDeclaredMembers"),
+                // These two can be removed once RESTEASY-3344 is resolved and the WildFly upgrade (WFLY-18231) is done
+                new SecurityPermission("removeProviderProperty.BC"),
+                new SecurityPermission("putProviderProperty.BC")), "permissions.xml");
         return TestUtil.finishContainerPrepare(war, null, VerifyDecryptResource.class);
     }