Skip to content

Commit 5009f20

Browse files
erguiti-imaneerguiti-imane
authored
fix(jetty-client:12.0.0.beta0): resolve test failures (#601)
* fix(jetty-client:12.0.0.beta0): resolve test failures - Updated the version of 'org.eclipse.jetty:jetty-client' to 11.0.12 in the testImplementation scope and regenerated metadata. * Update Jetty client dependency and clean up source-config.json
1 parent 48c03ba commit 5009f20

File tree

12 files changed

+479
-2
lines changed

12 files changed

+479
-2
lines changed

‎metadata/org.eclipse.jetty/jetty-client/12.0.0.beta0/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.eclipse.jetty/jetty-client/12.0.0.beta0/reflect-config.json

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
[
2+
{
3+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
4+
"name":"apple.security.AppleProvider",
5+
"methods":[{"name":"<init>","parameterTypes":[] }]
6+
},
7+
{
8+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
9+
"name":"com.sun.crypto.provider.AESCipher$General",
10+
"methods":[{"name":"<init>","parameterTypes":[] }]
11+
},
12+
{
13+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
14+
"name":"com.sun.crypto.provider.ARCFOURCipher",
15+
"methods":[{"name":"<init>","parameterTypes":[] }]
16+
},
17+
{
18+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
19+
"name":"com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
20+
"methods":[{"name":"<init>","parameterTypes":[] }]
21+
},
22+
{
23+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
24+
"name":"com.sun.crypto.provider.DESCipher",
25+
"methods":[{"name":"<init>","parameterTypes":[] }]
26+
},
27+
{
28+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
29+
"name":"com.sun.crypto.provider.DESedeCipher",
30+
"methods":[{"name":"<init>","parameterTypes":[] }]
31+
},
32+
{
33+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
34+
"name":"com.sun.crypto.provider.DHParameters",
35+
"methods":[{"name":"<init>","parameterTypes":[] }]
36+
},
37+
{
38+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
39+
"name":"com.sun.crypto.provider.GaloisCounterMode$AESGCM",
40+
"methods":[{"name":"<init>","parameterTypes":[] }]
41+
},
42+
{
43+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
44+
"name":"com.sun.crypto.provider.TlsMasterSecretGenerator",
45+
"methods":[{"name":"<init>","parameterTypes":[] }]
46+
},
47+
{
48+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
49+
"name":"java.lang.Boolean",
50+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
51+
},
52+
{
53+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
54+
"name":"java.lang.Byte",
55+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
56+
},
57+
{
58+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
59+
"name":"java.lang.Double",
60+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
61+
},
62+
{
63+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
64+
"name":"java.lang.Float",
65+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
66+
},
67+
{
68+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
69+
"name":"java.lang.Integer",
70+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
71+
},
72+
{
73+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
74+
"name":"java.lang.Long",
75+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
76+
},
77+
{
78+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
79+
"name":"java.lang.Short",
80+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
81+
},
82+
{
83+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
84+
"name":"java.lang.Thread",
85+
"methods":[{"name":"isVirtual","parameterTypes":[] }]
86+
},
87+
{
88+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
89+
"name":"java.security.AlgorithmParametersSpi"
90+
},
91+
{
92+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
93+
"name":"java.security.KeyStoreSpi"
94+
},
95+
{
96+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
97+
"name":"java.security.SecureRandomParameters"
98+
},
99+
{
100+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
101+
"name":"java.util.concurrent.Executors",
102+
"methods":[{"name":"newVirtualThreadPerTaskExecutor","parameterTypes":[] }]
103+
},
104+
{
105+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
106+
"name":"javax.security.auth.x500.X500Principal",
107+
"fields":[{"name":"thisX500Name"}],
108+
"methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
109+
},
110+
{
111+
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
112+
"name":"org.eclipse.jetty.util.TypeUtil",
113+
"methods":[{"name":"getClassLoaderLocation","parameterTypes":["java.lang.Class"] }, {"name":"getCodeSourceLocation","parameterTypes":["java.lang.Class"] }, {"name":"getModuleLocation","parameterTypes":["java.lang.Class"] }, {"name":"getSystemClassLoaderLocation","parameterTypes":["java.lang.Class"] }]
114+
},
115+
{
116+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
117+
"name":"sun.security.pkcs12.PKCS12KeyStore",
118+
"methods":[{"name":"<init>","parameterTypes":[] }]
119+
},
120+
{
121+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
122+
"name":"sun.security.pkcs12.PKCS12KeyStore$DualFormatPKCS12",
123+
"methods":[{"name":"<init>","parameterTypes":[] }]
124+
},
125+
{
126+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
127+
"name":"sun.security.provider.DSA$SHA224withDSA",
128+
"methods":[{"name":"<init>","parameterTypes":[] }]
129+
},
130+
{
131+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
132+
"name":"sun.security.provider.DSA$SHA256withDSA",
133+
"methods":[{"name":"<init>","parameterTypes":[] }]
134+
},
135+
{
136+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
137+
"name":"sun.security.provider.JavaKeyStore$JKS",
138+
"methods":[{"name":"<init>","parameterTypes":[] }]
139+
},
140+
{
141+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
142+
"name":"sun.security.provider.NativePRNG",
143+
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
144+
},
145+
{
146+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
147+
"name":"sun.security.provider.SHA",
148+
"methods":[{"name":"<init>","parameterTypes":[] }]
149+
},
150+
{
151+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
152+
"name":"sun.security.provider.SHA2$SHA224",
153+
"methods":[{"name":"<init>","parameterTypes":[] }]
154+
},
155+
{
156+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
157+
"name":"sun.security.provider.SHA2$SHA256",
158+
"methods":[{"name":"<init>","parameterTypes":[] }]
159+
},
160+
{
161+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
162+
"name":"sun.security.provider.SHA5$SHA384",
163+
"methods":[{"name":"<init>","parameterTypes":[] }]
164+
},
165+
{
166+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
167+
"name":"sun.security.provider.SHA5$SHA512",
168+
"methods":[{"name":"<init>","parameterTypes":[] }]
169+
},
170+
{
171+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
172+
"name":"sun.security.provider.X509Factory",
173+
"methods":[{"name":"<init>","parameterTypes":[] }]
174+
},
175+
{
176+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
177+
"name":"sun.security.rsa.PSSParameters",
178+
"methods":[{"name":"<init>","parameterTypes":[] }]
179+
},
180+
{
181+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
182+
"name":"sun.security.rsa.RSAKeyFactory$Legacy",
183+
"methods":[{"name":"<init>","parameterTypes":[] }]
184+
},
185+
{
186+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
187+
"name":"sun.security.rsa.RSAPSSSignature",
188+
"methods":[{"name":"<init>","parameterTypes":[] }]
189+
},
190+
{
191+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
192+
"name":"sun.security.rsa.RSASignature$SHA224withRSA",
193+
"methods":[{"name":"<init>","parameterTypes":[] }]
194+
},
195+
{
196+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
197+
"name":"sun.security.ssl.SSLContextImpl$TLSContext",
198+
"methods":[{"name":"<init>","parameterTypes":[] }]
199+
},
200+
{
201+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
202+
"name":"sun.security.ssl.TrustManagerFactoryImpl$PKIXFactory",
203+
"methods":[{"name":"<init>","parameterTypes":[] }]
204+
},
205+
{
206+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
207+
"name":"sun.security.x509.AuthorityInfoAccessExtension",
208+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
209+
},
210+
{
211+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
212+
"name":"sun.security.x509.AuthorityKeyIdentifierExtension",
213+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
214+
},
215+
{
216+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
217+
"name":"sun.security.x509.BasicConstraintsExtension",
218+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
219+
},
220+
{
221+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
222+
"name":"sun.security.x509.CRLDistributionPointsExtension",
223+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
224+
},
225+
{
226+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
227+
"name":"sun.security.x509.CertificatePoliciesExtension",
228+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
229+
},
230+
{
231+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
232+
"name":"sun.security.x509.ExtendedKeyUsageExtension",
233+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
234+
},
235+
{
236+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
237+
"name":"sun.security.x509.IssuerAlternativeNameExtension",
238+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
239+
},
240+
{
241+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
242+
"name":"sun.security.x509.KeyUsageExtension",
243+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
244+
},
245+
{
246+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
247+
"name":"sun.security.x509.NetscapeCertTypeExtension",
248+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
249+
},
250+
{
251+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
252+
"name":"sun.security.x509.PrivateKeyUsageExtension",
253+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
254+
},
255+
{
256+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
257+
"name":"sun.security.x509.SubjectAlternativeNameExtension",
258+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
259+
},
260+
{
261+
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
262+
"name":"sun.security.x509.SubjectKeyIdentifierExtension",
263+
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
264+
}
265+
]

‎metadata/org.eclipse.jetty/jetty-client/12.0.0.beta0/resource-config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"resources":{
3+
"includes":[{
4+
"condition":{"typeReachable":"org.eclipse.jetty.client.HttpClient"},
5+
"pattern":"\\Qorg/eclipse/jetty/version/build.properties\\E"
6+
}]},
7+
"bundles":[]
8+
}

