Update Spec, TCK and platform to final versions

eclipse-ee4j · Sep 5, 2022 · 3e97574 · 3e97574
1 parent 17742da
commit 3e97574
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,13 +44,13 @@
         <maven.compiler.release>11</maven.compiler.release>
 
         <!-- DEPENDENCY PROPERTIES -->
-        <spec.version>2.1.0.RC1</spec.version>
-        <tck.version>2.1.0.RC3</tck.version>
+        <spec.version>2.1.0</spec.version>
+        <tck.version>2.1.0</tck.version>
 
         <jersey.version>3.1.0-M3</jersey.version>
         <arquillian-bom.version>1.7.0.Alpha10</arquillian-bom.version>
         <shrinkwrap-resolver-bom.version>3.1.4</shrinkwrap-resolver-bom.version>
-        <jakartaee-api.version>10.0.0-RC1</jakartaee-api.version>
+        <jakartaee-api.version>10.0.0</jakartaee-api.version>
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
         <jakarta.enterprise.cdi-api.version>4.0.0</jakarta.enterprise.cdi-api.version>
         <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -111,9 +111,9 @@
                             <dependenciesToScan>jakarta.mvc.tck:mvc-tck-tests</dependenciesToScan>
                             <systemPropertyVariables>
                                 <arquillian.launch>glassfish</arquillian.launch>
-                                <jakarta.mvc.tck.api.BaseArchiveProvider>
+                                <ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                                     org.eclipse.krazo.tck.glassfish.GlassfishArchiveProvider
-                                </jakarta.mvc.tck.api.BaseArchiveProvider>
+                                </ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -144,9 +144,9 @@
                             <dependenciesToScan>jakarta.mvc.tck:mvc-tck-tests</dependenciesToScan>
                             <systemPropertyVariables>
                                 <arquillian.launch>glassfish</arquillian.launch>
-                                <jakarta.mvc.tck.api.BaseArchiveProvider>
+                                <ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                                     org.eclipse.krazo.tck.glassfish.GlassfishModuleArchiveProvider
-                                </jakarta.mvc.tck.api.BaseArchiveProvider>
+                                </ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -177,9 +177,9 @@
                             <dependenciesToScan>jakarta.mvc.tck:mvc-tck-tests</dependenciesToScan>
                             <systemPropertyVariables>
                                 <arquillian.launch>wildfly</arquillian.launch>
-                                <jakarta.mvc.tck.api.BaseArchiveProvider>
+                                <ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                                     org.eclipse.krazo.tck.wildfly.WildflyArchiveProvider
-                                </jakarta.mvc.tck.api.BaseArchiveProvider>
+                                </ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                             </systemPropertyVariables>
                             <argLine>
                                 --add-opens=java.base/java.security=ALL-UNNAMED
@@ -245,9 +245,9 @@
                             </environmentVariables>
                             <systemPropertyVariables>
                                 <arquillian.launch>wildfly-managed</arquillian.launch>
-                                <jakarta.mvc.tck.api.BaseArchiveProvider>
+                                <ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                                     org.eclipse.krazo.tck.wildfly.WildflyArchiveProvider
-                                </jakarta.mvc.tck.api.BaseArchiveProvider>
+                                </ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                             </systemPropertyVariables>
                             <argLine>
                                 --add-opens=java.base/java.security=ALL-UNNAMED
@@ -283,9 +283,9 @@
                             <systemPropertyVariables>
                                 <arquillian.launch>liberty</arquillian.launch>
                                 <liberty.home>${project.build.directory}/liberty/wlp</liberty.home>
-                                <jakarta.mvc.tck.api.BaseArchiveProvider>
+                                <ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                                     org.eclipse.krazo.tck.liberty.LibertyArchiveProvider
-                                </jakarta.mvc.tck.api.BaseArchiveProvider>
+                                </ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>

diff --git a/tck/src/main/java/org/eclipse/krazo/tck/AbstractArchiveProvider.java b/tck/src/main/java/org/eclipse/krazo/tck/AbstractArchiveProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
+ * Copyright (c) 2018, 2022 Eclipse Krazo committers and contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
  */
 package org.eclipse.krazo.tck;
 
+import ee.jakarta.tck.mvc.api.BaseArchiveProvider;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.repository.MavenRemoteRepositories;
 import org.jboss.shrinkwrap.resolver.api.maven.repository.MavenRemoteRepository;
 import org.jboss.shrinkwrap.resolver.api.maven.repository.MavenUpdatePolicy;
-import jakarta.mvc.tck.api.BaseArchiveProvider;
 
 import java.io.File;