IGNITE-22381 Fix java8 and java11 compilation - Fixes #271.

Signed-off-by: Aleksey Plekhanov <plehanov.alex@gmail.com>
apache · Jun 4, 2024 · a5f6294 · a5f6294
1 parent 42522a6
commit a5f6294
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/modules/gatling-ext/examples/pom.xml b/modules/gatling-ext/examples/pom.xml
@@ -30,6 +30,16 @@
 
     <artifactId>ignite-gatling-plugin-examples</artifactId>
 
+    <properties>
+        <!--
+            Workaround to skip gatling maven plugin execution on test phase if any of -DskipTests
+            or -Dmaven.test.skip=true JVM options are set.
+        -->
+        <maven.test.skip>false</maven.test.skip>
+        <skipTests>${maven.test.skip}</skipTests>
+        <skipGatlingMavenPlugin>${skipTests}</skipGatlingMavenPlugin>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -66,7 +76,7 @@
                 <groupId>io.gatling</groupId>
                 <artifactId>gatling-maven-plugin</artifactId>
                 <configuration>
-                    <skip>false</skip>
+                    <skip>${skipGatlingMavenPlugin}</skip>
                     <runMultipleSimulations>true</runMultipleSimulations>
                 </configuration>
                 <executions>

diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
@@ -194,19 +194,14 @@
             </build>
         </profile>
         <profile>
-            <id>java-9+</id>
+            <id>java-11+</id>
             <activation>
-                <jdk>[9,)</jdk>
+                <jdk>[11,)</jdk>
             </activation>
             <properties>
-                <maven.compiler.release>8</maven.compiler.release>
+                <maven.compiler.source>1.8</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
             </properties>
-        </profile>
-        <profile>
-            <id>java-15+</id>
-            <activation>
-                <jdk>[15,)</jdk>
-            </activation>
             <build>
                 <plugins>
                     <plugin>

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,6 @@
         <module>modules/osgi-ext</module>
         <module>modules/ssh-ext</module>
         <module>modules/ml-ext</module>
-        <module>modules/gatling-ext</module>
     </modules>
 
     <profiles>
@@ -70,6 +69,15 @@
                 <module>../ignite</module>
             </modules>
         </profile>
+        <profile>
+            <id>java-11+</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <modules>
+                <module>modules/gatling-ext</module>
+            </modules>
+        </profile>
         <profile>
             <id>java-17+</id>
             <activation>