Upgrade TCK to latest liberty arquillian settings

see: #295
eclipse-ee4j · Jul 29, 2022 · 77d3c41 · 77d3c41
1 parent 30d88c4
commit 77d3c41
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/tck/pom.xml b/tck/pom.xml
@@ -282,14 +282,45 @@
                             <dependenciesToScan>jakarta.mvc.tck:mvc-tck-tests</dependenciesToScan>
                             <systemPropertyVariables>
                                 <arquillian.launch>liberty</arquillian.launch>
+                                <liberty.home>${project.build.directory}/liberty/wlp</liberty.home>
                                 <jakarta.mvc.tck.api.BaseArchiveProvider>
                                     org.eclipse.krazo.tck.liberty.LibertyArchiveProvider
                                 </jakarta.mvc.tck.api.BaseArchiveProvider>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
+
+                    <plugin>
+                        <groupId>io.openliberty.tools</groupId>
+                        <artifactId>liberty-maven-plugin</artifactId>
+                        <version>3.3.4</version>
+                        <configuration>
+                            <skip>${skipTests}</skip>
+                            <serverName>defaultServer</serverName>
+                            <assemblyArtifact>
+                                <groupId>io.openliberty.beta</groupId>
+                                <artifactId>openliberty-runtime</artifactId>
+                                <version>22.0.0.8-beta</version>
+                                <type>zip</type>
+                            </assemblyArtifact>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>create-server</id>
+                                <phase>process-test-resources</phase>
+                                <configuration>
+                                    <serverName>defaultServer</serverName>
+                                    <serverXmlFile>src/test/resources/liberty/server.xml</serverXmlFile>
+                                </configuration>
+                                <goals>
+                                    <goal>create</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
+
             <dependencies>
                 <dependency>
                     <groupId>io.openliberty.arquillian</groupId>

diff --git a/tck/src/test/resources/liberty/server.xml b/tck/src/test/resources/liberty/server.xml
@@ -3,7 +3,7 @@
 
     <!-- Enable features -->
     <featureManager>
-        <feature>jakartaee-9.0</feature>
+        <feature>jakartaee-9.1</feature>
         <feature>localConnector-1.0</feature>
     </featureManager>
 

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -422,9 +422,9 @@
                             <skip>${skipTests}</skip>
                             <serverName>defaultServer</serverName>
                             <assemblyArtifact>
-                                <groupId>io.openliberty</groupId>
-                                <artifactId>openliberty-jakartaee9</artifactId>
-                                <version>22.0.0.7</version>
+                                <groupId>io.openliberty.beta</groupId>
+                                <artifactId>openliberty-runtime</artifactId>
+                                <version>22.0.0.8-beta</version>
                                 <type>zip</type>
                             </assemblyArtifact>
                         </configuration>