[#8899] Update JDK8 of plugin test

pinpoint-apm · Jun 3, 2022 · 2df6bb5 · 2df6bb5
1 parent 191de22
commit 2df6bb5
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/plugins-it/druid-it/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidIT.java b/plugins-it/druid-it/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidIT.java
@@ -25,7 +25,7 @@
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
 @Dependency({"com.alibaba:druid:[1.0.0][1.0.31],[1.1.0,1.1.20]", "com.h2database:h2:1.4.191"})
-@JvmVersion(7)
+@JvmVersion(8)
 @ImportPlugin("com.navercorp.pinpoint:pinpoint-druid-plugin")
 @PinpointConfig("druid/pinpoint-druid-test.config")
 public class DruidIT {

diff --git a/...src/test/java/com/navercorp/pinpoint/plugin/hystrix/HystrixCommand_1_4_0_to_1_5_2_IT.java b/...src/test/java/com/navercorp/pinpoint/plugin/hystrix/HystrixCommand_1_4_0_to_1_5_2_IT.java
@@ -56,7 +56,7 @@
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
 // Hystrix 1.4.0 - 1.4.2 requires Java 7
-@JvmVersion(7)
+@JvmVersion(8)
 // rxjava, hystrix plugin enabled + custom trace method config
 @PinpointConfig("hystrix/pinpoint-hystrix.config")
 @ImportPlugin({"com.navercorp.pinpoint:pinpoint-hystrix-plugin", "com.navercorp.pinpoint:pinpoint-rxjava-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"})

diff --git a/...ava/com/navercorp/pinpoint/plugin/hystrix/HystrixObservableCommand_1_4_0_to_1_5_2_IT.java b/...ava/com/navercorp/pinpoint/plugin/hystrix/HystrixObservableCommand_1_4_0_to_1_5_2_IT.java
@@ -54,7 +54,7 @@
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
 // Hystrix 1.4.0 - 1.4.2 requires Java 7
-@JvmVersion(7)
+@JvmVersion(8)
 // rxjava, hystrix plugin enabled + custom trace method config
 @PinpointConfig("hystrix/pinpoint-hystrix.config")
 @ImportPlugin({"com.navercorp.pinpoint:pinpoint-hystrix-plugin", "com.navercorp.pinpoint:pinpoint-rxjava-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"})

diff --git a/...jdk-http-it/src/test/java/com/navercorp/pinpoint/plugin/jdk/http/HttpURLConnectionIT.java b/...jdk-http-it/src/test/java/com/navercorp/pinpoint/plugin/jdk/http/HttpURLConnectionIT.java
@@ -45,7 +45,7 @@
  */
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
-@JvmVersion({7, 8})
+@JvmVersion(8)
 @Dependency({ WebServer.VERSION, PluginITConstants.VERSION})
 @JvmArgument("-Dprofiler.http.record.response.headers=Connection")
 public class HttpURLConnectionIT {

diff --git a/plugins-it/lambda-it/src/test/java/com/navercorp/pinpoint/plugin/lambda/LambdaIT.java b/plugins-it/lambda-it/src/test/java/com/navercorp/pinpoint/plugin/lambda/LambdaIT.java
@@ -36,7 +36,7 @@
 import java.util.function.Predicate;
 
 @RunWith(PinpointPluginTestSuite.class)
-@JvmVersion({8})
+@JvmVersion(8)
 @PinpointAgent(AgentPath.PATH)
 @PinpointConfig("pinpoint-lambda-test.config")
 @Dependency({"org.springframework:spring-context:[4.2.0.RELEASE]"})

diff --git a/.../log4j2-it/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2ForAsyncLoggerIT.java b/.../log4j2-it/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2ForAsyncLoggerIT.java
@@ -28,7 +28,7 @@
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
 @PinpointConfig("pinpoint-spring-bean-test.config")
-@JvmVersion(7)
+@JvmVersion(8)
 @Dependency({"org.apache.logging.log4j:log4j-core:[2.0,2.13)", "com.lmax:disruptor:[3.4.2]"})
 @JvmArgument({"-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector", "-DtestLoggerEnable=false"})
 public class Log4j2ForAsyncLoggerIT extends Log4j2TestBase {

diff --git a/plugins-it/log4j2-it/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2IT.java b/plugins-it/log4j2-it/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2IT.java
@@ -27,7 +27,7 @@
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
 @PinpointConfig("pinpoint-spring-bean-test.config")
-@JvmVersion(7)
+@JvmVersion(8)
 @Dependency({"org.apache.logging.log4j:log4j-core:[2.0,2.13)"})
 @JvmArgument("-DtestLoggerEnable=false")
 public class Log4j2IT extends Log4j2TestBase {

diff --git a/plugins-it/log4j2-it/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2PatternIT.java b/plugins-it/log4j2-it/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2PatternIT.java
@@ -33,7 +33,7 @@
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
 @PinpointConfig("pinpoint-spring-bean-test.config")
-@JvmVersion(7)
+@JvmVersion(8)
 @Dependency({"org.apache.logging.log4j:log4j-core:[2.8,2.13)", PluginITConstants.VERSION})
 @JvmArgument("-DtestLoggerEnable=false")
 public class Log4j2PatternIT extends Log4j2TestBase {

diff --git a/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MSSqlIT.java b/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MSSqlIT.java
@@ -54,7 +54,7 @@
 @Dependency({"com.microsoft.sqlserver:mssql-jdbc:[6.1.0.jre8],[6.2.0.jre8],[6.4.0.jre8],[7.0.0.jre8],[7.2.0.jre8],[7.4.0.jre8]",
         "log4j:log4j:1.2.16", "org.slf4j:slf4j-log4j12:1.7.5",
         JDBCTestConstants.VERSION, TestcontainersOption.TEST_CONTAINER, TestcontainersOption.MSSQL})
-@JvmVersion({8})
+@JvmVersion(8)
 @PinpointConfig("pinpoint-mssql.config")
 public class MSSqlIT extends DataBaseTestCase {
 

diff --git a/plugins-it/netty-it/src/test/java/com/navercorp/pinpoint/plugin/netty/NettyIT.java b/plugins-it/netty-it/src/test/java/com/navercorp/pinpoint/plugin/netty/NettyIT.java
@@ -65,7 +65,7 @@
  */
 @RunWith(PinpointPluginTestSuite.class)
 @PinpointAgent(AgentPath.PATH)
-@JvmVersion(7)
+@JvmVersion(8)
 @JvmArgument("-XX:MaxPermSize=768m")
 @Dependency({"io.netty:netty-all:[4.1.0.Final,4.1.max]", WebServer.VERSION, PluginITConstants.VERSION})
 @PinpointConfig("pinpoint-netty-plugin-test.config")

diff --git a/...c/test/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/NingAsyncHttpClientIT.java b/...c/test/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/NingAsyncHttpClientIT.java
@@ -47,7 +47,7 @@
 @PinpointAgent(AgentPath.PATH)
 @Dependency({ "com.ning:async-http-client:[1.7.24],[1.8.16,1.8.999)",
         WebServer.VERSION, PluginITConstants.VERSION})
-@JvmVersion(7)
+@JvmVersion(8)
 @ImportPlugin({"com.navercorp.pinpoint:pinpoint-ning-asynchttpclient-plugin"})
 public class NingAsyncHttpClientIT {