Skip to content

Commit dbf4a39

Browse files
jtduffyjtduffy
committed
Merge branch 'main' into db-parser-optimization
2 parents c96682a + 9be91b8 commit dbf4a39

File tree

51 files changed

+137
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+137
-86
lines changed

‎.github/actions/setup-environment/action.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
with:
1919
distribution: 'temurin'
2020
java-version: |
21-
23
21+
24
2222
21
2323
17
2424
11
@@ -31,7 +31,7 @@ runs:
3131
s|jdk11=11|jdk11=${JAVA_HOME_11_X64}|
3232
s|jdk17=17|jdk17=${JAVA_HOME_17_X64}|
3333
s|jdk21=21|jdk21=${JAVA_HOME_21_X64}|
34-
s|jdk23=23|jdk23=${JAVA_HOME_23_X64}|" gradle.properties.gha
34+
s|jdk24=24|jdk24=${JAVA_HOME_24_X64}|" gradle.properties.gha
3535
cat gradle.properties.gha >> gradle.properties
3636
3737
- name: Setup Gradle
@@ -41,7 +41,7 @@ runs:
4141

4242
- name: Setup Gradle options
4343
shell: bash
44-
run: echo "GRADLE_OPTIONS=--console=plain --parallel -Porg.gradle.java.installations.auto-detect=false -Porg.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64,JAVA_HOME_23_X64" >> $GITHUB_ENV
44+
run: echo "GRADLE_OPTIONS=--console=plain --parallel -Porg.gradle.java.installations.auto-detect=false -Porg.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64,JAVA_HOME_24_X64" >> $GITHUB_ENV
4545

4646
- name: Download S3 instrumentation jar zip
4747
shell: bash

‎.github/workflows/GHA-Functional-Tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
##max-parallel: 1 ## used to force sequential
2929
fail-fast: false
3030
matrix:
31-
java-version: [ 8, 11, 17, 21, 23 ]
31+
java-version: [ 8, 11, 17, 21, 24 ]
3232
steps:
3333
- name: Checkout Java agent
3434
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4

‎.github/workflows/GHA-Unit-Tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# max-parallel: 1 ## used to force sequential vs. concurrent
2626
fail-fast: false
2727
matrix:
28-
java-version: [ 8, 11, 17, 21, 23 ]
28+
java-version: [ 8, 11, 17, 21, 24 ]
2929
steps:
3030
- name: Checkout Java agent
3131
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4

‎.github/workflows/Java-Instrumentation-Tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
java-version: [ 8, 11, 17, 21, 23 ]
23+
java-version: [ 8, 11, 17, 21, 24 ]
2424
name: Java ${{ matrix.java-version }}
2525
timeout-minutes: 120
2626
# needs: install-all-java

