Update target containers to test against WFLY 21.0.1.Final

resteasy · Dec 3, 2020 · 4c656d1 · 4c656d1
1 parent 1f773f3
commit 4c656d1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest ]
         java: ['1.8', '11']
-        wildfly-version: ['20.0.1.Final', '21.0.0.Final']
+        wildfly-version: ['20.0.1.Final', '21.0.1.Final']
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ language: java
 jdk:
   - openjdk8
 env:
-  - SERVER_VERSION=21.0.0.Final ELYTRON=true
-  - SERVER_VERSION=21.0.0.Final STANDALONE_MICROPROFILE=true
+  - SERVER_VERSION=21.0.1.Final ELYTRON=true
+  - SERVER_VERSION=21.0.1.Final STANDALONE_MICROPROFILE=true
 jobs:
 addons:
   hosts:

diff --git a/...gration-tests/src/test/java/org/jboss/resteasy/test/cache/ServerCacheInterceptorTest.java b/...gration-tests/src/test/java/org/jboss/resteasy/test/cache/ServerCacheInterceptorTest.java
@@ -9,7 +9,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.resteasy.category.ExpectedFailingOnWildFly19;
 import org.jboss.resteasy.category.NotForBootableJar;
-import org.jboss.resteasy.category.ExpectedFailingOnWildFly21;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.plugins.cache.server.InfinispanCache;
@@ -42,7 +41,6 @@
 @RunAsClient
 @Category({
         ExpectedFailingOnWildFly19.class,
-        ExpectedFailingOnWildFly21.class, //Remove ExpectedFailingOnWildFly21 after https://issues.redhat.com/browse/WFLY-13988 is resolved
         NotForBootableJar.class // related resteasy-cache-core module is not delivered by WF, so it's not necessary to check it with bootable jar
 })
 public class ServerCacheInterceptorTest {

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -147,15 +147,15 @@
               </property>
             </activation>
             <properties>
-                <server.version>20.0.1.Final</server.version>
+                <server.version>21.0.1.Final</server.version>
             </properties>
         </profile>
         <profile>
             <id>server-version-21x-exclusions</id>
             <activation>
                 <property>
                     <name>server.version</name>
-                    <value>21.0.0.Final</value>
+                    <value>21.0.1.Final</value>
                 </property>
             </activation>
             <properties>