Skip to content

Bump up apache parent pom to v35. #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 9 commits into from
Aug 21, 2025
Merged

Bump up apache parent pom to v35. #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
89fe83f
Update ASF parent pom to 35 and fix relative things.
wu-sheng Aug 21, 2025
f1c238d
Revert most of plugin config and override maven.compiler.release to g…
wu-sheng Aug 21, 2025
94f12d3
Update change log, Bump up apache parent pom to v35.
wu-sheng Aug 21, 2025
03e0a0c
Add change log, Update Maven to 3.6.3.
wu-sheng Aug 21, 2025
6b5841b
Fix nit.
wu-sheng Aug 21, 2025
f980d28
Update pom.xml
wu-sheng Aug 21, 2025
991e2d9
Fix plugin test.
wu-sheng Aug 21, 2025
13a0cd7
Fix parent maven of test scenarios.
wu-sheng Aug 21, 2025
abc27ea
Bump up maven-compiler-plugin version.
wu-sheng Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 0 additions & 3 deletions apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Comment on lines +35 to +36
Copy link
Member Author

@wu-sheng wu-sheng Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is intentional. 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 that, unlike the old -source and -target options, the compiler will detect and generate an error when using APIs that don't exist in previous releases of Java SE.

</properties>


Expand Down
5 changes: 4 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>21</version>
<version>35</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -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>
Expand Down
14 changes: 13 additions & 1 deletion test/plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
8 changes: 1 addition & 7 deletions test/plugin/scenarios/micronaut-http-scenario/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
Loading