[RESTEASY-3145] Exclude the skeleton-key modules in Java 14+.

https://issues.redhat.com/browse/RESTEASY-3145
resteasy · Jun 8, 2022 · 3b76273 · 3b76273
1 parent 4f7b42e
commit 3b76273
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 33 deletions.
diff --git a/jboss-modules/build.xml b/jboss-modules/build.xml
@@ -17,6 +17,19 @@
         </antcall>
     </target>
 
+    <target name="include-skeleton-keys">
+        <delete dir="target/mavenized"/>
+        <antcall target="add-skeleton-key">
+            <!-- TODO add OSGI later when we can have maven repo references to those jars -->
+            <param name="mavenized.modules" value="true"/>
+            <param name="output.dir" value="target/mavenized"/>
+        </antcall>
+        <antcall target="add-skeleton-key">
+            <param name="mavenized.modules" value="false"/>
+            <param name="output.dir" value="target"/>
+        </antcall>
+    </target>
+
 
     <target name="modules">
         <!--
@@ -166,11 +179,6 @@
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-validator-provider"/>
         </module-def>
 
-        <module-def name="org.jboss.resteasy.skeleton-key">
-            <maven-resource group="org.jboss.resteasy" artifact="skeleton-key-as7"/>
-            <maven-resource group="org.jboss.resteasy" artifact="skeleton-key-core"/>
-        </module-def>
-
         <module-def name="org.jboss.resteasy.resteasy-yaml-provider">
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-yaml-provider"/>
         </module-def>
@@ -195,4 +203,12 @@
         <delete file="maven-ant-tasks.jar"/>
     </target>
 
+    <target name="add-skeleton-key">
+
+        <module-def name="org.jboss.resteasy.skeleton-key">
+            <maven-resource group="org.jboss.resteasy" artifact="skeleton-key-as7"/>
+            <maven-resource group="org.jboss.resteasy" artifact="skeleton-key-core"/>
+        </module-def>
+    </target>
+
 </project>
diff --git a/jboss-modules/pom.xml b/jboss-modules/pom.xml
@@ -201,24 +201,12 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>skeleton-key-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-validator-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>skeleton-key-as7</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-spring</artifactId>
@@ -259,22 +247,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>build-dist</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <ant antfile="build.xml" inheritRefs="true">
-                                    <target name="all"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.ant</groupId>
@@ -351,4 +323,87 @@
            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>include-skeleton-key</id>
+            <activation>
+                <jdk>(,14]</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>skeleton-key-core</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>skeleton-key-as7</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-dist</id>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <configuration>
+                                    <target>
+                                        <ant antfile="build.xml" inheritRefs="true">
+                                            <target name="all"/>
+                                            <target name="include-skeleton-keys"/>
+                                        </ant>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>exclude-skeleton-key</id>
+            <activation>
+                <jdk>(14,]</jdk>
+            </activation>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>${project.basedir}/main/resources</directory>
+                        <excludes>
+                            <exclude>modules/org/jboss/resteasy/skeleton-key/**</exclude>
+                        </excludes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-dist</id>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <configuration>
+                                    <target>
+                                        <ant antfile="build.xml" inheritRefs="true">
+                                            <target name="all"/>
+                                        </ant>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>