Skip to content

Commit

Permalink
fix(jetty-client:12.0.0.beta0): resolve test failures
Browse files Browse the repository at this point in the history
- Updated the version of 'org.eclipse.jetty:jetty-client' to 11.0.12 in the testImplementation scope and regenerated metadata.
  • Loading branch information
erguiti-imane committed Feb 19, 2025
1 parent 7305228 commit d2e2f89
Show file tree
Hide file tree
Showing 12 changed files with 479 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
"reflect-config.json",
"resource-config.json"
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
[
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"apple.security.AppleProvider",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.AESCipher$General",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.ARCFOURCipher",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.DESCipher",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.DESedeCipher",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.DHParameters",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.GaloisCounterMode$AESGCM",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"com.sun.crypto.provider.TlsMasterSecretGenerator",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"java.lang.Boolean",
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"java.lang.Byte",
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"java.lang.Double",
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"java.lang.Float",
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"java.lang.Integer",
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"java.lang.Long",
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"java.lang.Short",
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"java.lang.Thread",
"methods":[{"name":"isVirtual","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"java.security.AlgorithmParametersSpi"
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"java.security.KeyStoreSpi"
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"java.security.SecureRandomParameters"
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"java.util.concurrent.Executors",
"methods":[{"name":"newVirtualThreadPerTaskExecutor","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"javax.security.auth.x500.X500Principal",
"fields":[{"name":"thisX500Name"}],
"methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"name":"org.eclipse.jetty.util.TypeUtil",
"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"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.pkcs12.PKCS12KeyStore",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.pkcs12.PKCS12KeyStore$DualFormatPKCS12",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.DSA$SHA224withDSA",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.DSA$SHA256withDSA",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.JavaKeyStore$JKS",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.NativePRNG",
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.SHA",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.SHA2$SHA224",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.SHA2$SHA256",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.SHA5$SHA384",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.SHA5$SHA512",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.provider.X509Factory",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.rsa.PSSParameters",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.rsa.RSAKeyFactory$Legacy",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.rsa.RSAPSSSignature",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.rsa.RSASignature$SHA224withRSA",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.ssl.SSLContextImpl$TLSContext",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.ssl.TrustManagerFactoryImpl$PKIXFactory",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.AuthorityInfoAccessExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.AuthorityKeyIdentifierExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.BasicConstraintsExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.CRLDistributionPointsExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.CertificatePoliciesExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.ExtendedKeyUsageExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.IssuerAlternativeNameExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.KeyUsageExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.NetscapeCertTypeExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.PrivateKeyUsageExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.SubjectAlternativeNameExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
},
{
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"name":"sun.security.x509.SubjectKeyIdentifierExtension",
"methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"resources":{
"includes":[{
"condition":{"typeReachable":"org.eclipse.jetty.client.http.HttpReceiverOverHTTP"},
"pattern":"\\QMETA-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder\\E"
}, {
"condition":{"typeReachable":"org.eclipse.jetty.client.HttpClient"},
"pattern":"\\Qorg/eclipse/jetty/version/build.properties\\E"
}, {
"condition":{"typeReachable":"org.eclipse.jetty.client.AbstractConnectorHttpClientTransport"},
"pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfc.nrm\\E"
}]},
"bundles":[]
}
5 changes: 3 additions & 2 deletions metadata/org.eclipse.jetty/jetty-client/index.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[
{
"latest": true,
"metadata-version": "11.0.12",
"metadata-version": "12.0.0.beta0",
"module": "org.eclipse.jetty:jetty-client",
"tested-versions": [
"11.0.12"
"11.0.12",
"12.0.0.beta0"
]
}
]
6 changes: 6 additions & 0 deletions tests/src/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,12 @@
"name" : "org.eclipse.jetty:jetty-client",
"versions" : [ "11.0.12" ]
} ]
}, {
"test-project-path" : "org.eclipse.jetty/jetty-client/12.0.0.beta0",
"libraries" : [ {
"name" : "org.eclipse.jetty:jetty-client",
"versions" : [ "12.0.0.beta0" ]
} ]
}, {
"test-project-path" : "org.eclipse.jetty/jetty-server/11.0.12",
"libraries" : [ {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
gradlew.bat
gradlew
gradle/
build/
40 changes: 40 additions & 0 deletions tests/src/org.eclipse.jetty/jetty-client/12.0.0.beta0/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright and related rights waived via CC0
*
* You should have received a copy of the CC0 legalcode along with this
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
*/

plugins {
id "org.graalvm.internal.tck"
}

String libraryVersion = tck.testedLibraryVersion.get()

dependencies {
testImplementation "org.eclipse.jetty:jetty-client:11.0.12"
testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'org.slf4j:slf4j-api:2.0.5'
testImplementation 'org.slf4j:slf4j-simple:2.0.5'
}

graalvmNative {
binaries {
test {
buildArgs.add('--enable-preview')
}
}
agent {
defaultMode = "conditional"
modes {
conditional {
userCodeFilterPath = "user-code-filter.json"
}
}
metadataCopy {
mergeWithExisting = false
inputTaskNames.add("test")
outputDirectories.add("src/test/resources/META-INF/native-image/org.eclipse.jetty/jetty-client/")
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
library.version = 12.0.0.beta0
metadata.dir = org.eclipse.jetty/jetty-client/12.0.0.beta0/
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nginx:1-alpine-slim
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
pluginManagement {
def tckPath = Objects.requireNonNullElse(
System.getenv("GVM_TCK_TCKDIR"),
"../../../../tck-build-logic"
)
includeBuild(tckPath)
}

plugins {
id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
}

rootProject.name = 'org.eclipse.jetty.jetty-client_tests'
Loading

0 comments on commit d2e2f89

Please sign in to comment.