Skip to content

Commit 80d3958

Browse files
authored
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 that, unlike the old [-source and -target options](https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-source-and-target.html), the compiler will detect and generate an error when using APIs that don't exist in previous releases of Java SE. - https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-release.html
1 parent f1da117 commit 80d3958

File tree

8 files changed

+23
-15
lines changed

8 files changed

+23
-15
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
22
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
33

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Release Notes.
1212
* Bump up guava to v32.1.3.
1313
* Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e.
1414
* Bump up cli to the 0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e.
15+
* Bump up apache parent pom to v35.
16+
* Update Maven to 3.6.3 in mvnw.
1517

1618
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
1719

apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232

3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35-
<java.version>1.8</java.version>
36-
<maven.compiler.source>${java.version}</maven.compiler.source>
37-
<maven.compiler.target>${java.version}</maven.compiler.target>
3835
<elasticsearch-client-transport.version>5.6.6</elasticsearch-client-transport.version>
3936
</properties>
4037

apm-sniffer/apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<finagle.version>6.34.0</finagle.version>
3737
<scala.library.version>2.11.12</scala.library.version>
38-
<maven.compiler.source>1.8</maven.compiler.source>
39-
<maven.compiler.target>1.8</maven.compiler.target>
4038
</properties>
4139

4240
<dependencies>

apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35+
<!-- Reset this to the blank value to avoid using -release in JDK compiling -->
36+
<maven.compiler.release></maven.compiler.release>
3537
</properties>
3638

3739

pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>org.apache</groupId>
2929
<artifactId>apache</artifactId>
30-
<version>21</version>
30+
<version>35</version>
3131
<relativePath />
3232
</parent>
3333

@@ -78,6 +78,9 @@
7878

7979
<properties>
8080
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
81+
<maven.compiler.source>8</maven.compiler.source>
82+
<maven.compiler.target>8</maven.compiler.target>
83+
<maven.compiler.release>8</maven.compiler.release>
8184
<compiler.version>8</compiler.version>
8285
<checkstyle.version>6.18</checkstyle.version>
8386
<junit.version>4.12</junit.version>

test/plugin/pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@
3434
<module>containers</module>
3535
</modules>
3636

37+
<profiles>
38+
<profile>
39+
<id>set-compiler-release</id>
40+
<activation>
41+
<jdk>[9,)</jdk>
42+
</activation>
43+
<properties>
44+
<maven.compiler.release>${java.version}</maven.compiler.release>
45+
</properties>
46+
</profile>
47+
</profiles>
48+
3749
<properties>
3850
<java.version>8</java.version>
3951
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -47,7 +59,7 @@
4759
<lombok.version>1.18.20</lombok.version>
4860
<snakeyaml.version>1.24</snakeyaml.version>
4961

50-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
62+
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
5163
<checkstyle.fails.on.error>true</checkstyle.fails.on.error>
5264
</properties>
5365

test/plugin/scenarios/micronaut-http-scenario/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@
2929
<name>micronaut-scenario</name>
3030
<properties>
3131
<packaging>jar</packaging>
32-
<jdk.version>1.8</jdk.version>
33-
<!-- If you are building with JDK 9 or higher, you can uncomment the lines below to set the release version -->
34-
<!-- <release.version>8</release.version> -->
35-
<compiler.version>1.8</compiler.version>
3632
<micronaut.runtime>netty</micronaut.runtime>
37-
<maven.compiler.source>1.8</maven.compiler.source>
38-
<maven.compiler.target>1.8</maven.compiler.target>
3933
<exec.mainClass>org.apache.skywalking.apm.testcase.micronaut.Application</exec.mainClass>
4034
</properties>
4135

@@ -134,7 +128,7 @@
134128
<plugin>
135129
<groupId>org.apache.maven.plugins</groupId>
136130
<artifactId>maven-compiler-plugin</artifactId>
137-
<version>3.10.1</version>
131+
<version>3.14.0</version>
138132
<configuration>
139133
<annotationProcessorPaths combine.children="append">
140134
<path>

0 commit comments

Comments
 (0)