Skip to content

Commit

Permalink
[pinpoint-apm#8899] Upgrade jdk8
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeroad
emeroad committed Jun 2, 2022
1 parent 79a1725 commit bd87134
Show file tree
Hide file tree
Showing 52 changed files with 91 additions and 110 deletions.
3 changes: 1 addition & 2 deletions plugins-it/activemq-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>

</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/cxf-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/druid-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/fastjson-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/google-grpc-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<grpc.version>1.14.0</grpc.version>
<protoc.version>3.5.1-1</protoc.version>
<!-- <grpc.version>1.33.1</grpc.version>-->
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/google-httpclient-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/google-httpclient-jdk7-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/gson-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/hbase-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/hikaricp-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/hikaricp-jdk7-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/httpclient3-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/httpclient4-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/hystrix-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/ibatis-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<spring.version>${spring4.version}</spring.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions plugins-it/jackson-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/jackson-jdk7-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/jdk-http-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/json-lib-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/log4j-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/log4j2-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/logback-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/mongodb-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/mybatis-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/netty-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/ning-asyncclient-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/okhttp-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins-it/rabbitmq-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<spring.version>${spring4.version}</spring.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions plugins-it/rxjava-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
5 changes: 2 additions & 3 deletions plugins-it/spring-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>

<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<spring.version>${spring4.version}</spring.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions plugins-it/thrift-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<dependencies>
Expand Down
1 change: 0 additions & 1 deletion plugins/apache-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java17</sniffer.artifactid>
</properties>

<dependencyManagement>
Expand Down
3 changes: 1 addition & 2 deletions plugins/cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
</properties>

<dependencies>
Expand Down
5 changes: 2 additions & 3 deletions plugins/dbcp2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
</parent>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<sniffer.artifactid>java17</sniffer.artifactid>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
</properties>

<artifactId>pinpoint-commons-dbcp2-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions plugins/druid/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.home>${env.JAVA_7_HOME}</jdk.home>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java17</sniffer.artifactid>
</properties>

Expand Down
3 changes: 2 additions & 1 deletion plugins/grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<grpc.version>1.14.0</grpc.version>
<protoc.version>3.5.1-1</protoc.version>
<!-- <grpc.version>1.33.1</grpc.version>-->
Expand Down
Loading

0 comments on commit bd87134

Please sign in to comment.