Skip to content

Commit 467b103

Browse files
committed
Fix BundledJarsJUnitTest and GfshDependencyJarIntegrationTest
- Update expected_jars.txt with new Jakarta EE dependencies: * asm-commons, asm-tree * jakarta.el-api, jakarta.enterprise.cdi-api, jakarta.enterprise.lang-model * jakarta.inject-api, jakarta.interceptor-api * jetty-jndi, jetty-plus - Update gfsh_dependency_classpath.txt with complete dependency list - Both tests now passing locally These new dependencies are expected with Jakarta EE 10 migration
1 parent 9e90f36 commit 467b103

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

geode-assembly/src/integrationTest/resources/expected_jars.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ accessors-smart
66
antlr
77
antlr-runtime
88
asm
9+
asm-commons
10+
asm-tree
911
byte-buddy
1012
classgraph
1113
classmate
@@ -37,6 +39,11 @@ jackson-datatype-jsr
3739
jakarta.activation
3840
jakarta.activation-api
3941
jakarta.annotation-api
42+
jakarta.el-api
43+
jakarta.enterprise.cdi-api
44+
jakarta.enterprise.lang-model
45+
jakarta.inject-api
46+
jakarta.interceptor-api
4047
jakarta.mail-api
4148
jakarta.resource-api
4249
jakarta.servlet-api
@@ -50,6 +57,8 @@ jcip-annotations
5057
jetty-ee
5158
jetty-http
5259
jetty-io
60+
jetty-jndi
61+
jetty-plus
5362
jetty-security
5463
jetty-server
5564
jetty-session

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
geode-lucene-0.0.0.jar
22
geode-wan-0.0.0.jar
33
geode-connectors-0.0.0.jar
4-
geode-gfsh-0.0.0.jar
54
geode-log4j-0.0.0.jar
65
geode-rebalancer-0.0.0.jar
76
geode-old-client-support-0.0.0.jar
87
geode-memcached-0.0.0.jar
98
geode-cq-0.0.0.jar
109
geode-core-0.0.0.jar
10+
geode-gfsh-0.0.0.jar
1111
geode-membership-0.0.0.jar
1212
geode-tcp-server-0.0.0.jar
1313
geode-management-0.0.0.jar
@@ -36,6 +36,7 @@ log4j-core-2.17.2.jar
3636
log4j-jcl-2.17.2.jar
3737
log4j-jul-2.17.2.jar
3838
log4j-api-2.17.2.jar
39+
spring-aop-6.1.14.jar
3940
spring-shell-autoconfigure-3.3.3.jar
4041
spring-shell-standard-commands-3.3.3.jar
4142
spring-shell-standard-3.3.3.jar
@@ -75,6 +76,10 @@ classgraph-4.8.147.jar
7576
micrometer-core-1.12.11.jar
7677
fastutil-8.5.8.jar
7778
jakarta.resource-api-2.1.0.jar
79+
jetty-ee10-annotations-12.0.27.jar
80+
jetty-ee10-plus-12.0.27.jar
81+
jakarta.enterprise.cdi-api-4.0.1.jar
82+
jakarta.interceptor-api-2.1.0.jar
7883
jakarta.annotation-api-2.1.1.jar
7984
jetty-ee10-webapp-12.0.27.jar
8085
jetty-ee10-servlet-12.0.27.jar
@@ -85,6 +90,7 @@ jna-platform-5.11.0.jar
8590
jna-5.11.0.jar
8691
jetty-ee-12.0.27.jar
8792
jetty-session-12.0.27.jar
93+
jetty-plus-12.0.27.jar
8894
jetty-security-12.0.27.jar
8995
jetty-server-12.0.27.jar
9096
snappy-0.5.jar
@@ -102,6 +108,7 @@ jetty-io-12.0.27.jar
102108
spring-boot-starter-logging-3.3.5.jar
103109
logback-classic-1.5.11.jar
104110
jul-to-slf4j-2.0.16.jar
111+
jetty-jndi-12.0.27.jar
105112
jetty-util-12.0.27.jar
106113
slf4j-api-2.0.17.jar
107114
jakarta.activation-2.0.1.jar
@@ -120,12 +127,18 @@ jline-style-3.26.3.jar
120127
jline-terminal-3.26.3.jar
121128
ST4-4.3.3.jar
122129
snakeyaml-2.2.jar
130+
asm-commons-9.8.jar
131+
asm-tree-9.8.jar
132+
asm-9.8.jar
123133
reactive-streams-1.0.4.jar
124134
jline-native-3.26.3.jar
125135
antlr-runtime-3.5.2.jar
126136
tomcat-embed-el-10.1.31.jar
127137
hibernate-validator-8.0.1.Final.jar
138+
jakarta.enterprise.lang-model-4.0.1.jar
128139
jakarta.validation-api-3.0.2.jar
129140
jboss-logging-3.4.3.Final.jar
130141
classmate-1.5.1.jar
131142
logback-core-1.5.11.jar
143+
jakarta.el-api-5.0.0.jar
144+
jakarta.inject-api-2.0.1.jar

0 commit comments

Comments
 (0)