‎.github/workflows/Test-AITs.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216
with:
217217
distribution: 'zulu'
218218
java-version: |
219-
23
219+
24
220220
21
221221
17
222222
11
@@ -227,14 +227,14 @@ jobs:
227227
echo "JDK_zulu_11=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
228228
echo "JDK_zulu_17=${JAVA_HOME_17_X64}" >> $GITHUB_ENV
229229
echo "JDK_zulu_21=${JAVA_HOME_21_X64}" >> $GITHUB_ENV
230-
echo "JDK_zulu_23=${JAVA_HOME_23_X64}" >> $GITHUB_ENV
230+
echo "JDK_zulu_24=${JAVA_HOME_24_X64}" >> $GITHUB_ENV
231231
232232
- name: Set up Javas
233233
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # pin@v4
234234
with:
235235
distribution: 'temurin'
236236
java-version: |
237-
23
237+
24
238238
21
239239
17
240240
11
@@ -287,10 +287,10 @@ jobs:
287287
<toolchain>
288288
<type>jdk</type>
289289
<provides>
290-
<version>23</version>
290+
<version>24</version>
291291
</provides>
292292
<configuration>
293-
<jdkHome>${JAVA_HOME_23_X64}</jdkHome>
293+
<jdkHome>${JAVA_HOME_24_X64}</jdkHome>
294294
</configuration>
295295
</toolchain>
296296
</toolchains>
@@ -327,12 +327,12 @@ jobs:
327327
ZULU11=${JDK_zulu_11} \
328328
ZULU17=${JDK_zulu_17} \
329329
ZULU21=${JDK_zulu_21} \
330-
ZULU23=${JDK_zulu_23} \
330+
ZULU24=${JDK_zulu_24} \
331331
JAVA8JRE=${JAVA_HOME_8_X64} \
332332
JAVA11JRE=${JAVA_HOME_11_X64} \
333333
JAVA17JRE=${JAVA_HOME_17_X64} \
334334
JAVA21JRE=${JAVA_HOME_21_X64} \
335-
JAVA23JRE=${JAVA_HOME_23_X64} \
335+
JAVA24JRE=${JAVA_HOME_24_X64} \
336336
conf/autoconfigure
337337
. conf/testenv java
338338
cat conf/java_local_config.yml

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ ext {
7474
// SynchronizedAnnotationNode, SynchronizedClassNode, SynchronizedFieldNode, SynchronizedInnerClassNode, SynchronizedMethodNode,
7575
// SynchronizedModuleExportNode, SynchronizedModuleNode, SynchronizedModuleOpenNode, SynchronizedModuleProvideNode, SynchronizedModuleRequireNode,
7676
// SynchronizedTypeAnnotationNode
77-
asmVersion="9.7"
77+
asmVersion="9.7.1"
7878
}

