Skip to content

Commit b626286

Browse files
erguiti-imaneerguiti-imane
authored
fix(activemq-client:6.0.0): resolve test failures (#599)
- Removed reliance on the legacy javax.jms API and use jakarta.jms instead - Regenerate GraalVM metadata for activemq-client 6.0.0
1 parent 2ba4d70 commit b626286

File tree

14 files changed

+424
-2
lines changed

14 files changed

+424
-2
lines changed

‎metadata/org.apache.activemq/activemq-client/6.0.0/index.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[
2+
"reflect-config.json",
3+
"resource-config.json"
4+
]

‎metadata/org.apache.activemq/activemq-client/6.0.0/reflect-config.json‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
[
2+
{
3+
"condition":{"typeReachable":"org.apache.activemq.ActiveMQConnectionFactory"},
4+
"name":"org.apache.activemq.ActiveMQConnectionFactory",
5+
"queryAllPublicMethods":true,
6+
"methods":[{"name":"setAlwaysSessionAsync","parameterTypes":["boolean"] }, {"name":"setAlwaysSyncSend","parameterTypes":["boolean"] }, {"name":"setAuditDepth","parameterTypes":["int"] }, {"name":"setAuditMaximumProducerNumber","parameterTypes":["int"] }, {"name":"setCheckForDuplicates","parameterTypes":["boolean"] }, {"name":"setClientID","parameterTypes":["java.lang.String"] }, {"name":"setCloseTimeout","parameterTypes":["int"] }, {"name":"setConsumerExpiryCheckEnabled","parameterTypes":["boolean"] }, {"name":"setCopyMessageOnSend","parameterTypes":["boolean"] }, {"name":"setDisableTimeStampsByDefault","parameterTypes":["boolean"] }, {"name":"setDispatchAsync","parameterTypes":["boolean"] }, {"name":"setNestedMapAndListEnabled","parameterTypes":["boolean"] }, {"name":"setNonBlockingRedelivery","parameterTypes":["boolean"] }, {"name":"setObjectMessageSerializationDefered","parameterTypes":["boolean"] }, {"name":"setOptimizeAcknowledge","parameterTypes":["boolean"] }, {"name":"setOptimizeAcknowledgeTimeOut","parameterTypes":["long"] }, {"name":"setOptimizedAckScheduledAckInterval","parameterTypes":["long"] }, {"name":"setOptimizedMessageDispatch","parameterTypes":["boolean"] }, {"name":"setUseAsyncSend","parameterTypes":["boolean"] }, {"name":"setUseCompression","parameterTypes":["boolean"] }, {"name":"setUseRetroactiveConsumer","parameterTypes":["boolean"] }, {"name":"setWarnAboutUnstartedConnectionTimeout","parameterTypes":["long"] }]
7+
},
8+
{
9+
"condition":{"typeReachable":"org.apache.activemq.ActiveMQConnectionFactory"},
10+
"name":"org.apache.activemq.ActiveMQPrefetchPolicy",
11+
"queryAllPublicMethods":true,
12+
"methods":[{"name":"setDurableTopicPrefetch","parameterTypes":["int"] }, {"name":"setMaximumPendingMessageLimit","parameterTypes":["int"] }, {"name":"setOptimizeDurableTopicPrefetch","parameterTypes":["int"] }, {"name":"setQueueBrowserPrefetch","parameterTypes":["int"] }, {"name":"setQueuePrefetch","parameterTypes":["int"] }, {"name":"setTopicPrefetch","parameterTypes":["int"] }]
13+
},
14+
{
15+
"condition":{"typeReachable":"org.apache.activemq.ActiveMQConnectionFactory"},
16+
"name":"org.apache.activemq.RedeliveryPolicy",
17+
"queryAllPublicMethods":true,
18+
"methods":[{"name":"setBackOffMultiplier","parameterTypes":["double"] }, {"name":"setCollisionAvoidancePercent","parameterTypes":["short"] }, {"name":"setInitialRedeliveryDelay","parameterTypes":["long"] }, {"name":"setMaximumRedeliveries","parameterTypes":["int"] }, {"name":"setMaximumRedeliveryDelay","parameterTypes":["long"] }, {"name":"setPreDispatchCheck","parameterTypes":["boolean"] }, {"name":"setRedeliveryDelay","parameterTypes":["long"] }, {"name":"setUseCollisionAvoidance","parameterTypes":["boolean"] }, {"name":"setUseExponentialBackOff","parameterTypes":["boolean"] }]
19+
},
20+
{
21+
"condition":{"typeReachable":"org.apache.activemq.ActiveMQConnectionFactory"},
22+
"name":"org.apache.activemq.blob.BlobTransferPolicy",
23+
"queryAllPublicMethods":true,
24+
"methods":[{"name":"setBrokerUploadUrl","parameterTypes":["java.lang.String"] }, {"name":"setBufferSize","parameterTypes":["int"] }, {"name":"setUploadUrl","parameterTypes":["java.lang.String"] }]
25+
},
26+
{
27+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
28+
"name":"org.apache.activemq.openwire.OpenWireFormatFactory",
29+
"queryAllPublicMethods":true,
30+
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setCacheEnabled","parameterTypes":["boolean"] }, {"name":"setCacheSize","parameterTypes":["int"] }, {"name":"setHost","parameterTypes":["java.lang.String"] }, {"name":"setMaxFrameSize","parameterTypes":["long"] }, {"name":"setMaxFrameSizeEnabled","parameterTypes":["boolean"] }, {"name":"setMaxInactivityDuration","parameterTypes":["long"] }, {"name":"setMaxInactivityDurationInitalDelay","parameterTypes":["long"] }, {"name":"setSizePrefixDisabled","parameterTypes":["boolean"] }, {"name":"setStackTraceEnabled","parameterTypes":["boolean"] }, {"name":"setTcpNoDelayEnabled","parameterTypes":["boolean"] }, {"name":"setTightEncodingEnabled","parameterTypes":["boolean"] }, {"name":"setVersion","parameterTypes":["int"] }]
31+
},
32+
{
33+
"condition":{"typeReachable":"org.apache.activemq.transport.tcp.TcpTransportFactory"},
34+
"name":"org.apache.activemq.openwire.OpenWireFormatFactory",
35+
"queryAllPublicMethods":true
36+
},
37+
{
38+
"condition":{"typeReachable":"org.apache.activemq.openwire.OpenWireFormat"},
39+
"name":"org.apache.activemq.openwire.v1.MarshallerFactory",
40+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
41+
},
42+
{
43+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
44+
"name":"org.apache.activemq.openwire.v1.MarshallerFactory",
45+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
46+
},
47+
{
48+
"condition":{"typeReachable":"org.apache.activemq.openwire.OpenWireFormat"},
49+
"name":"org.apache.activemq.openwire.v10.MarshallerFactory",
50+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
51+
},
52+
{
53+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
54+
"name":"org.apache.activemq.openwire.v10.MarshallerFactory",
55+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
56+
},
57+
{
58+
"condition":{"typeReachable":"org.apache.activemq.openwire.OpenWireFormat"},
59+
"name":"org.apache.activemq.openwire.v11.MarshallerFactory",
60+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
61+
},
62+
{
63+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
64+
"name":"org.apache.activemq.openwire.v11.MarshallerFactory",
65+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
66+
},
67+
{
68+
"condition":{"typeReachable":"org.apache.activemq.openwire.OpenWireFormat"},
69+
"name":"org.apache.activemq.openwire.v12.MarshallerFactory",
70+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
71+
},
72+
{
73+
"condition":{"typeReachable":"org.apache.activemq.openwire.OpenWireFormat"},
74+
"name":"org.apache.activemq.openwire.v9.MarshallerFactory",
75+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
76+
},
77+
{
78+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
79+
"name":"org.apache.activemq.openwire.v9.MarshallerFactory",
80+
"methods":[{"name":"createMarshallerMap","parameterTypes":["org.apache.activemq.openwire.OpenWireFormat"] }]
81+
},
82+
{
83+
"condition":{"typeReachable":"org.apache.activemq.transport.tcp.TcpTransportFactory"},
84+
"name":"org.apache.activemq.transport.InactivityMonitor",
85+
"queryAllPublicMethods":true
86+
},
87+
{
88+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
89+
"name":"org.apache.activemq.transport.WireFormatNegotiator",
90+
"queryAllPublicMethods":true
91+
},
92+
{
93+
"condition":{"typeReachable":"org.apache.activemq.transport.tcp.TcpTransportFactory"},
94+
"name":"org.apache.activemq.transport.tcp.TcpTransport",
95+
"queryAllPublicMethods":true,
96+
"methods":[{"name":"setConnectionTimeout","parameterTypes":["int"] }, {"name":"setDynamicManagement","parameterTypes":["boolean"] }, {"name":"setJmxPort","parameterTypes":["int"] }, {"name":"setLogWriterName","parameterTypes":["java.lang.String"] }, {"name":"setMinmumWireFormatVersion","parameterTypes":["int"] }, {"name":"setSoTimeout","parameterTypes":["int"] }, {"name":"setSocketBufferSize","parameterTypes":["int"] }, {"name":"setStartLogging","parameterTypes":["boolean"] }, {"name":"setTrace","parameterTypes":["boolean"] }]
97+
},
98+
{
99+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
100+
"name":"org.apache.activemq.transport.tcp.TcpTransportFactory",
101+
"methods":[{"name":"<init>","parameterTypes":[] }]
102+
},
103+
{
104+
"condition":{"typeReachable":"org.apache.activemq.util.LongSequenceGenerator"},
105+
"name":"org.apache.activemq.util.LongSequenceGenerator",
106+
"fields":[{"name":"lastSequenceId"}]
107+
}
108+
]

‎metadata/org.apache.activemq/activemq-client/6.0.0/resource-config.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"resources":{
3+
"includes":[{
4+
"condition":{"typeReachable":"org.apache.activemq.transport.TransportFactory"},
5+
"pattern":"\\QMETA-INF/services/org/apache/activemq/transport/tcp\\E"
6+
}, {
7+
"condition":{"typeReachable":"org.apache.activemq.transport.tcp.TcpTransportFactory"},
8+
"pattern":"\\QMETA-INF/services/org/apache/activemq/wireformat/default\\E"
9+
}, {
10+
"condition":{"typeReachable":"org.apache.activemq.broker.BrokerService"},
11+
"pattern":"\\Qorg/apache/activemq/version.txt\\E"
12+
}]},
13+
"bundles":[]
14+
}

