Add profiles for jdk 17 in some pom files

awslabs · Oct 25, 2024 · 42dcadc · 42dcadc
1 parent b49c890
commit 42dcadc
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 6 deletions.
diff --git a/athena-federation-sdk/pom.xml b/athena-federation-sdk/pom.xml
@@ -314,7 +314,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.failsafe.version}</version>
                 <configuration>
-                    <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
                     <!--<groups>fast</groups>-->
                     <excludedGroups>slow</excludedGroups>
                     <properties>
@@ -442,4 +441,32 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>17</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${surefire.failsafe.version}</version>
+                        <configuration>
+                            <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+                            <!--<groups>fast</groups>-->
+                            <excludedGroups>slow</excludedGroups>
+                            <properties>
+                                <!--
+                            <configurationParameters>
+                                junit.jupiter.conditions.deactivate = *
+                            </configurationParameters>
+                            -->
+                            </properties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/athena-hbase/pom.xml b/athena-hbase/pom.xml
@@ -139,13 +139,35 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.failsafe.version}</version>
                 <configuration>
-                    <!-- If you are using java 8 then remove below "add-opens" argument from argLine -->
-                    <argLine>-Xmx4g --add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+                    <argLine>-Xmx4g</argLine>
                     <excludes>
                         <exclude>*IntegTest</exclude>
                     </excludes>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>17</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${surefire.failsafe.version}</version>
+                        <configuration>
+                            <argLine>-Xmx4g --add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+                            <excludes>
+                                <exclude>*IntegTest</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/athena-neptune/pom.xml b/athena-neptune/pom.xml
@@ -167,7 +167,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
                     <environmentVariables>
                         <publishing>${publishing}</publishing>
                     </environmentVariables>
@@ -213,4 +212,26 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>17</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+                            <environmentVariables>
+                                <publishing>${publishing}</publishing>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/athena-timestream/pom.xml b/athena-timestream/pom.xml
@@ -98,7 +98,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
                     <environmentVariables>
                         <publishing>${publishing}</publishing>
                     </environmentVariables>
@@ -144,4 +143,26 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>17</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+                            <environmentVariables>
+                                <publishing>${publishing}</publishing>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/athena-vertica/pom.xml b/athena-vertica/pom.xml
@@ -88,7 +88,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
                     <environmentVariables>
                         <publishing>${publishing}</publishing>
                     </environmentVariables>
@@ -141,4 +140,26 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>17</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+                            <environmentVariables>
+                                <publishing>${publishing}</publishing>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>