[eclipse-ee4j#627]Created better way for Java 16 multi-release

Signed-off-by: Anton Pinsky <[email protected]>
api-from-the-ion · Nov 8, 2023 · 0d25125 · 0d25125
1 parent a2966bb
commit 0d25125
Showing 1 changed file with 42 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
         <jakarta.json.bind.version>3.0.0</jakarta.json.bind.version>
         <jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
         <netbeans.hint.jdkPlatform>JDK_9</netbeans.hint.jdkPlatform>
-        <junit.version>5.10.0</junit.version>
+        <junit.version>5.10.1</junit.version>
     </properties>
 
     <dependencyManagement>
@@ -119,7 +119,7 @@
 
     <organization>
         <name>Oracle Corporation</name>
-        <url>http://www.oracle.com/</url>
+        <url>https://www.oracle.com/</url>
     </organization>
 
     <issueManagement>
@@ -140,13 +140,13 @@
     <licenses>
         <license>
             <name>Eclipse Public License v. 2.0</name>
-            <url>http://www.eclipse.org/legal/epl-v20.html</url>
+            <url>https://www.eclipse.org/legal/epl-v20.html</url>
             <distribution>repo</distribution>
             <comments>Standard Eclipse License</comments>
         </license>
         <license>
             <name>Eclipse Distribution License v. 1.0</name>
-            <url>http://www.eclipse.org/org/documents/edl-v10.php</url>
+            <url>https://www.eclipse.org/org/documents/edl-v10.php</url>
             <distribution>repo</distribution>
             <comments>Standard Eclipse Distribution License</comments>
         </license>
@@ -260,6 +260,41 @@
             </activation>
             <build>
                 <plugins>
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>3.4.0</version>
+                        <executions>
+                            <!-- execution>
+                                <id>add-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.basedir}/src/main/java16</source>
+                                    </sources>
+                                </configuration>
+                            </execution -->
+
+                            <execution>
+                                <id>add-test-source</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.basedir}/src/test/java</source>
+                                        <source>${project.basedir}/src/test/java16</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
@@ -269,10 +304,6 @@
                                 <id>default-testCompile</id>
                                 <configuration>
                                     <release>16</release>
-                                    <compileSourceRoots>
-                                        <compileSourceRoot>${project.basedir}/src/test/java</compileSourceRoot>
-                                        <compileSourceRoot>${project.basedir}/src/test/java16</compileSourceRoot>
-                                    </compileSourceRoots>
                                 </configuration>
                             </execution>
                         </executions>
@@ -365,7 +396,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.2.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -447,7 +478,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.6.2</version>
                     <configuration>
                         <doctitle>Yasson</doctitle>
                         <sourcepath>${basedir}/src/main/java/org/eclipse/yasson</sourcepath>
@@ -511,7 +542,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.2.2</version>
                     <executions>
                         <execution>
                             <id>default-test</id>