Skip to content

Commit 042dc54

Browse files
committed
Separate unreasonable GraalVM reachability metadata and remove unnecessary dependencies
1 parent c12b567 commit 042dc54

File tree

5 files changed

+35
-60
lines changed

5 files changed

+35
-60
lines changed

metadata/org.ehcache/ehcache/3.10.8-jakarta/reflect-config.json

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,6 @@
180180
}
181181
]
182182
},
183-
{
184-
"condition": {
185-
"typeReachable": "org.ehcache.xml.XmlConfiguration"
186-
},
187-
"name": "jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter",
188-
"methods": [
189-
{
190-
"name": "<init>",
191-
"parameterTypes": []
192-
}
193-
]
194-
},
195183
{
196184
"condition": {
197185
"typeReachable": "org.ehcache.impl.config.SizedResourcePoolImpl"
@@ -807,7 +795,8 @@
807795
"condition": {
808796
"typeReachable": "org.ehcache.core.internal.statistics.StatsUtils$3"
809797
},
810-
"name": "org.ehcache.core.internal.statistics.StatsUtils$3"
798+
"name": "org.ehcache.core.internal.statistics.StatsUtils$3",
799+
"queryAllDeclaredMethods": true
811800
},
812801
{
813802
"condition": {
@@ -1265,7 +1254,8 @@
12651254
"condition": {
12661255
"typeReachable": "org.ehcache.shadow.org.terracotta.context.query.Matchers"
12671256
},
1268-
"name": "org.ehcache.shadow.org.terracotta.context.query.Matchers$3"
1257+
"name": "org.ehcache.shadow.org.terracotta.context.query.Matchers$3",
1258+
"queryAllDeclaredMethods": true
12691259
},
12701260
{
12711261
"condition": {
@@ -1295,7 +1285,8 @@
12951285
"condition": {
12961286
"typeReachable": "org.ehcache.impl.store.BaseStore$BaseStoreProvider"
12971287
},
1298-
"name": "org.ehcache.shadow.org.terracotta.context.query.Matchers$4"
1288+
"name": "org.ehcache.shadow.org.terracotta.context.query.Matchers$4",
1289+
"queryAllDeclaredMethods": true
12991290
},
13001291
{
13011292
"condition": {
@@ -1674,7 +1665,8 @@
16741665
"condition": {
16751666
"typeReachable": "org.ehcache.shadow.org.terracotta.statistics.MappedOperationStatistic$1"
16761667
},
1677-
"name": "org.ehcache.shadow.org.terracotta.statistics.MappedOperationStatistic$1"
1668+
"name": "org.ehcache.shadow.org.terracotta.statistics.MappedOperationStatistic$1",
1669+
"queryAllDeclaredMethods": true
16781670
},
16791671
{
16801672
"condition": {
@@ -5164,5 +5156,19 @@
51645156
"parameterTypes": []
51655157
}
51665158
]
5159+
},
5160+
{
5161+
"condition": {
5162+
"typeReachable": "org.ehcache.core.EhcacheManager"
5163+
},
5164+
"name": "org.ehcache.impl.serialization.CompactJavaSerializer",
5165+
"methods": [
5166+
{
5167+
"name": "<init>",
5168+
"parameterTypes": [
5169+
"java.lang.ClassLoader"
5170+
]
5171+
}
5172+
]
51675173
}
51685174
]

metadata/org.ehcache/ehcache/3.10.8-jakarta/resource-config.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
],
2424
"resources": {
2525
"includes": [
26-
{
27-
"condition": {
28-
"typeReachable": "org.ehcache.impl.config.SizedResourcePoolImpl"
29-
},
30-
"pattern": "\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
31-
},
3226
{
3327
"condition": {
3428
"typeReachable": "org.ehcache.core.spi.ServiceLocator$DependencySet"
@@ -47,12 +41,6 @@
4741
},
4842
"pattern": "\\QMETA-INF/services/org.ehcache.xml.CacheServiceConfigurationParser\\E"
4943
},
50-
{
51-
"condition": {
52-
"typeReachable": "org.ehcache.impl.config.SizedResourcePoolImpl"
53-
},
54-
"pattern": "\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
55-
},
5644
{
5745
"condition": {
5846
"typeReachable": "org.ehcache.jsr107.internal.Jsr107Parser"

tests/src/org.ehcache/ehcache/3.10.8-jakarta/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ dependencies {
2121
}
2222
testImplementation 'org.assertj:assertj-core:3.22.0'
2323
testImplementation 'javax.cache:cache-api:1.1.1'
24-
testImplementation 'org.slf4j:slf4j-api:2.0.4'
25-
testImplementation 'ch.qos.logback:logback-classic:1.4.5'
26-
testImplementation 'ch.qos.logback:logback-core:1.4.5'
24+
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
2725
}
2826

2927
graalvmNative {

tests/src/org.ehcache/ehcache/3.10.8-jakarta/src/test/resources/META-INF/native-image/ehcache-test-metadata/reflect-config.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

tests/src/org.ehcache/ehcache/3.10.8-jakarta/src/test/resources/META-INF/native-image/org.glassfish.jaxb/jaxb-runtime/3.0.2/reflect-config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,5 +417,17 @@
417417
},
418418
"name": "org.glassfish.jaxb.runtime.v2.runtime.property.SingleReferenceNodeProperty",
419419
"queryAllPublicConstructors": true
420+
},
421+
{
422+
"condition": {
423+
"typeReachable": "org.glassfish.jaxb.core.v2.ClassFactory"
424+
},
425+
"name": "jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter",
426+
"methods": [
427+
{
428+
"name": "<init>",
429+
"parameterTypes": []
430+
}
431+
]
420432
}
421433
]

0 commit comments

Comments
 (0)