diff --git a/smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AutoPerfCountersTest.java b/smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AutoPerfCountersTest.java index 62386e94b98..a52ace672ff 100644 --- a/smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AutoPerfCountersTest.java +++ b/smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AutoPerfCountersTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -77,10 +77,10 @@ static class Tomcat8Java21Test extends AutoPerfCountersTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends AutoPerfCountersTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends AutoPerfCountersTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends AutoPerfCountersTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/BrowserSdkLoader/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/BrowserSdkLoaderTest.java b/smoke-tests/apps/BrowserSdkLoader/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/BrowserSdkLoaderTest.java index ad9e5420211..30ea1f20cf0 100644 --- a/smoke-tests/apps/BrowserSdkLoader/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/BrowserSdkLoaderTest.java +++ b/smoke-tests/apps/BrowserSdkLoader/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/BrowserSdkLoaderTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -57,10 +57,10 @@ static class Tomcat8Java21Test extends BrowserSdkLoaderTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends BrowserSdkLoaderTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends BrowserSdkLoaderTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends BrowserSdkLoaderTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java b/smoke-tests/apps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java index d0d6746e429..8eaa474540a 100644 --- a/smoke-tests/apps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java +++ b/smoke-tests/apps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -80,10 +80,10 @@ static class Tomcat8Java21Test extends CassandraTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends CassandraTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends CassandraTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends CassandraTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/ClassicSdkLog4j1Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j1Interop2xTest.java b/smoke-tests/apps/ClassicSdkLog4j1Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j1Interop2xTest.java index 4e9d13e4d01..fc4b5f3a5a5 100644 --- a/smoke-tests/apps/ClassicSdkLog4j1Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j1Interop2xTest.java +++ b/smoke-tests/apps/ClassicSdkLog4j1Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j1Interop2xTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -159,10 +159,10 @@ static class Tomcat8Java21Test extends ClassicSdkLog4j1Interop2xTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ClassicSdkLog4j1Interop2xTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ClassicSdkLog4j1Interop2xTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ClassicSdkLog4j1Interop2xTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/ClassicSdkLog4j2Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j2Interop2xTest.java b/smoke-tests/apps/ClassicSdkLog4j2Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j2Interop2xTest.java index 75b8325cb1e..80391d909a5 100644 --- a/smoke-tests/apps/ClassicSdkLog4j2Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j2Interop2xTest.java +++ b/smoke-tests/apps/ClassicSdkLog4j2Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j2Interop2xTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -151,10 +151,10 @@ static class Tomcat8Java21Test extends ClassicSdkLog4j2Interop2xTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ClassicSdkLog4j2Interop2xTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ClassicSdkLog4j2Interop2xTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ClassicSdkLog4j2Interop2xTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/ClassicSdkLogbackInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLogbackInterop2xTest.java b/smoke-tests/apps/ClassicSdkLogbackInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLogbackInterop2xTest.java index 26c8b39b692..3219233625d 100644 --- a/smoke-tests/apps/ClassicSdkLogbackInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLogbackInterop2xTest.java +++ b/smoke-tests/apps/ClassicSdkLogbackInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLogbackInterop2xTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -135,10 +135,10 @@ static class Tomcat8Java21Test extends ClassicSdkLogbackInterop2xTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ClassicSdkLogbackInterop2xTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ClassicSdkLogbackInterop2xTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ClassicSdkLogbackInterop2xTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/ClassicSdkWebInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop2xTest.java b/smoke-tests/apps/ClassicSdkWebInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop2xTest.java index 0722e6e7088..b879893cc63 100644 --- a/smoke-tests/apps/ClassicSdkWebInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop2xTest.java +++ b/smoke-tests/apps/ClassicSdkWebInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop2xTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -70,10 +70,10 @@ static class Tomcat8Java21Test extends ClassicSdkWebInterop2xTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ClassicSdkWebInterop2xTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ClassicSdkWebInterop2xTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ClassicSdkWebInterop2xTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/ClassicSdkWebInterop3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xTest.java b/smoke-tests/apps/ClassicSdkWebInterop3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xTest.java index f003683430c..8f69eef367d 100644 --- a/smoke-tests/apps/ClassicSdkWebInterop3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xTest.java +++ b/smoke-tests/apps/ClassicSdkWebInterop3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -70,10 +70,10 @@ static class Tomcat8Java21Test extends ClassicSdkWebInterop3xTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ClassicSdkWebInterop3xTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ClassicSdkWebInterop3xTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ClassicSdkWebInterop3xTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/ClassicSdkWebInterop3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xUsingOld3xAgentTest.java b/smoke-tests/apps/ClassicSdkWebInterop3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xUsingOld3xAgentTest.java index 3a61c33e626..7dd2f704ec1 100644 --- a/smoke-tests/apps/ClassicSdkWebInterop3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xUsingOld3xAgentTest.java +++ b/smoke-tests/apps/ClassicSdkWebInterop3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xUsingOld3xAgentTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -70,10 +70,10 @@ static class Tomcat8Java21Test extends ClassicSdkWebInterop3xUsingOld3xAgentTest @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ClassicSdkWebInterop3xUsingOld3xAgentTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ClassicSdkWebInterop3xUsingOld3xAgentTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ClassicSdkWebInterop3xUsingOld3xAgentTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/ConnectionStringOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ConnectionStringOverridesTest.java b/smoke-tests/apps/ConnectionStringOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ConnectionStringOverridesTest.java index 30f6438d320..09357a150b4 100644 --- a/smoke-tests/apps/ConnectionStringOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ConnectionStringOverridesTest.java +++ b/smoke-tests/apps/ConnectionStringOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ConnectionStringOverridesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -186,10 +186,10 @@ static class Tomcat8Java21Test extends ConnectionStringOverridesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ConnectionStringOverridesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ConnectionStringOverridesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ConnectionStringOverridesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/CoreAndFilter3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xTest.java b/smoke-tests/apps/CoreAndFilter3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xTest.java index f7b06225e60..49d9f14ced8 100644 --- a/smoke-tests/apps/CoreAndFilter3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xTest.java +++ b/smoke-tests/apps/CoreAndFilter3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -559,10 +559,10 @@ static class Tomcat8Java21Test extends CoreAndFilter3xTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends CoreAndFilter3xTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends CoreAndFilter3xTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends CoreAndFilter3xTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/CustomDimensions/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java b/smoke-tests/apps/CustomDimensions/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java index f2aba15f3b1..7a3c3499ed4 100644 --- a/smoke-tests/apps/CustomDimensions/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java +++ b/smoke-tests/apps/CustomDimensions/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -68,10 +68,10 @@ static class Tomcat8Java21Test extends CustomDimensionsTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends CustomDimensionsTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends CustomDimensionsTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends CustomDimensionsTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java b/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java index 995e4bc577f..fa3bf412e85 100644 --- a/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java +++ b/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -93,10 +93,10 @@ static class Tomcat8Java21Test extends DetectUnexpectedOtelMetricsTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends DetectUnexpectedOtelMetricsTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends DetectUnexpectedOtelMetricsTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends DetectUnexpectedOtelMetricsTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HeartBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java b/smoke-tests/apps/HeartBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java index acfbca15ad3..b2b37c4181e 100644 --- a/smoke-tests/apps/HeartBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java +++ b/smoke-tests/apps/HeartBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -70,10 +70,10 @@ static class Tomcat8Java21Test extends HeartBeatTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HeartBeatTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HeartBeatTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HeartBeatTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpClients/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientTest.java b/smoke-tests/apps/HttpClients/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientTest.java index a1cc4d81b9d..4693fae7de6 100644 --- a/smoke-tests/apps/HttpClients/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientTest.java +++ b/smoke-tests/apps/HttpClients/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -155,10 +155,10 @@ static class Tomcat8Java21Test extends HttpClientTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpClientTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpClientTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpClientTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersOldSemconvTest.java b/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersOldSemconvTest.java index c6695cc92f6..46b9ad7b94c 100644 --- a/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersOldSemconvTest.java +++ b/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersOldSemconvTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -82,10 +82,10 @@ static class Tomcat8Java21Test extends HttpHeadersOldSemconvTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpHeadersOldSemconvTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpHeadersOldSemconvTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpHeadersOldSemconvTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersTest.java b/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersTest.java index 935ad3fe0a7..96663f48936 100644 --- a/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersTest.java +++ b/smoke-tests/apps/HttpHeaders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -82,10 +82,10 @@ static class Tomcat8Java21Test extends HttpHeadersTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpHeadersTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpHeadersTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpHeadersTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java b/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java index ebc7c0eac34..ced93e89698 100644 --- a/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java +++ b/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -220,10 +220,10 @@ static class Tomcat8Java21Test extends HttpPreaggregatedMetricsTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpPreaggregatedMetricsTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpPreaggregatedMetricsTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpPreaggregatedMetricsTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTestOtlpEnabled.java b/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTestOtlpEnabled.java index b9f1bfc2157..6c6606ba491 100644 --- a/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTestOtlpEnabled.java +++ b/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTestOtlpEnabled.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -116,10 +116,10 @@ static class Tomcat8Java21Test extends HttpPreaggregatedMetricsTestOtlpEnabled { @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpPreaggregatedMetricsTestOtlpEnabled {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpPreaggregatedMetricsTestOtlpEnabled {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpPreaggregatedMetricsTestOtlpEnabled {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerDefaultPortTest.java b/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerDefaultPortTest.java index 0fc01671c5c..8fec05bcd8d 100644 --- a/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerDefaultPortTest.java +++ b/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerDefaultPortTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -68,10 +68,10 @@ static class Tomcat8Java21Test extends HttpServerDefaultPortTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpServerDefaultPortTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpServerDefaultPortTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpServerDefaultPortTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerQueryStringTest.java b/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerQueryStringTest.java index 9fa12239c72..a6204386325 100644 --- a/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerQueryStringTest.java +++ b/smoke-tests/apps/HttpServer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServerQueryStringTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -65,10 +65,10 @@ static class Tomcat8Java21Test extends HttpServerQueryStringTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpServerQueryStringTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpServerQueryStringTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpServerQueryStringTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java b/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java index da845d4fe52..a68a86e5e65 100644 --- a/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java +++ b/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -89,10 +89,10 @@ static class Tomcat8Java21Test extends HttpServer4xxDefaultTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpServer4xxDefaultTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpServer4xxDefaultTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpServer4xxDefaultTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java b/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java index faf140b927e..cab11c7f081 100644 --- a/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java +++ b/smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -89,10 +89,10 @@ static class Tomcat8Java21Test extends HttpServer4xxTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends HttpServer4xxTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends HttpServer4xxTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends HttpServer4xxTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java index d5a19f36fa9..8e1c96b1b36 100644 --- a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java +++ b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9; import static org.assertj.core.api.Assertions.assertThat; @@ -134,9 +134,9 @@ static class Java21Test extends JmsTest {} @Environment(JAVA_21_OPENJ9) static class Java21OpenJ9Test extends JmsTest {} - @Environment(JAVA_23) + @Environment(JAVA_25) static class Java23Test extends JmsTest {} - @Environment(JAVA_23_OPENJ9) + @Environment(JAVA_25_OPENJ9) static class Java23OpenJ9Test extends JmsTest {} } diff --git a/smoke-tests/apps/JavaUtilLogging/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaUtilLoggingTest.java b/smoke-tests/apps/JavaUtilLogging/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaUtilLoggingTest.java index a8dc8740e1c..f02062342dc 100644 --- a/smoke-tests/apps/JavaUtilLogging/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaUtilLoggingTest.java +++ b/smoke-tests/apps/JavaUtilLogging/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaUtilLoggingTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -133,10 +133,10 @@ static class Tomcat8Java21Test extends JavaUtilLoggingTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends JavaUtilLoggingTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends JavaUtilLoggingTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends JavaUtilLoggingTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JdbcTest.java b/smoke-tests/apps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JdbcTest.java index e81b4f3bcd2..7fc709b7958 100644 --- a/smoke-tests/apps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JdbcTest.java +++ b/smoke-tests/apps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JdbcTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -352,10 +352,10 @@ static class Tomcat8Java21Test extends JdbcTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends JdbcTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends JdbcTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends JdbcTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java b/smoke-tests/apps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java index 4c1fb073873..4eb153e37b0 100644 --- a/smoke-tests/apps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java +++ b/smoke-tests/apps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -80,10 +80,10 @@ static class Tomcat8Java21Test extends JedisTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends JedisTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends JedisTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends JedisTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/JmxMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmxMetricTest.java b/smoke-tests/apps/JmxMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmxMetricTest.java index e8e4c59af8d..c42b5a6d6b8 100644 --- a/smoke-tests/apps/JmxMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmxMetricTest.java +++ b/smoke-tests/apps/JmxMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmxMetricTest.java @@ -6,7 +6,7 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; @@ -155,7 +155,7 @@ private void verifyJmxMetricsSentToBreeze() throws Exception { // Java 21+ returns 6 more CollectionCount for the wildcard metric comparing to other Java // versions if (testing.getCurrentEnvironment() == TOMCAT_8_JAVA_21 - || testing.getCurrentEnvironment() == TOMCAT_8_JAVA_23) { + || testing.getCurrentEnvironment() == TOMCAT_8_JAVA_25) { assertThat(wildcardValueSum).isGreaterThanOrEqualTo(gcFirstMatch + gcSecondMatch); } else { assertThat(wildcardValueSum).isEqualTo(gcFirstMatch + gcSecondMatch); @@ -196,7 +196,7 @@ static class Tomcat8Java17Test extends JmxMetricTest {} @Environment(TOMCAT_8_JAVA_21) static class Tomcat8Java21Test extends JmxMetricTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends JmxMetricTest {} // this smoke test doesn't work on OpenJ9 because it specifically diff --git a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java index a648cf5bd2e..db3c6625add 100644 --- a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java +++ b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9; import static java.util.concurrent.TimeUnit.SECONDS; @@ -151,9 +151,9 @@ static class Java21Test extends KafkaTest {} @Environment(JAVA_21_OPENJ9) static class Java21OpenJ9Test extends KafkaTest {} - @Environment(JAVA_23) + @Environment(JAVA_25) static class Java23Test extends KafkaTest {} - @Environment(JAVA_23_OPENJ9) + @Environment(JAVA_25_OPENJ9) static class Java23OpenJ9Test extends KafkaTest {} } diff --git a/smoke-tests/apps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceTest.java b/smoke-tests/apps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceTest.java index bf50ac15c8f..8b9ef732e87 100644 --- a/smoke-tests/apps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceTest.java +++ b/smoke-tests/apps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -80,10 +80,10 @@ static class Tomcat8Java21Test extends LettuceTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends LettuceTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends LettuceTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends LettuceTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/LiveMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LiveMetricsTest.java b/smoke-tests/apps/LiveMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LiveMetricsTest.java index 5445307ea16..d03a784f371 100644 --- a/smoke-tests/apps/LiveMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LiveMetricsTest.java +++ b/smoke-tests/apps/LiveMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LiveMetricsTest.java @@ -10,8 +10,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -76,10 +76,10 @@ static class Tomcat8Java21Test extends LiveMetricsTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends LiveMetricsTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends LiveMetricsTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends LiveMetricsTest {} @Environment(LIBERTY_20_JAVA_8) diff --git a/smoke-tests/apps/Log4j1/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j1Test.java b/smoke-tests/apps/Log4j1/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j1Test.java index 66c6d782f2e..15598cd11b9 100644 --- a/smoke-tests/apps/Log4j1/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j1Test.java +++ b/smoke-tests/apps/Log4j1/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j1Test.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -156,10 +156,10 @@ static class Tomcat8Java21Test extends Log4j1Test {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends Log4j1Test {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends Log4j1Test {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends Log4j1Test {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Log4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j2Test.java b/smoke-tests/apps/Log4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j2Test.java index 86f51b7b7dd..a3ce9f1755a 100644 --- a/smoke-tests/apps/Log4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j2Test.java +++ b/smoke-tests/apps/Log4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/Log4j2Test.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -167,10 +167,10 @@ static class Tomcat8Java21Test extends Log4j2Test {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends Log4j2Test {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends Log4j2Test {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends Log4j2Test {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Logback/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LogbackTest.java b/smoke-tests/apps/Logback/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LogbackTest.java index 17409b143ef..a6549145958 100644 --- a/smoke-tests/apps/Logback/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LogbackTest.java +++ b/smoke-tests/apps/Logback/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LogbackTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -170,10 +170,10 @@ static class Tomcat8Java21Test extends LogbackTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends LogbackTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends LogbackTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends LogbackTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MongoTest.java b/smoke-tests/apps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MongoTest.java index fdc54041560..39afbef6d3b 100644 --- a/smoke-tests/apps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MongoTest.java +++ b/smoke-tests/apps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MongoTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -80,10 +80,10 @@ static class Tomcat8Java21Test extends MongoTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends MongoTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends MongoTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends MongoTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OpenTelemetryApiLogBridge/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiLogBridgeTest.java b/smoke-tests/apps/OpenTelemetryApiLogBridge/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiLogBridgeTest.java index 21f6757e727..b06436453cb 100644 --- a/smoke-tests/apps/OpenTelemetryApiLogBridge/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiLogBridgeTest.java +++ b/smoke-tests/apps/OpenTelemetryApiLogBridge/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiLogBridgeTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -112,10 +112,10 @@ static class Tomcat8Java21Test extends OpenTelemetryApiLogBridgeTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends OpenTelemetryApiLogBridgeTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends OpenTelemetryApiLogBridgeTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends OpenTelemetryApiLogBridgeTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportInstrumentationKeyTest.java b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportInstrumentationKeyTest.java index 1d3dbd014f7..d387cebe157 100644 --- a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportInstrumentationKeyTest.java +++ b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportInstrumentationKeyTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -73,10 +73,10 @@ static class Tomcat8Java21Test extends OpenTelemetryApiSupportInstrumentationKey @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends OpenTelemetryApiSupportInstrumentationKeyTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends OpenTelemetryApiSupportInstrumentationKeyTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends OpenTelemetryApiSupportInstrumentationKeyTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java index bb90b290cec..1b18fe0330a 100644 --- a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java +++ b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -153,10 +153,10 @@ static class Tomcat8Java21Test extends OpenTelemetryApiSupportTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends OpenTelemetryApiSupportTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends OpenTelemetryApiSupportTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends OpenTelemetryApiSupportTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTest.java b/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTest.java index 3ff3d3a8cfe..db878c0b94a 100644 --- a/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTest.java +++ b/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -262,10 +262,10 @@ static class Tomcat8Java21Test extends OpenTelemetryMetricTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends OpenTelemetryMetricTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends OpenTelemetryMetricTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends OpenTelemetryMetricTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTestToAmw.java b/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTestToAmw.java index be69f6825b6..1471cbf76bb 100644 --- a/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTestToAmw.java +++ b/smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTestToAmw.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -187,10 +187,10 @@ static class Tomcat8Java21Test extends OpenTelemetryMetricTestToAmw {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends OpenTelemetryMetricTestToAmw {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends OpenTelemetryMetricTestToAmw {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends OpenTelemetryMetricTestToAmw {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DefaultOtelResourceAttributesTest.java b/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DefaultOtelResourceAttributesTest.java index 8fe8ef1ae2d..ea8fc5d54be 100644 --- a/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DefaultOtelResourceAttributesTest.java +++ b/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DefaultOtelResourceAttributesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -63,10 +63,10 @@ static class Tomcat8Java21Test extends DefaultOtelResourceAttributesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends DefaultOtelResourceAttributesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends DefaultOtelResourceAttributesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends DefaultOtelResourceAttributesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/EnvVarOtelResourceAttributesTest.java b/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/EnvVarOtelResourceAttributesTest.java index e7f0c4053fd..c430c52c161 100644 --- a/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/EnvVarOtelResourceAttributesTest.java +++ b/smoke-tests/apps/OtelResourceCustomMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/EnvVarOtelResourceAttributesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -113,10 +113,10 @@ static class Tomcat8Java21Test extends EnvVarOtelResourceAttributesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends EnvVarOtelResourceAttributesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends EnvVarOtelResourceAttributesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends EnvVarOtelResourceAttributesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/OutOfMemoryWithDebugLevel/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OutOfMemoryWithDebugLevelTest.java b/smoke-tests/apps/OutOfMemoryWithDebugLevel/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OutOfMemoryWithDebugLevelTest.java index 0a7eccb7fe0..42d742ca929 100644 --- a/smoke-tests/apps/OutOfMemoryWithDebugLevel/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OutOfMemoryWithDebugLevelTest.java +++ b/smoke-tests/apps/OutOfMemoryWithDebugLevel/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OutOfMemoryWithDebugLevelTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -74,10 +74,10 @@ static class Tomcat8Java21Test extends OutOfMemoryWithDebugLevelTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends OutOfMemoryWithDebugLevelTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends OutOfMemoryWithDebugLevelTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends OutOfMemoryWithDebugLevelTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/PreAggMetricsWithRoleNameOverridesAndSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreAggMetricsWithRoleNameOverridesAndSamplingTest.java b/smoke-tests/apps/PreAggMetricsWithRoleNameOverridesAndSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreAggMetricsWithRoleNameOverridesAndSamplingTest.java index 8734c8425cd..c9b3308d874 100644 --- a/smoke-tests/apps/PreAggMetricsWithRoleNameOverridesAndSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreAggMetricsWithRoleNameOverridesAndSamplingTest.java +++ b/smoke-tests/apps/PreAggMetricsWithRoleNameOverridesAndSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreAggMetricsWithRoleNameOverridesAndSamplingTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -215,10 +215,10 @@ static class Tomcat8Java21Test extends PreAggMetricsWithRoleNameOverridesAndSamp @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends PreAggMetricsWithRoleNameOverridesAndSamplingTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends PreAggMetricsWithRoleNameOverridesAndSamplingTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends PreAggMetricsWithRoleNameOverridesAndSamplingTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/RateLimitedSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RateLimitedSamplingTest.java b/smoke-tests/apps/RateLimitedSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RateLimitedSamplingTest.java index d6062dc955b..873e6047435 100644 --- a/smoke-tests/apps/RateLimitedSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RateLimitedSamplingTest.java +++ b/smoke-tests/apps/RateLimitedSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RateLimitedSamplingTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -65,10 +65,10 @@ static class Tomcat8Java21Test extends RateLimitedSamplingTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends RateLimitedSamplingTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends RateLimitedSamplingTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends RateLimitedSamplingTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AksRoleNameOverridesTest.java b/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AksRoleNameOverridesTest.java index f76f6b972ce..c719d864ee7 100644 --- a/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AksRoleNameOverridesTest.java +++ b/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AksRoleNameOverridesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -120,10 +120,10 @@ static class Tomcat8Java21Test extends AksRoleNameOverridesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends AksRoleNameOverridesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends AksRoleNameOverridesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends AksRoleNameOverridesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RoleNameOverridesTest.java b/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RoleNameOverridesTest.java index 88e15aad965..cbef303f7e6 100644 --- a/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RoleNameOverridesTest.java +++ b/smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RoleNameOverridesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -183,10 +183,10 @@ static class Tomcat8Java21Test extends RoleNameOverridesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends RoleNameOverridesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends RoleNameOverridesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends RoleNameOverridesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingDisabledTest.java b/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingDisabledTest.java index e9ffa598e50..b09e288897f 100644 --- a/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingDisabledTest.java +++ b/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingDisabledTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -88,10 +88,10 @@ static class Tomcat8Java21Test extends IngestionSamplingDisabledTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends IngestionSamplingDisabledTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends IngestionSamplingDisabledTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends IngestionSamplingDisabledTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingTest.java b/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingTest.java index 8fb04dd55e2..c62aee7fd9d 100644 --- a/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingTest.java +++ b/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/IngestionSamplingTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -85,10 +85,10 @@ static class Tomcat8Java21Test extends IngestionSamplingTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends IngestionSamplingTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends IngestionSamplingTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends IngestionSamplingTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingTest.java b/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingTest.java index 0c6ec856931..4efb60b4f4c 100644 --- a/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingTest.java +++ b/smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -94,10 +94,10 @@ static class Tomcat8Java21Test extends SamplingTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithSamplingOverridesTest.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithSamplingOverridesTest.java index eb58173648c..86b272605bc 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithSamplingOverridesTest.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithSamplingOverridesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -61,10 +61,10 @@ static class Tomcat8Java21Test extends ExceptionWithSamplingOverridesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ExceptionWithSamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ExceptionWithSamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ExceptionWithSamplingOverridesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithoutSamplingOverridesTest.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithoutSamplingOverridesTest.java index adde890a63a..68f987b8335 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithoutSamplingOverridesTest.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionWithoutSamplingOverridesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -77,10 +77,10 @@ static class Tomcat8Java21Test extends ExceptionWithoutSamplingOverridesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends ExceptionWithoutSamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends ExceptionWithoutSamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends ExceptionWithoutSamplingOverridesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides2Test.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides2Test.java index 13bd0e2a985..157e51be610 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides2Test.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides2Test.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -67,10 +67,10 @@ static class Tomcat8Java21Test extends SamplingOverrides2Test {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverrides2Test {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverrides2Test {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverrides2Test {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides3Test.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides3Test.java index 2fc2f943026..984db0eceea 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides3Test.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides3Test.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -90,10 +90,10 @@ static class Tomcat8Java21Test extends SamplingOverrides3Test {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverrides3Test {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverrides3Test {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverrides3Test {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides4Test.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides4Test.java index 08afa746188..1101b6c3149 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides4Test.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides4Test.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -82,10 +82,10 @@ static class Tomcat8Java21Test extends SamplingOverrides4Test {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverrides4Test {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverrides4Test {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverrides4Test {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides5Test.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides5Test.java index 66c41b73349..0491f1572fe 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides5Test.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverrides5Test.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -59,10 +59,10 @@ static class Tomcat8Java21Test extends SamplingOverrides5Test {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverrides5Test {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverrides5Test {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverrides5Test {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesOldSemconvTest.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesOldSemconvTest.java index f7393dfefd8..872315c5aea 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesOldSemconvTest.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesOldSemconvTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -125,10 +125,10 @@ static class Tomcat8Java21Test extends SamplingOverridesOldSemconvTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverridesOldSemconvTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverridesOldSemconvTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverridesOldSemconvTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesTest.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesTest.java index 7c4814b0b3e..e6ce5538687 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesTest.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -125,10 +125,10 @@ static class Tomcat8Java21Test extends SamplingOverridesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverridesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadNameTest.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadNameTest.java index 6069920a8cf..f61b958e1f5 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadNameTest.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadNameTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static org.assertj.core.api.Assertions.assertThat; @@ -54,10 +54,10 @@ static class Tomcat8Java21Test extends SamplingOverridesThreadNameTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverridesThreadNameTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverridesThreadNameTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverridesThreadNameTest {} // intentionally not including wildfly, since this test is set up for Tomcat thread names diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/UrlQuerySamplingOverridesTest.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/UrlQuerySamplingOverridesTest.java index d428f9b442a..ebb3b0a14c2 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/UrlQuerySamplingOverridesTest.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/UrlQuerySamplingOverridesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -66,10 +66,10 @@ static class Tomcat8Java21Test extends UrlQuerySamplingOverridesTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends UrlQuerySamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends UrlQuerySamplingOverridesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends UrlQuerySamplingOverridesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompat2Test.java b/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompat2Test.java index a4786464f3a..e1c91f6317b 100644 --- a/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompat2Test.java +++ b/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompat2Test.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -55,10 +55,10 @@ static class Tomcat8Java21Test extends SamplingOverridesBackCompat2Test {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverridesBackCompat2Test {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverridesBackCompat2Test {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverridesBackCompat2Test {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompatTest.java b/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompatTest.java index fe2c0651771..f799a4020c5 100644 --- a/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompatTest.java +++ b/smoke-tests/apps/SamplingOverridesBackCompat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesBackCompatTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -124,10 +124,10 @@ static class Tomcat8Java21Test extends SamplingOverridesBackCompatTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SamplingOverridesBackCompatTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SamplingOverridesBackCompatTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SamplingOverridesBackCompatTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootTest.java b/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootTest.java index 3eec2446311..0d79753d4ce 100644 --- a/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootTest.java +++ b/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -163,10 +163,10 @@ static class Tomcat8Java21Test extends SpringBootTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SpringBootTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SpringBootTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SpringBootTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SpringBootAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java b/smoke-tests/apps/SpringBootAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java index 91ed930067e..7ed9277f2d6 100644 --- a/smoke-tests/apps/SpringBootAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java +++ b/smoke-tests/apps/SpringBootAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -70,10 +70,10 @@ static class Tomcat8Java21Test extends SpringBootAutoTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SpringBootAutoTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SpringBootAutoTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SpringBootAutoTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingTest.java b/smoke-tests/apps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingTest.java index 4b655a6bdd1..bfc89f33de2 100644 --- a/smoke-tests/apps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingTest.java +++ b/smoke-tests/apps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -137,10 +137,10 @@ static class Tomcat8Java21Test extends SpringSchedulingTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends SpringSchedulingTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends SpringSchedulingTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends SpringSchedulingTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/Statsbeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/StatsbeatTest.java b/smoke-tests/apps/Statsbeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/StatsbeatTest.java index 16d48dc3811..ce543b33250 100644 --- a/smoke-tests/apps/Statsbeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/StatsbeatTest.java +++ b/smoke-tests/apps/Statsbeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/StatsbeatTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -130,10 +130,10 @@ static class Tomcat8Java21Test extends StatsbeatTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends StatsbeatTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends StatsbeatTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends StatsbeatTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorDeleteLogAttribute.java b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorDeleteLogAttribute.java index 320a1a48b28..d13870e13bc 100644 --- a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorDeleteLogAttribute.java +++ b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorDeleteLogAttribute.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -70,10 +70,10 @@ static class Tomcat8Java21Test extends TelemetryProcessorDeleteLogAttribute {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends TelemetryProcessorDeleteLogAttribute {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends TelemetryProcessorDeleteLogAttribute {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends TelemetryProcessorDeleteLogAttribute {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorMaskLogBodyTest.java b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorMaskLogBodyTest.java index 6aec338b63f..2897505928a 100644 --- a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorMaskLogBodyTest.java +++ b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorMaskLogBodyTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -73,10 +73,10 @@ static class Tomcat8Java21Test extends TelemetryProcessorMaskLogBodyTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends TelemetryProcessorMaskLogBodyTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends TelemetryProcessorMaskLogBodyTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends TelemetryProcessorMaskLogBodyTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsNonStringAttributesTest.java b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsNonStringAttributesTest.java index 66dbddd3c97..f40691dfbcc 100644 --- a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsNonStringAttributesTest.java +++ b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsNonStringAttributesTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -72,10 +72,10 @@ static class Tomcat8Java21Test extends TelemetryProcessorsNonStringAttributesTes @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends TelemetryProcessorsNonStringAttributesTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends TelemetryProcessorsNonStringAttributesTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends TelemetryProcessorsNonStringAttributesTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsOldSemconvTest.java b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsOldSemconvTest.java index 7a0c2408710..e31e7329263 100644 --- a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsOldSemconvTest.java +++ b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsOldSemconvTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -100,10 +100,10 @@ static class Tomcat8Java21Test extends TelemetryProcessorsOldSemconvTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends TelemetryProcessorsOldSemconvTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends TelemetryProcessorsOldSemconvTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends TelemetryProcessorsOldSemconvTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsTest.java b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsTest.java index 195438b9f70..6172ff27469 100644 --- a/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsTest.java +++ b/smoke-tests/apps/TelemetryProcessors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TelemetryProcessorsTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -100,10 +100,10 @@ static class Tomcat8Java21Test extends TelemetryProcessorsTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends TelemetryProcessorsTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends TelemetryProcessorsTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends TelemetryProcessorsTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/apps/WebAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/WebAutoTest.java b/smoke-tests/apps/WebAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/WebAutoTest.java index 09c0f970ff0..2a148986748 100644 --- a/smoke-tests/apps/WebAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/WebAutoTest.java +++ b/smoke-tests/apps/WebAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/WebAutoTest.java @@ -9,8 +9,8 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; @@ -54,10 +54,10 @@ static class Tomcat8Java21Test extends WebAutoTest {} @Environment(TOMCAT_8_JAVA_21_OPENJ9) static class Tomcat8Java21OpenJ9Test extends WebAutoTest {} - @Environment(TOMCAT_8_JAVA_23) + @Environment(TOMCAT_8_JAVA_25) static class Tomcat8Java23Test extends WebAutoTest {} - @Environment(TOMCAT_8_JAVA_23_OPENJ9) + @Environment(TOMCAT_8_JAVA_25_OPENJ9) static class Tomcat8Java23OpenJ9Test extends WebAutoTest {} @Environment(WILDFLY_13_JAVA_8) diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/EnvironmentValue.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/EnvironmentValue.java index 4f2639a5e73..86c77cc3633 100644 --- a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/EnvironmentValue.java +++ b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/EnvironmentValue.java @@ -7,44 +7,44 @@ public enum EnvironmentValue { TOMCAT_8_JAVA_8( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk8-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk8-20251010.18403014526", "/server/webapps"), TOMCAT_8_JAVA_8_OPENJ9( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk8-openj9-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk8-openj9-20251010.18403014526", "/server/webapps"), TOMCAT_8_JAVA_11( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk11-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk11-20251010.18403014526", "/server/webapps"), TOMCAT_8_JAVA_11_OPENJ9( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk11-openj9-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk11-openj9-20251010.18403014526", "/server/webapps"), TOMCAT_8_JAVA_17( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk17-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk17-20251010.18403014526", "/server/webapps"), TOMCAT_8_JAVA_17_OPENJ9( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk17-openj9-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk17-openj9-20251010.18403014526", "/server/webapps"), TOMCAT_8_JAVA_21( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-20251010.18403014526", "/server/webapps"), TOMCAT_8_JAVA_21_OPENJ9( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-openj9-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-openj9-20251010.18403014526", "/server/webapps"), - TOMCAT_8_JAVA_23( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk23-20241014.11321808438", + TOMCAT_8_JAVA_25( + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk25-20251010.18403014526", "/server/webapps"), - TOMCAT_8_JAVA_23_OPENJ9( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk23-openj9-20241014.11321808438", + TOMCAT_8_JAVA_25_OPENJ9( + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk25-openj9-20251010.18403014526", "/server/webapps"), WILDFLY_13_JAVA_8( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-20251010.18403014526", "/opt/jboss/wildfly/standalone/deployments"), WILDFLY_13_JAVA_8_OPENJ9( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-openj9-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-openj9-20251010.18403014526", "/opt/jboss/wildfly/standalone/deployments"), LIBERTY_20_JAVA_8( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-liberty:20.0.0.12-jdk8-20241014.11321808438", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-liberty:20.0.0.12-jdk8-20251010.18403014526", "/config/apps", "app.war"), @@ -56,8 +56,8 @@ public enum EnvironmentValue { JAVA_17_OPENJ9("ibm-semeru-runtimes:open-17-jdk", ""), JAVA_21("eclipse-temurin:21", ""), JAVA_21_OPENJ9("ibm-semeru-runtimes:open-21-jdk", ""), - JAVA_23("eclipse-temurin:23", ""), - JAVA_23_OPENJ9("ibm-semeru-runtimes:open-23-jdk", ""); + JAVA_25("eclipse-temurin:25", ""), + JAVA_25_OPENJ9("ibm-semeru-runtimes:open-25-jdk", ""); private final String imageName; private final String imageAppDir;