Get ee9 works

resteasy · Jun 7, 2021 · 3bf0182 · 3bf0182
1 parent cbf2766
commit 3bf0182
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/jboss-modules/build.xml b/jboss-modules/build.xml
@@ -74,7 +74,7 @@
         </module-def>
 
         <!-- already present in wildfly -->
-        <module-def name="javax.ws.rs.api">
+        <module-def name="jakarta.ws.rs.api">
             <maven-resource group="org.jboss.spec.jakarta.ws.rs" artifact="jboss-jaxrs-api_3.0_spec"/>
         </module-def>
 

diff --git a/...s/modules/javax/ws/rs/api/main/module.xml → ...modules/jakarta/ws/rs/api/main/module.xml b/...s/modules/javax/ws/rs/api/main/module.xml → ...modules/jakarta/ws/rs/api/main/module.xml
diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml
@@ -62,6 +62,7 @@
               <name>!server.home</name>
             </property>
           </activation>
+
           <build>
             <plugins>
               <plugin>
@@ -232,7 +233,7 @@
                                                     includes="**/*.jar"/>
                                         </delete>
                                         <unzip src="../../jboss-modules/target/resteasy-jboss-modules-${project.version}.zip"
-                                               dest="${project.build.directory}/test-server/wildfly-preview-${ee9.server.version}/modules/system/layers/base"
+                                               dest="${project.build.directory}/test-server/resteasy-jboss-modules-${project.version}"
                                                overwrite="true"/>
                                         <delete dir="target/dependency-maven-plugin-markers"/>
                                     </target>
@@ -243,6 +244,34 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>transform-ee9</id>
+                                <phase>process-test-classes</phase>
+                                <configuration>
+                                    <includeProjectDependencies>true</includeProjectDependencies>
+                                    <executableDependency>
+                                        <groupId>org.wildfly.galleon-plugins</groupId>
+                                        <artifactId>transformer</artifactId>
+                                    </executableDependency>
+                                    <mainClass>org.wildfly.galleon.plugin.transformer.JakartaTransformer</mainClass>
+                                    <arguments>
+                                        <argument>${project.build.directory}/test-server/resteasy-jboss-modules-${project.version}</argument>
+                                        <argument>${project.build.directory}/test-server/resteasy-ee9-jboss-modules-${project.version}</argument>
+                                    </arguments>
+
+                                </configuration>
+
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
@@ -252,6 +281,10 @@
                                 <phase>process-test-classes</phase>
                                 <configuration>
                                     <target>
+                                        <!--copy transformed resteasy-jboss-modules-->
+                                        <copy todir="${project.build.directory}/test-server/wildfly-preview-${ee9.server.version}/modules/system/layers/base" overwrite="true" failonerror="true">
+                                            <fileset dir="${project.build.directory}/test-server/resteasy-ee9-jboss-modules-${project.version}"/>
+                                        </copy>
                                         <!-- Initialize basedir for tested container by copying
                                              the original into new place.
                                              This helps to isolate the multiple running instances.
@@ -616,6 +649,14 @@
             <groupId>io.rest-assured</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.galleon-plugins</groupId>
+            <artifactId>transformer</artifactId>
+            <version>5.2.0.Alpha1</version>
+            <type>jar</type>
+        </dependency>
+
     </dependencies>
 
     <build>