‎metadata/org.apache.activemq/activemq-client/index.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
[
1+
[ {
2+
"latest": true,
3+
"metadata-version": "6.0.0",
4+
"module": "org.apache.activemq:activemq-client",
5+
"tested-versions": [
6+
"6.0.0"
7+
]
8+
},
29
{
310
"metadata-version" : "5.18.1",
411
"tested-versions" : [
@@ -11,7 +18,6 @@
1118
"5.18.7",
1219
"5.19.0"
1320
],
14-
"latest" : true,
1521
"module" : "org.apache.activemq:activemq-client"
1622
}
1723
]

‎tests/src/index.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,12 @@
292292
"name" : "org.apache.activemq:activemq-client",
293293
"versions" : [ "5.18.1" ]
294294
} ]
295+
}, {
296+
"test-project-path" : "org.apache.activemq/activemq-client/6.0.0",
297+
"libraries" : [ {
298+
"name" : "org.apache.activemq:activemq-client",
299+
"versions" : [ "6.0.0" ]
300+
} ]
295301
}, {
296302
"test-project-path" : "org.apache.activemq/artemis-jms-client/2.28.0",
297303
"libraries" : [ {

‎tests/src/org.apache.activemq/activemq-client/6.0.0/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
gradlew.bat
2+
gradlew
3+
gradle/
4+
build/

‎tests/src/org.apache.activemq/activemq-client/6.0.0/build.gradle‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
7+
8+
plugins {
9+
id "org.graalvm.internal.tck"
10+
}
11+
12+
String libraryVersion = tck.testedLibraryVersion.get()
13+
14+
dependencies {
15+
testImplementation "org.apache.activemq:activemq-client:$libraryVersion"
16+
testImplementation "org.apache.activemq:activemq-broker:$libraryVersion"
17+
testImplementation 'org.assertj:assertj-core:3.22.0'
18+
testImplementation 'ch.qos.logback:logback-classic:1.4.5'
19+
testImplementation 'javax.jms:javax.jms-api:2.0.1'
20+
}
21+
22+
graalvmNative {
23+
agent {
24+
defaultMode = "conditional"
25+
modes {
26+
conditional {
27+
userCodeFilterPath = "metadata-user-code-filter.json"
28+
extraFilterPath = "metadata-extra-filter.json"
29+
}
30+
}
31+
}
32+
}

‎tests/src/org.apache.activemq/activemq-client/6.0.0/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
library.version = 6.0.0
2+
metadata.dir = org.apache.activemq/activemq-client/6.0.0/

‎tests/src/org.apache.activemq/activemq-client/6.0.0/metadata-extra-filter.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"rules": [
3+
{"includeClasses": "**"},
4+
{"excludeClasses": "java.lang.**"},
5+
{"excludeClasses": "org.apache.activemq.transport.TransportLoggerFactorySPI"}
6+
]
7+
}

‎tests/src/org.apache.activemq/activemq-client/6.0.0/metadata-user-code-filter.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"rules": [
3+
{"includeClasses": "org.apache.activemq.**"}
4+
]
5+
}

0 commit comments

Comments
 (0)