You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2025/08/21 14:18:37 UTC
(skywalking-java) branch main updated: Bump up apache parent pom to v35. (#771)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 80d3958257 Bump up apache parent pom to v35. (#771)
80d3958257 is described below
commit 80d3958257962f00b0fff852561aef597f4683a8
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Aug 21 22:18:33 2025 +0800
Bump up apache parent pom to v35. (#771)
* Bump up apache parent pom to v35.
* Update Maven to 3.6.3 in mvnw.
Refer to Maven doc,
> Starting with JDK 9, the javac executable can accept the --release option to specify against which Java SE release you want to build the project. For example, you have JDK 11 installed and used by Maven, but you want to build the project against Java 8. The --release option ensures that the code is compiled following the rules of the programming language of the specified release, and that generated classes target the release **as well as the public API of that release**. This means [...]
- https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-release.html
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
CHANGES.md | 2 ++
.../apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml | 3 ---
apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml | 2 --
apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml | 2 ++
pom.xml | 5 ++++-
test/plugin/pom.xml | 14 +++++++++++++-
test/plugin/scenarios/micronaut-http-scenario/pom.xml | 8 +-------
8 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 54ab0bc2f6..94a275913a 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,3 +1,3 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
diff --git a/CHANGES.md b/CHANGES.md
index 8140e6c5d7..1f517d22d3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ Release Notes.
* Bump up guava to v32.1.3.
* Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e.
* Bump up cli to the 0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e.
+* Bump up apache parent pom to v35.
+* Update Maven to 3.6.3 in mvnw.
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml
index e2862daf57..224a41ee5e 100644
--- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml
@@ -32,9 +32,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
<elasticsearch-client-transport.version>5.6.6</elasticsearch-client-transport.version>
</properties>
diff --git a/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml
index d65f65cbb6..790a4b46a4 100644
--- a/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml
@@ -35,8 +35,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<finagle.version>6.34.0</finagle.version>
<scala.library.version>2.11.12</scala.library.version>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
index e1970ec4da..8bfa622165 100755
--- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
+++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
@@ -32,6 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- Reset this to the blank value to avoid using -release in JDK compiling -->
+ <maven.compiler.release></maven.compiler.release>
</properties>
diff --git a/pom.xml b/pom.xml
index abeaac8ced..77678e9b66 100755
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>35</version>
<relativePath />
</parent>
@@ -78,6 +78,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ <maven.compiler.release>8</maven.compiler.release>
<compiler.version>8</compiler.version>
<checkstyle.version>6.18</checkstyle.version>
<junit.version>4.12</junit.version>
diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml
index 0b3033000e..b42f4a69b7 100644
--- a/test/plugin/pom.xml
+++ b/test/plugin/pom.xml
@@ -34,6 +34,18 @@
<module>containers</module>
</modules>
+ <profiles>
+ <profile>
+ <id>set-compiler-release</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>${java.version}</maven.compiler.release>
+ </properties>
+ </profile>
+ </profiles>
+
<properties>
<java.version>8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -47,7 +59,7 @@
<lombok.version>1.18.20</lombok.version>
<snakeyaml.version>1.24</snakeyaml.version>
- <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<checkstyle.fails.on.error>true</checkstyle.fails.on.error>
</properties>
diff --git a/test/plugin/scenarios/micronaut-http-scenario/pom.xml b/test/plugin/scenarios/micronaut-http-scenario/pom.xml
index f9706e1da6..f04874ebeb 100644
--- a/test/plugin/scenarios/micronaut-http-scenario/pom.xml
+++ b/test/plugin/scenarios/micronaut-http-scenario/pom.xml
@@ -29,13 +29,7 @@
<name>micronaut-scenario</name>
<properties>
<packaging>jar</packaging>
- <jdk.version>1.8</jdk.version>
- <!-- If you are building with JDK 9 or higher, you can uncomment the lines below to set the release version -->
- <!-- <release.version>8</release.version> -->
- <compiler.version>1.8</compiler.version>
<micronaut.runtime>netty</micronaut.runtime>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
<exec.mainClass>org.apache.skywalking.apm.testcase.micronaut.Application</exec.mainClass>
</properties>
@@ -134,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.14.0</version>
<configuration>
<annotationProcessorPaths combine.children="append">
<path>