diff --git a/plugins-it/activemq-it/pom.xml b/plugins-it/activemq-it/pom.xml
index b8793681a6f56..3f1c06c6809ce 100644
--- a/plugins-it/activemq-it/pom.xml
+++ b/plugins-it/activemq-it/pom.xml
@@ -29,8 +29,7 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+
diff --git a/plugins-it/cxf-it/pom.xml b/plugins-it/cxf-it/pom.xml
index 278804bcabbcc..2c1e7b154843c 100644
--- a/plugins-it/cxf-it/pom.xml
+++ b/plugins-it/cxf-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/druid-it/pom.xml b/plugins-it/druid-it/pom.xml
index af1990b3cfdfc..e007eb91e204c 100644
--- a/plugins-it/druid-it/pom.xml
+++ b/plugins-it/druid-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/fastjson-it/pom.xml b/plugins-it/fastjson-it/pom.xml
index 60106c6fa3ac2..ada9f2d07ee1e 100644
--- a/plugins-it/fastjson-it/pom.xml
+++ b/plugins-it/fastjson-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/google-grpc-it/pom.xml b/plugins-it/google-grpc-it/pom.xml
index 859b5136d412c..c3c358f5da092 100644
--- a/plugins-it/google-grpc-it/pom.xml
+++ b/plugins-it/google-grpc-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
1.14.0
3.5.1-1
diff --git a/plugins-it/google-httpclient-it/pom.xml b/plugins-it/google-httpclient-it/pom.xml
index 2bed6b3a7e642..91e83a26d6502 100644
--- a/plugins-it/google-httpclient-it/pom.xml
+++ b/plugins-it/google-httpclient-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/google-httpclient-jdk7-it/pom.xml b/plugins-it/google-httpclient-jdk7-it/pom.xml
index 71a2bd2ba2b81..e1b8fde185601 100644
--- a/plugins-it/google-httpclient-jdk7-it/pom.xml
+++ b/plugins-it/google-httpclient-jdk7-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/gson-it/pom.xml b/plugins-it/gson-it/pom.xml
index 51e96a3636803..5152993430655 100644
--- a/plugins-it/gson-it/pom.xml
+++ b/plugins-it/gson-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/hbase-it/pom.xml b/plugins-it/hbase-it/pom.xml
index 0eca1ada97e02..f99c92f1b4de7 100644
--- a/plugins-it/hbase-it/pom.xml
+++ b/plugins-it/hbase-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/hikaricp-it/pom.xml b/plugins-it/hikaricp-it/pom.xml
index d3488643c6ae6..165d7ce74012b 100644
--- a/plugins-it/hikaricp-it/pom.xml
+++ b/plugins-it/hikaricp-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/hikaricp-jdk7-it/pom.xml b/plugins-it/hikaricp-jdk7-it/pom.xml
index 9dc1d0db55463..d391ead66d038 100644
--- a/plugins-it/hikaricp-jdk7-it/pom.xml
+++ b/plugins-it/hikaricp-jdk7-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/httpclient3-it/pom.xml b/plugins-it/httpclient3-it/pom.xml
index a09819b946ade..94862cc6a26fb 100644
--- a/plugins-it/httpclient3-it/pom.xml
+++ b/plugins-it/httpclient3-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/httpclient4-it/pom.xml b/plugins-it/httpclient4-it/pom.xml
index d2149a990f096..59c081e819985 100644
--- a/plugins-it/httpclient4-it/pom.xml
+++ b/plugins-it/httpclient4-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/hystrix-it/pom.xml b/plugins-it/hystrix-it/pom.xml
index 7cd57ecd26d1c..20d8afcb2c528 100644
--- a/plugins-it/hystrix-it/pom.xml
+++ b/plugins-it/hystrix-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/ibatis-it/pom.xml b/plugins-it/ibatis-it/pom.xml
index 96bfadea311ac..62b15bb90dffe 100644
--- a/plugins-it/ibatis-it/pom.xml
+++ b/plugins-it/ibatis-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
${spring4.version}
diff --git a/plugins-it/jackson-it/pom.xml b/plugins-it/jackson-it/pom.xml
index 0a131799b18ea..10c0cc9bfdf5b 100644
--- a/plugins-it/jackson-it/pom.xml
+++ b/plugins-it/jackson-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/jackson-jdk7-it/pom.xml b/plugins-it/jackson-jdk7-it/pom.xml
index c6451a8dc61e9..ea77b24da3b29 100644
--- a/plugins-it/jackson-jdk7-it/pom.xml
+++ b/plugins-it/jackson-jdk7-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/jdk-http-it/pom.xml b/plugins-it/jdk-http-it/pom.xml
index 1e3f59692c71e..4dd9edf9b6739 100644
--- a/plugins-it/jdk-http-it/pom.xml
+++ b/plugins-it/jdk-http-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/json-lib-it/pom.xml b/plugins-it/json-lib-it/pom.xml
index 2338850cc49db..2a54038fb47b6 100644
--- a/plugins-it/json-lib-it/pom.xml
+++ b/plugins-it/json-lib-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/log4j-it/pom.xml b/plugins-it/log4j-it/pom.xml
index b83dbccad77fb..74a711b85e30b 100644
--- a/plugins-it/log4j-it/pom.xml
+++ b/plugins-it/log4j-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/log4j2-it/pom.xml b/plugins-it/log4j2-it/pom.xml
index 11338e6df30b2..69c624b2d5eec 100644
--- a/plugins-it/log4j2-it/pom.xml
+++ b/plugins-it/log4j2-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/logback-it/pom.xml b/plugins-it/logback-it/pom.xml
index 4623914a67fce..e98e5e449dad7 100644
--- a/plugins-it/logback-it/pom.xml
+++ b/plugins-it/logback-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/mongodb-it/pom.xml b/plugins-it/mongodb-it/pom.xml
index b7061c34da2bb..58400dbd0dd3b 100644
--- a/plugins-it/mongodb-it/pom.xml
+++ b/plugins-it/mongodb-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/mybatis-it/pom.xml b/plugins-it/mybatis-it/pom.xml
index a2aab4bef811e..ae0d45261ba4d 100644
--- a/plugins-it/mybatis-it/pom.xml
+++ b/plugins-it/mybatis-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/netty-it/pom.xml b/plugins-it/netty-it/pom.xml
index 4013593d1eb30..fa35d44cf065e 100644
--- a/plugins-it/netty-it/pom.xml
+++ b/plugins-it/netty-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/ning-asyncclient-it/pom.xml b/plugins-it/ning-asyncclient-it/pom.xml
index 20d0af508656e..514de88657058 100644
--- a/plugins-it/ning-asyncclient-it/pom.xml
+++ b/plugins-it/ning-asyncclient-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/okhttp-it/pom.xml b/plugins-it/okhttp-it/pom.xml
index 1f2df288c61c8..5f1a40926b85c 100644
--- a/plugins-it/okhttp-it/pom.xml
+++ b/plugins-it/okhttp-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/rabbitmq-it/pom.xml b/plugins-it/rabbitmq-it/pom.xml
index 23519b02ce202..e8b7341c0fed7 100644
--- a/plugins-it/rabbitmq-it/pom.xml
+++ b/plugins-it/rabbitmq-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
${spring4.version}
diff --git a/plugins-it/rxjava-it/pom.xml b/plugins-it/rxjava-it/pom.xml
index 1cf3640b61a8c..e338dc55bf25c 100644
--- a/plugins-it/rxjava-it/pom.xml
+++ b/plugins-it/rxjava-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins-it/spring-it/pom.xml b/plugins-it/spring-it/pom.xml
index 3904f591fd16a..8c47110f2efef 100644
--- a/plugins-it/spring-it/pom.xml
+++ b/plugins-it/spring-it/pom.xml
@@ -29,9 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
-
+ 1.8
+ ${env.JAVA_8_HOME}
${spring4.version}
diff --git a/plugins-it/thrift-it/pom.xml b/plugins-it/thrift-it/pom.xml
index fc8822d7d5346..886d4736808f0 100644
--- a/plugins-it/thrift-it/pom.xml
+++ b/plugins-it/thrift-it/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
diff --git a/plugins/apache-dubbo/pom.xml b/plugins/apache-dubbo/pom.xml
index feaabc56d36bd..3004b94ba0f15 100644
--- a/plugins/apache-dubbo/pom.xml
+++ b/plugins/apache-dubbo/pom.xml
@@ -15,7 +15,6 @@
1.8
${env.JAVA_8_HOME}
- java17
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index ba8e657a7d7c8..ae7b23aa20737 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -28,9 +28,8 @@
jar
- 1.7
+ 1.8
${env.JAVA_8_HOME}
- java18
diff --git a/plugins/dbcp2/pom.xml b/plugins/dbcp2/pom.xml
index 569ed0605c0d5..038a2aa642098 100644
--- a/plugins/dbcp2/pom.xml
+++ b/plugins/dbcp2/pom.xml
@@ -25,9 +25,8 @@
- 1.7
- ${env.JAVA_7_HOME}
- java17
+ 1.8
+ ${env.JAVA_8_HOME}
pinpoint-commons-dbcp2-plugin
diff --git a/plugins/druid/pom.xml b/plugins/druid/pom.xml
index 439bd9926e0c2..6567e86b6423e 100644
--- a/plugins/druid/pom.xml
+++ b/plugins/druid/pom.xml
@@ -28,8 +28,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
java17
diff --git a/plugins/grpc/pom.xml b/plugins/grpc/pom.xml
index d2daa48829908..b2b60764b5002 100644
--- a/plugins/grpc/pom.xml
+++ b/plugins/grpc/pom.xml
@@ -13,7 +13,8 @@
jar
- 1.7
+ 1.8
+ ${env.JAVA_8_HOME}
1.14.0
3.5.1-1
diff --git a/plugins/hbase/pom.xml b/plugins/hbase/pom.xml
index 461c0cf7c0ec8..f1a588533f533 100644
--- a/plugins/hbase/pom.xml
+++ b/plugins/hbase/pom.xml
@@ -28,8 +28,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
java17
diff --git a/plugins/jboss/pom.xml b/plugins/jboss/pom.xml
index cdbbdaac63b88..3cd2a3056b3c7 100644
--- a/plugins/jboss/pom.xml
+++ b/plugins/jboss/pom.xml
@@ -42,7 +42,7 @@
- ${env.JAVA_7_HOME}
+ ${env.JAVA_8_HOME}
diff --git a/plugins/jsp/pom.xml b/plugins/jsp/pom.xml
index b4e4628409163..044280f232f5b 100644
--- a/plugins/jsp/pom.xml
+++ b/plugins/jsp/pom.xml
@@ -13,7 +13,7 @@
jar
- ${env.JAVA_7_HOME}
+ ${env.JAVA_8_HOME}
diff --git a/plugins/mssql-jdbc/pom.xml b/plugins/mssql-jdbc/pom.xml
index b351508cfc41a..a91a648c0c070 100644
--- a/plugins/mssql-jdbc/pom.xml
+++ b/plugins/mssql-jdbc/pom.xml
@@ -14,9 +14,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
- java17
+ 1.8
+ ${env.JAVA_8_HOME} java17
diff --git a/plugins/netty/pom.xml b/plugins/netty/pom.xml
index 3fa564c55f5b2..58e19483fcb65 100644
--- a/plugins/netty/pom.xml
+++ b/plugins/netty/pom.xml
@@ -13,8 +13,7 @@
jar
- 1.7
-
+ 1.8
${env.JAVA_8_HOME}
java18
diff --git a/plugins/ning-asynchttpclient/pom.xml b/plugins/ning-asynchttpclient/pom.xml
index 3e279911f28d7..60de0f3a7bbe3 100644
--- a/plugins/ning-asynchttpclient/pom.xml
+++ b/plugins/ning-asynchttpclient/pom.xml
@@ -13,8 +13,7 @@
jar
- 1.7
-
+ 1.8
${env.JAVA_8_HOME}
java18
diff --git a/plugins/tomcat/pom.xml b/plugins/tomcat/pom.xml
index 024eff3525b51..d01a0bab005e8 100644
--- a/plugins/tomcat/pom.xml
+++ b/plugins/tomcat/pom.xml
@@ -29,7 +29,7 @@
jar
- ${env.JAVA_7_HOME}
+ ${env.JAVA_8_HOME}
diff --git a/plugins/undertow-servlet/pom.xml b/plugins/undertow-servlet/pom.xml
index 514d79add73cf..b7cfc8c1b688f 100644
--- a/plugins/undertow-servlet/pom.xml
+++ b/plugins/undertow-servlet/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
java17
diff --git a/plugins/undertow/pom.xml b/plugins/undertow/pom.xml
index 876f67dc17783..d18dc1c600c59 100644
--- a/plugins/undertow/pom.xml
+++ b/plugins/undertow/pom.xml
@@ -29,8 +29,8 @@
jar
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
java17
diff --git a/plugins/vertx/pom.xml b/plugins/vertx/pom.xml
index 1c769eafd4a49..958dc5136cd9e 100644
--- a/plugins/vertx/pom.xml
+++ b/plugins/vertx/pom.xml
@@ -13,7 +13,7 @@
jar
- 1.7
+ 1.8
${env.JAVA_8_HOME}
java18
diff --git a/pom.xml b/pom.xml
index 4cc321c9424e7..c52a5bda8d6b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,8 +124,8 @@
UTF-8
UTF-8
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
${jdk.home}
${jdk.version}
diff --git a/profiler-logging/pom.xml b/profiler-logging/pom.xml
index 7764317a6b0fd..7105c438f3dbd 100644
--- a/profiler-logging/pom.xml
+++ b/profiler-logging/pom.xml
@@ -14,9 +14,8 @@
pinpoint profiler logging system
- 1.7
- ${env.JAVA_7_HOME}
-
+ 1.8
+ ${env.JAVA_8_HOME}
true
diff --git a/profiler-optional/profiler-optional-jdk7/pom.xml b/profiler-optional/profiler-optional-jdk7/pom.xml
index 755571303e8b1..22ddca9c7145e 100644
--- a/profiler-optional/profiler-optional-jdk7/pom.xml
+++ b/profiler-optional/profiler-optional-jdk7/pom.xml
@@ -32,8 +32,8 @@
pinpoint profiler optional package for jdk 7
- 1.7
- ${env.JAVA_7_HOME}
+ 1.8
+ ${env.JAVA_8_HOME}
true
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMClass.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMClass.java
index 86f0924a9f3c0..744045d46e9a2 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMClass.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMClass.java
@@ -77,9 +77,6 @@ public ASMClass(EngineComponent engineComponent, final InstrumentContext pluginC
this.classNode = Objects.requireNonNull(classNode, "classNode");
}
- public void test() {
-
- }
public ClassLoader getClassLoader() {
return this.classNode.getClassLoader();
}
@@ -90,7 +87,7 @@ public boolean isInterceptable() {
return false;
}
// interface static method or default method is java 1.8 or later
- if (isInterface() && (this.classNode.getMajorVersion() < 52 || !JvmUtils.getVersion().onOrAfter(JvmVersion.JAVA_8))) {
+ if (isInterface() && (this.classNode.getMajorVersion() < JvmVersion.JAVA_8.getClassVersion() || !JvmUtils.getVersion().onOrAfter(JvmVersion.JAVA_8))) {
return false;
}
return true;
diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java
index 287060b9c1e07..427df69e7cbb5 100644
--- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java
+++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java
@@ -678,7 +678,7 @@ public void getNestedClasses() throws Exception {
@Test
public void isInterceptorable() throws Exception {
ASMClass clazz = getClass("com.navercorp.pinpoint.profiler.instrument.mock.BaseInterface");
- assertFalse(clazz.isInterceptable());
+ assertTrue(clazz.isInterceptable());
clazz = getClass("com.navercorp.pinpoint.profiler.instrument.mock.BaseClass");
assertTrue(clazz.isInterceptable());
diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java
index 6f1d470039326..bfe6f85956ff6 100644
--- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java
+++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java
@@ -19,8 +19,6 @@
import org.junit.Assert;
import org.junit.Test;
-import java.util.Properties;
-
/**
* @author Woonduk Kang(emeroad)
*/
@@ -28,12 +26,6 @@ public class MavenCentralTest {
@Test
public void getAddress() {
- Properties system = System.getProperties();
- system.setProperty(MavenCentral.INSECURE_ENABLE, Boolean.TRUE.toString());
- try {
- Assert.assertEquals(MavenCentral.MAVEN_CENTRAL_INSECURE, MavenCentral.getAddress());
- } finally {
- system.remove(MavenCentral.INSECURE_ENABLE);
- }
+ Assert.assertEquals(MavenCentral.MAVEN_CENTRAL_SECURE, MavenCentral.getAddress());
}
}
\ No newline at end of file