From 89fe83f87139cc7403f2146fb2460a7bb0277695 Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 11:29:05 +0700
Subject: [PATCH 1/9] Update ASF parent pom to 35 and fix relative things.

---
 .mvn/wrapper/maven-wrapper.properties         |  2 +-
 .../elasticsearch-5.x-plugin/pom.xml          |  3 --
 .../finagle-6.25.x-plugin/pom.xml             |  2 -
 .../bootstrap-plugins/jdk-http-plugin/pom.xml | 38 ++-----------------
 pom.xml                                       |  5 ++-
 .../scenarios/micronaut-http-scenario/pom.xml |  6 ---
 6 files changed, 9 insertions(+), 47 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/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..8400f5c40c 100755
--- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
+++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
@@ -32,47 +32,17 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-            <!-- Ignore the error of javadoc build -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <failOnError>false</failOnError>
-                </configuration>
-            </plugin>
-            <!-- Build a dummy(empty) javadoc to satisfy maven central requirements -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>empty-javadoc-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>javadoc</classifier>
-                            <classesDirectory>${basedir}/javadoc</classesDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index abeaac8ced..63030b27eb 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.relase>8</maven.compiler.relase>
         <compiler.version>8</compiler.version>
         <checkstyle.version>6.18</checkstyle.version>
         <junit.version>4.12</junit.version>
diff --git a/test/plugin/scenarios/micronaut-http-scenario/pom.xml b/test/plugin/scenarios/micronaut-http-scenario/pom.xml
index f9706e1da6..ad802dab48 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>
 

From f1c238dc55f6bbab7ece6b8aa9316b714554e45a Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 16:15:08 +0700
Subject: [PATCH 2/9] Revert most of plugin config and override
 maven.compiler.release to get rid of --release in JDK compiling.

---
 .../bootstrap-plugins/jdk-http-plugin/pom.xml | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
index 8400f5c40c..8bfa622165 100755
--- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
+++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
@@ -32,17 +32,49 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <!-- Reset this to the blank value to avoid using -release in JDK compiling -->
+        <maven.compiler.release></maven.compiler.release>
     </properties>
 
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+            <!-- Ignore the error of javadoc build -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <failOnError>false</failOnError>
+                </configuration>
+            </plugin>
+            <!-- Build a dummy(empty) javadoc to satisfy maven central requirements -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>empty-javadoc-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>javadoc</classifier>
+                            <classesDirectory>${basedir}/javadoc</classesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

From 94f12d37efabb136c1652582831cd7166e4681d1 Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 16:16:01 +0700
Subject: [PATCH 3/9] Update change log, Bump up apache parent pom to v35.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8140e6c5d7..e78940ff01 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ 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.
 
 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
 

From 03e0a0c2128e8a56d8ee07e4b0581b9a6f07460f Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 16:16:55 +0700
Subject: [PATCH 4/9] Add change log, Update Maven to 3.6.3.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index e78940ff01..9f3319e0f1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Release Notes.
 * 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.
 
 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
 

From 6b5841bf7f048720e64ec506fa852603803eeb41 Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 16:17:28 +0700
Subject: [PATCH 5/9] Fix nit.

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9f3319e0f1..1f517d22d3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,7 @@ Release Notes.
 * 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.
+* Update Maven to 3.6.3 in mvnw.
 
 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
 

From f980d284527d4791d3429069012063fbab97f876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 17:19:46 +0800
Subject: [PATCH 6/9] Update pom.xml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63030b27eb..77678e9b66 100755
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <maven.compiler.relase>8</maven.compiler.relase>
+        <maven.compiler.release>8</maven.compiler.release>
         <compiler.version>8</compiler.version>
         <checkstyle.version>6.18</checkstyle.version>
         <junit.version>4.12</junit.version>

From 991e2d9941f44946648b70c7839621b25c4ecc2c Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 16:38:01 +0700
Subject: [PATCH 7/9] Fix plugin test.

---
 test/plugin/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml
index 0b3033000e..ad18f5ad56 100644
--- a/test/plugin/pom.xml
+++ b/test/plugin/pom.xml
@@ -38,6 +38,7 @@
         <java.version>8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 

From 13a0cd7daf26ce48a9b6dfc7ef9d5deb2f1d5ba4 Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 16:45:58 +0700
Subject: [PATCH 8/9] Fix parent maven of test scenarios.

---
 test/plugin/pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml
index ad18f5ad56..b6a8ff8543 100644
--- a/test/plugin/pom.xml
+++ b/test/plugin/pom.xml
@@ -34,11 +34,22 @@
         <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>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven.compiler.release>${java.version}</maven.compiler.release>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 

From abc27eab845f4f4b27fe171bf2df342a8c9a4352 Mon Sep 17 00:00:00 2001
From: Wu Sheng <wu.sheng@foxmail.com>
Date: Thu, 21 Aug 2025 17:11:50 +0700
Subject: [PATCH 9/9] Bump up maven-compiler-plugin version.

---
 test/plugin/pom.xml                                   | 2 +-
 test/plugin/scenarios/micronaut-http-scenario/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml
index b6a8ff8543..b42f4a69b7 100644
--- a/test/plugin/pom.xml
+++ b/test/plugin/pom.xml
@@ -59,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 ad802dab48..f04874ebeb 100644
--- a/test/plugin/scenarios/micronaut-http-scenario/pom.xml
+++ b/test/plugin/scenarios/micronaut-http-scenario/pom.xml
@@ -128,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>