‎buildSrc/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repositories {
1313
dependencies {
1414
// This is how we do our NR-specific patching. That is, moving Log4jPlugins,
1515
// changing Logger.getLogger, and checking for unmapped dependencies.
16-
implementation("org.ow2.asm:asm:9.7")
17-
implementation("org.ow2.asm:asm-commons:9.7")
16+
implementation("org.ow2.asm:asm:9.7.1")
17+
implementation("org.ow2.asm:asm-commons:9.7.1")
1818

1919
// Shadow is used here because several classes implement the Transformer interface
2020
implementation("com.github.jengelman.gradle.plugins:shadow:6.0.0")

‎functional_test/src/test/java/com/newrelic/agent/instrumentation/ClassLoaderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.newrelic.test.marker.IBMJ9IncompatibleTest;
1414
import com.newrelic.test.marker.Java17IncompatibleTest;
1515
import com.newrelic.test.marker.Java21IncompatibleTest;
16-
import com.newrelic.test.marker.Java23IncompatibleTest;
16+
import com.newrelic.test.marker.Java24IncompatibleTest;
1717
import org.junit.Assert;
1818
import org.junit.Test;
1919
import org.junit.experimental.categories.Category;
@@ -69,7 +69,7 @@ public void testMissingNewRelicClass() throws ClassNotFoundException {
6969

7070
// Java 12 no longer lets us access the declared field
7171
@Test
72-
@Category({ IBMJ9IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
72+
@Category({ IBMJ9IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
7373
public void testSetSystemClassLoader() throws Exception {
7474

7575
final ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();

‎functional_test/src/test/java/com/newrelic/agent/instrumentation/ClassRetransformBootstrapTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
import com.newrelic.test.marker.Java11IncompatibleTest;
1111
import com.newrelic.test.marker.Java17IncompatibleTest;
1212
import com.newrelic.test.marker.Java21IncompatibleTest;
13-
import com.newrelic.test.marker.Java23IncompatibleTest;
13+
import com.newrelic.test.marker.Java24IncompatibleTest;
1414
import org.junit.Test;
1515
import org.junit.experimental.categories.Category;
1616

1717
import javax.activation.MimeType;
1818
import java.util.HashMap;
1919
import java.util.Map;
2020

21-
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
21+
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
2222
public class ClassRetransformBootstrapTest {
2323

2424
/**

‎functional_test/src/test/java/com/newrelic/agent/instrumentation/CustomExtensionTestAddition.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import com.newrelic.test.marker.Java11IncompatibleTest;
1414
import com.newrelic.test.marker.Java17IncompatibleTest;
1515
import com.newrelic.test.marker.Java21IncompatibleTest;
16-
import com.newrelic.test.marker.Java23IncompatibleTest;
16+
import com.newrelic.test.marker.Java24IncompatibleTest;
1717
import org.junit.Test;
1818
import org.junit.experimental.categories.Category;
1919
import org.mockito.Mockito;
2020

2121
import javax.activation.MimeType;
2222

23-
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
23+
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
2424
public class CustomExtensionTestAddition {
2525

2626
@Test

‎gradle.properties.gha

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ jdk8=8
22
jdk11=11
33
jdk17=17
44
jdk21=21
5-
jdk23=23
5+
jdk24=24

‎gradle/script/java.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ test {
9292
ext.configuredWithValidTestJDK = {
9393
if (project.hasProperty("test9") || project.hasProperty("test10") || project.hasProperty("test12") || project.hasProperty("test13") ||
9494
project.hasProperty("test14") || project.hasProperty("test15") || project.hasProperty("test16") || project.hasProperty("test18") ||
95-
project.hasProperty("test19") || project.hasProperty("test20") || project.hasProperty("test22")) {
95+
project.hasProperty("test19") || project.hasProperty("test20") || project.hasProperty("test22") || project.hasProperty("test23")) {
9696
logger.lifecycle("The newrelic-java-agent project does not support testing with the Java version configured by the -PtestN gradle property.")
9797
return false
9898
}
@@ -113,8 +113,8 @@ test {
113113
configuration.call()
114114
}
115115

116-
if (project.hasProperty("test23")) {
117-
configureTest("jdk23") {
116+
if (project.hasProperty("test24")) {
117+
configureTest("jdk24") {
118118
jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED',
119119
'--add-opens=java.base/java.util=ALL-UNNAMED',
120120
'--add-opens=java.base/java.net=ALL-UNNAMED',
@@ -123,12 +123,13 @@ test {
123123
'--add-exports=java.base/sun.net.spi=ALL-UNNAMED',
124124
'--add-exports=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED'
125125
useJUnit {
126-
excludeCategories 'com.newrelic.test.marker.Java23IncompatibleTest'
126+
excludeCategories 'com.newrelic.test.marker.Java24IncompatibleTest'
127127
}
128128
}
129129
// mockito uses a version of bytebuddy that has experimental support for Java 21
130130
systemProperty("net.bytebuddy.experimental", "true")
131131
}
132+
132133
if (project.hasProperty("test21")) {
133134
configureTest("jdk21") {
134135
jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED',

‎instrumentation/akka-2.2/src/test/java/com/nr/instrumentation/akka22/test/AkkaTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.newrelic.agent.introspec.TracedMetricData;
1515
import com.newrelic.test.marker.Java17IncompatibleTest;
1616
import com.newrelic.test.marker.Java21IncompatibleTest;
17-
import com.newrelic.test.marker.Java23IncompatibleTest;
17+
import com.newrelic.test.marker.Java24IncompatibleTest;
1818
import com.nr.instrumentation.akka22.test.actors.broadcasting.ActorA;
1919
import com.nr.instrumentation.akka22.test.actors.broadcasting.ActorB;
2020
import com.nr.instrumentation.akka22.test.actors.broadcasting.ActorC;
@@ -33,7 +33,7 @@
3333
import static org.junit.Assert.assertTrue;
3434

3535
// Not compatible with Java 11+ and Scala 2.13+ https://github.com/scala/bug/issues/12340
36-
@Category({ Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
36+
@Category({ Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
3737
@RunWith(InstrumentationTestRunner.class)
3838
@InstrumentationTestConfig(includePrefixes = {"akka.actor", "akka.dispatch", "akka.pattern", "akka.routing"})
3939
public class AkkaTest {

‎instrumentation/akka-http-2.11_2.4.5/src/test/java/com/agent/instrumentation/akka/http/AkkaHttpRoutesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static org.hamcrest.Matchers.containsString;
3131

3232
// Not compatible with Java 11+ and Scala 2.13+ https://github.com/scala/bug/issues/12340
33-
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
33+
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
3434
@RunWith(InstrumentationTestRunner.class)
3535
@InstrumentationTestConfig(includePrefixes = {"akka", "scala", "com.agent", "com.nr"})
3636
public class AkkaHttpRoutesTest {

‎instrumentation/akka-http-2.11_2.4.5/src/test/java/com/agent/instrumentation/akka/http/AkkaResponseWrapperTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.newrelic.test.marker.Java11IncompatibleTest;
1515
import com.newrelic.test.marker.Java17IncompatibleTest;
1616
import com.newrelic.test.marker.Java21IncompatibleTest;
17-
import com.newrelic.test.marker.Java23IncompatibleTest;
17+
import com.newrelic.test.marker.Java24IncompatibleTest;
1818
import org.junit.Rule;
1919
import org.junit.Test;
2020
import org.junit.experimental.categories.Category;
@@ -30,7 +30,7 @@
3030
import static org.junit.Assert.assertTrue;
3131

3232
// Not compatible with Java 11+ and Scala 2.13+ https://github.com/scala/bug/issues/12340
33-
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
33+
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
3434
@RunWith(InstrumentationTestRunner.class)
3535
@InstrumentationTestConfig(includePrefixes = {"akka", "scala"})
3636
public class AkkaResponseWrapperTest {

‎instrumentation/apache-log4j-1/src/test/java/com/nr/agent/instrumentation/log4j1/LoggingEventMapTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.newrelic.agent.bridge.logging.AppLoggingUtils;
1111
import com.newrelic.agent.bridge.logging.LogAttributeKey;
1212
import com.newrelic.agent.bridge.logging.LogAttributeType;
13-
import com.newrelic.test.marker.Java23IncompatibleTest;
13+
import com.newrelic.test.marker.Java24IncompatibleTest;
1414
import org.apache.log4j.Category;
1515
import org.apache.log4j.MDC;
1616
import org.apache.log4j.Priority;
@@ -29,7 +29,7 @@
2929
import static org.junit.jupiter.api.Assertions.assertNull;
3030

3131
// Log4J1 has a quirk with Java 23(.0.0), maybe this will work when 23.0.1 is released
32-
@org.junit.experimental.categories.Category({ Java23IncompatibleTest.class })
32+
@org.junit.experimental.categories.Category({ Java24IncompatibleTest.class })
3333
public class LoggingEventMapTest {
3434

3535
private static Stream<Arguments> providerParamsForLoggingEventMapTest() {

‎instrumentation/apache-log4j-1/src/test/java/org/apache/log4j/ContextDataTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.newrelic.agent.introspec.InstrumentationTestRunner;
1111
import com.newrelic.agent.introspec.Introspector;
1212
import com.newrelic.agent.model.LogEvent;
13-
import com.newrelic.test.marker.Java23IncompatibleTest;
13+
import com.newrelic.test.marker.Java24IncompatibleTest;
1414
import org.junit.Before;
1515
import org.junit.Test;
1616
import org.junit.runner.RunWith;
@@ -21,7 +21,7 @@
2121
import static org.junit.Assert.assertEquals;
2222

2323
@RunWith(InstrumentationTestRunner.class)
24-
@org.junit.experimental.categories.Category({ Java23IncompatibleTest.class })
24+
@org.junit.experimental.categories.Category({ Java24IncompatibleTest.class })
2525
@InstrumentationTestConfig(includePrefixes = {"org.apache.log4j"}, configName = "application_logging_context_data_enabled.yml")
2626
public class ContextDataTest {
2727

‎instrumentation/async-http-client-2.0.0/src/test/java/com/nr/agent/instrumentation/asynchttpclient/AsyncHttpClient2_0_0Tests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import static org.junit.Assert.assertEquals;
2828
import static org.junit.Assert.assertTrue;
2929

30-
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
30+
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
3131
@RunWith(InstrumentationTestRunner.class)
3232
@InstrumentationTestConfig(includePrefixes = {"com.nr.agent.instrumentation.asynchttpclient", "org.asynchttpclient"})
3333
public class AsyncHttpClient2_0_0Tests {

‎instrumentation/async-http-client-2.1.0/src/test/java/com/nr/agent/instrumentation/asynchttpclient/AsyncHttpClient2_1_0Tests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import static org.junit.Assert.assertEquals;
2727
import static org.junit.Assert.assertTrue;
2828

29-
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
29+
@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
3030
@RunWith(InstrumentationTestRunner.class)
3131
@InstrumentationTestConfig(includePrefixes = {"com.nr.agent.instrumentation.asynchttpclient", "org.asynchttpclient"})
3232
public class AsyncHttpClient2_1_0Tests {

‎instrumentation/cassandra-datastax-4.0.0/src/test/java/com/nr/agent/instrumentation/cassandra/CassandraInstrumented.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.newrelic.test.marker.Java11IncompatibleTest;
1919
import com.newrelic.test.marker.Java17IncompatibleTest;
2020
import com.newrelic.test.marker.Java21IncompatibleTest;
21-
import com.newrelic.test.marker.Java23IncompatibleTest;
21+
import com.newrelic.test.marker.Java24IncompatibleTest;
2222
import org.cassandraunit.CassandraCQLUnit;
2323
import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
2424
import org.junit.Rule;
@@ -34,7 +34,7 @@
3434
import static org.junit.Assert.assertNotNull;
3535

3636
// Issue when running cassandra unit on Java 9+ - https://github.com/jsevellec/cassandra-unit/issues/249
37-
@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
37+
@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
3838
@RunWith(InstrumentationTestRunner.class)
3939
@InstrumentationTestConfig(includePrefixes = { "com.datastax.oss.driver" })
4040
public class CassandraInstrumented {

‎instrumentation/cassandra-datastax-4.0.0/src/test/java/com/nr/agent/instrumentation/cassandra/CassandraNoInstrumentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.newrelic.test.marker.Java11IncompatibleTest;
1717
import com.newrelic.test.marker.Java17IncompatibleTest;
1818
import com.newrelic.test.marker.Java21IncompatibleTest;
19-
import com.newrelic.test.marker.Java23IncompatibleTest;
19+
import com.newrelic.test.marker.Java24IncompatibleTest;
2020
import org.cassandraunit.CassandraCQLUnit;
2121
import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
2222
import org.junit.Rule;
@@ -27,7 +27,7 @@
2727
import static org.junit.Assert.assertEquals;
2828

2929
// Issue when running cassandra unit on Java 9+ - https://github.com/jsevellec/cassandra-unit/issues/249
30-
@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
30+
@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
3131
@RunWith(InstrumentationTestRunner.class)
3232
@InstrumentationTestConfig(includePrefixes = { "none" })
3333
public class CassandraNoInstrumentation {

‎instrumentation/jms-3/build.gradle

-10
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@ verifyInstrumentation {
1414
passesOnly 'jakarta.jms:jakarta.jms-api:[3.0.0-RC1,)'
1515
}
1616

17-
test {
18-
// ActiveMQ calls javax.security.auth.Subject.getSubject. Java 23 added logic that will
19-
// throw an exception if security manager is not enabled.
20-
// They have a ticket regarding this: https://issues.apache.org/jira/browse/ARTEMIS-4975
21-
// but it is unlikely the fix can be used here because it will likely not be Java 8 compatible.
22-
if (project.hasProperty("test23")) {
23-
jvmArgs += '-Djava.security.manager=allow'
24-
}
25-
}
26-
2717
site {
2818
title 'JMS'
2919
type 'Messaging'

0 commit comments

Comments
 (0)