‎metadata/org.eclipse.jetty/jetty-client/index.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
[
2+
{
3+
"latest": true,
4+
"metadata-version": "12.0.0.beta0",
5+
"module": "org.eclipse.jetty:jetty-client",
6+
"tested-versions": [
7+
"12.0.0.beta0"
8+
]
9+
},
210
{
311
"metadata-version" : "11.0.12",
412
"tested-versions" : [
@@ -20,7 +28,6 @@
2028
"12.0.0.alpha2",
2129
"12.0.0.alpha3"
2230
],
23-
"latest" : true,
2431
"module" : "org.eclipse.jetty:jetty-client"
2532
}
26-
]
33+
]

‎tests/src/index.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,12 @@
376376
"name" : "org.eclipse.jetty:jetty-client",
377377
"versions" : [ "11.0.12" ]
378378
} ]
379+
}, {
380+
"test-project-path" : "org.eclipse.jetty/jetty-client/12.0.0.beta0",
381+
"libraries" : [ {
382+
"name" : "org.eclipse.jetty:jetty-client",
383+
"versions" : [ "12.0.0.beta0" ]
384+
} ]
379385
}, {
380386
"test-project-path" : "org.eclipse.jetty/jetty-server/11.0.12",
381387
"libraries" : [ {

‎tests/src/org.eclipse.jetty/jetty-client/12.0.0.beta0/.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.eclipse.jetty/jetty-client/12.0.0.beta0/build.gradle

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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.eclipse.jetty:jetty-client:$libraryVersion"
16+
testImplementation 'org.assertj:assertj-core:3.22.0'
17+
testImplementation 'org.slf4j:slf4j-api:2.0.5'
18+
testImplementation 'org.slf4j:slf4j-simple:2.0.5'
19+
}
20+
21+
graalvmNative {
22+
binaries {
23+
test {
24+
buildArgs.add('--enable-preview')
25+
}
26+
}
27+
agent {
28+
defaultMode = "conditional"
29+
modes {
30+
conditional {
31+
userCodeFilterPath = "user-code-filter.json"
32+
}
33+
}
34+
metadataCopy {
35+
mergeWithExisting = false
36+
inputTaskNames.add("test")
37+
outputDirectories.add("src/test/resources/META-INF/native-image/org.eclipse.jetty/jetty-client/")
38+
}
39+
}
40+
}

‎tests/src/org.eclipse.jetty/jetty-client/12.0.0.beta0/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
library.version = 12.0.0.beta0
2+
metadata.dir = org.eclipse.jetty/jetty-client/12.0.0.beta0/

‎tests/src/org.eclipse.jetty/jetty-client/12.0.0.beta0/required-docker-images.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nginx:1-alpine-slim

‎tests/src/org.eclipse.jetty/jetty-client/12.0.0.beta0/settings.gradle

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
pluginManagement {
2+
def tckPath = Objects.requireNonNullElse(
3+
System.getenv("GVM_TCK_TCKDIR"),
4+
"../../../../tck-build-logic"
5+
)
6+
includeBuild(tckPath)
7+
}
8+
9+
plugins {
10+
id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
11+
}
12+
13+
rootProject.name = 'org.eclipse.jetty.jetty-client_tests'

0 commit comments

Comments
 (0)