This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new a5f6294e IGNITE-22381 Fix java8 and java11 compilation - Fixes #271.
a5f6294e is described below
commit a5f6294e52ac4489c5813a975c0feb168e23e49f
Author: Aleksey Plekhanov <[email protected]>
AuthorDate: Tue Jun 4 15:22:45 2024 +0500
IGNITE-22381 Fix java8 and java11 compilation - Fixes #271.
Signed-off-by: Aleksey Plekhanov <[email protected]>
---
modules/gatling-ext/examples/pom.xml | 12 +++++++++++-
parent-internal/pom.xml | 13 ++++---------
pom.xml | 10 +++++++++-
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/modules/gatling-ext/examples/pom.xml
b/modules/gatling-ext/examples/pom.xml
index 81c7475b..381619a0 100644
--- 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
index 05a3714d..85ae94c1 100644
--- 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
index 4be96882..55f270e8 100644
--- 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>
