From 125df3d3bc2d657212e10652459d6ece838c4338 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Wed, 3 Apr 2024 15:43:16 +0200 Subject: [PATCH] Make sure the scripts listing dependencies are locale independent Katia reported some issues when trying to update the listed dependencies with the scripts because she was using a locale with a different order than the one used to generate the current content. Let's use the C locale as it's the most basic one and should be around on all boxes. --- devtools/bom-descriptor-json/pom.xml | 58 +++++++++---------- docs/pom.xml | 58 +++++++++---------- integration-tests/gradle/pom.xml | 12 ++-- .../gradle/update-dependencies.sh | 4 ++ update-extension-dependencies.sh | 4 ++ 5 files changed, 72 insertions(+), 64 deletions(-) diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml index e154134358399..426891e36c7da 100644 --- a/devtools/bom-descriptor-json/pom.xml +++ b/devtools/bom-descriptor-json/pom.xml @@ -2022,7 +2022,7 @@ io.quarkus - quarkus-resteasy + quarkus-rest-jackson ${project.version} pom test @@ -2035,7 +2035,7 @@ io.quarkus - quarkus-resteasy-client + quarkus-rest-jackson-common ${project.version} pom test @@ -2048,7 +2048,7 @@ io.quarkus - quarkus-resteasy-client-jackson + quarkus-rest-jaxb ${project.version} pom test @@ -2061,7 +2061,7 @@ io.quarkus - quarkus-resteasy-client-jaxb + quarkus-rest-jsonb ${project.version} pom test @@ -2074,7 +2074,7 @@ io.quarkus - quarkus-resteasy-client-jsonb + quarkus-rest-jsonb-common ${project.version} pom test @@ -2087,7 +2087,7 @@ io.quarkus - quarkus-resteasy-client-mutiny + quarkus-rest-kotlin ${project.version} pom test @@ -2100,7 +2100,7 @@ io.quarkus - quarkus-resteasy-client-oidc-filter + quarkus-rest-kotlin-serialization ${project.version} pom test @@ -2113,7 +2113,7 @@ io.quarkus - quarkus-resteasy-client-oidc-token-propagation + quarkus-rest-kotlin-serialization-common ${project.version} pom test @@ -2126,7 +2126,7 @@ io.quarkus - quarkus-resteasy-common + quarkus-rest-links ${project.version} pom test @@ -2139,7 +2139,7 @@ io.quarkus - quarkus-resteasy-jackson + quarkus-rest-qute ${project.version} pom test @@ -2152,7 +2152,7 @@ io.quarkus - quarkus-resteasy-jaxb + quarkus-rest-servlet ${project.version} pom test @@ -2165,7 +2165,7 @@ io.quarkus - quarkus-resteasy-jsonb + quarkus-resteasy ${project.version} pom test @@ -2178,7 +2178,7 @@ io.quarkus - quarkus-resteasy-links + quarkus-resteasy-client ${project.version} pom test @@ -2191,7 +2191,7 @@ io.quarkus - quarkus-resteasy-multipart + quarkus-resteasy-client-jackson ${project.version} pom test @@ -2204,7 +2204,7 @@ io.quarkus - quarkus-resteasy-mutiny + quarkus-resteasy-client-jaxb ${project.version} pom test @@ -2217,7 +2217,7 @@ io.quarkus - quarkus-resteasy-mutiny-common + quarkus-resteasy-client-jsonb ${project.version} pom test @@ -2230,7 +2230,7 @@ io.quarkus - quarkus-resteasy-qute + quarkus-resteasy-client-mutiny ${project.version} pom test @@ -2243,7 +2243,7 @@ io.quarkus - quarkus-resteasy-server-common + quarkus-resteasy-client-oidc-filter ${project.version} pom test @@ -2256,7 +2256,7 @@ io.quarkus - quarkus-rest-jackson + quarkus-resteasy-client-oidc-token-propagation ${project.version} pom test @@ -2269,7 +2269,7 @@ io.quarkus - quarkus-rest-jackson-common + quarkus-resteasy-common ${project.version} pom test @@ -2282,7 +2282,7 @@ io.quarkus - quarkus-rest-jaxb + quarkus-resteasy-jackson ${project.version} pom test @@ -2295,7 +2295,7 @@ io.quarkus - quarkus-rest-jsonb + quarkus-resteasy-jaxb ${project.version} pom test @@ -2308,7 +2308,7 @@ io.quarkus - quarkus-rest-jsonb-common + quarkus-resteasy-jsonb ${project.version} pom test @@ -2321,7 +2321,7 @@ io.quarkus - quarkus-rest-kotlin + quarkus-resteasy-links ${project.version} pom test @@ -2334,7 +2334,7 @@ io.quarkus - quarkus-rest-kotlin-serialization + quarkus-resteasy-multipart ${project.version} pom test @@ -2347,7 +2347,7 @@ io.quarkus - quarkus-rest-kotlin-serialization-common + quarkus-resteasy-mutiny ${project.version} pom test @@ -2360,7 +2360,7 @@ io.quarkus - quarkus-rest-links + quarkus-resteasy-mutiny-common ${project.version} pom test @@ -2373,7 +2373,7 @@ io.quarkus - quarkus-rest-qute + quarkus-resteasy-qute ${project.version} pom test @@ -2386,7 +2386,7 @@ io.quarkus - quarkus-rest-servlet + quarkus-resteasy-server-common ${project.version} pom test diff --git a/docs/pom.xml b/docs/pom.xml index 937de73ba48b9..e70a317eb71e5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -2038,7 +2038,7 @@ io.quarkus - quarkus-resteasy-deployment + quarkus-rest-jackson-deployment ${project.version} pom test @@ -2051,7 +2051,7 @@ io.quarkus - quarkus-resteasy-client-deployment + quarkus-rest-jackson-common-deployment ${project.version} pom test @@ -2064,7 +2064,7 @@ io.quarkus - quarkus-resteasy-client-jackson-deployment + quarkus-rest-jaxb-deployment ${project.version} pom test @@ -2077,7 +2077,7 @@ io.quarkus - quarkus-resteasy-client-jaxb-deployment + quarkus-rest-jsonb-deployment ${project.version} pom test @@ -2090,7 +2090,7 @@ io.quarkus - quarkus-resteasy-client-jsonb-deployment + quarkus-rest-jsonb-common-deployment ${project.version} pom test @@ -2103,7 +2103,7 @@ io.quarkus - quarkus-resteasy-client-mutiny-deployment + quarkus-rest-kotlin-deployment ${project.version} pom test @@ -2116,7 +2116,7 @@ io.quarkus - quarkus-resteasy-client-oidc-filter-deployment + quarkus-rest-kotlin-serialization-deployment ${project.version} pom test @@ -2129,7 +2129,7 @@ io.quarkus - quarkus-resteasy-client-oidc-token-propagation-deployment + quarkus-rest-kotlin-serialization-common-deployment ${project.version} pom test @@ -2142,7 +2142,7 @@ io.quarkus - quarkus-resteasy-common-deployment + quarkus-rest-links-deployment ${project.version} pom test @@ -2155,7 +2155,7 @@ io.quarkus - quarkus-resteasy-jackson-deployment + quarkus-rest-qute-deployment ${project.version} pom test @@ -2168,7 +2168,7 @@ io.quarkus - quarkus-resteasy-jaxb-deployment + quarkus-rest-servlet-deployment ${project.version} pom test @@ -2181,7 +2181,7 @@ io.quarkus - quarkus-resteasy-jsonb-deployment + quarkus-resteasy-deployment ${project.version} pom test @@ -2194,7 +2194,7 @@ io.quarkus - quarkus-resteasy-links-deployment + quarkus-resteasy-client-deployment ${project.version} pom test @@ -2207,7 +2207,7 @@ io.quarkus - quarkus-resteasy-multipart-deployment + quarkus-resteasy-client-jackson-deployment ${project.version} pom test @@ -2220,7 +2220,7 @@ io.quarkus - quarkus-resteasy-mutiny-deployment + quarkus-resteasy-client-jaxb-deployment ${project.version} pom test @@ -2233,7 +2233,7 @@ io.quarkus - quarkus-resteasy-mutiny-common-deployment + quarkus-resteasy-client-jsonb-deployment ${project.version} pom test @@ -2246,7 +2246,7 @@ io.quarkus - quarkus-resteasy-qute-deployment + quarkus-resteasy-client-mutiny-deployment ${project.version} pom test @@ -2259,7 +2259,7 @@ io.quarkus - quarkus-resteasy-server-common-deployment + quarkus-resteasy-client-oidc-filter-deployment ${project.version} pom test @@ -2272,7 +2272,7 @@ io.quarkus - quarkus-rest-jackson-deployment + quarkus-resteasy-client-oidc-token-propagation-deployment ${project.version} pom test @@ -2285,7 +2285,7 @@ io.quarkus - quarkus-rest-jackson-common-deployment + quarkus-resteasy-common-deployment ${project.version} pom test @@ -2298,7 +2298,7 @@ io.quarkus - quarkus-rest-jaxb-deployment + quarkus-resteasy-jackson-deployment ${project.version} pom test @@ -2311,7 +2311,7 @@ io.quarkus - quarkus-rest-jsonb-deployment + quarkus-resteasy-jaxb-deployment ${project.version} pom test @@ -2324,7 +2324,7 @@ io.quarkus - quarkus-rest-jsonb-common-deployment + quarkus-resteasy-jsonb-deployment ${project.version} pom test @@ -2337,7 +2337,7 @@ io.quarkus - quarkus-rest-kotlin-deployment + quarkus-resteasy-links-deployment ${project.version} pom test @@ -2350,7 +2350,7 @@ io.quarkus - quarkus-rest-kotlin-serialization-deployment + quarkus-resteasy-multipart-deployment ${project.version} pom test @@ -2363,7 +2363,7 @@ io.quarkus - quarkus-rest-kotlin-serialization-common-deployment + quarkus-resteasy-mutiny-deployment ${project.version} pom test @@ -2376,7 +2376,7 @@ io.quarkus - quarkus-rest-links-deployment + quarkus-resteasy-mutiny-common-deployment ${project.version} pom test @@ -2389,7 +2389,7 @@ io.quarkus - quarkus-rest-qute-deployment + quarkus-resteasy-qute-deployment ${project.version} pom test @@ -2402,7 +2402,7 @@ io.quarkus - quarkus-rest-servlet-deployment + quarkus-resteasy-server-common-deployment ${project.version} pom test diff --git a/integration-tests/gradle/pom.xml b/integration-tests/gradle/pom.xml index e052d5a0805b3..63f92b2f62a69 100644 --- a/integration-tests/gradle/pom.xml +++ b/integration-tests/gradle/pom.xml @@ -153,15 +153,15 @@ io.quarkus - quarkus-resteasy + quarkus-rest-jackson io.quarkus - quarkus-resteasy-jackson + quarkus-resteasy io.quarkus - quarkus-rest-jackson + quarkus-resteasy-jackson io.quarkus @@ -359,7 +359,7 @@ io.quarkus - quarkus-resteasy-deployment + quarkus-rest-jackson-deployment ${project.version} pom test @@ -372,7 +372,7 @@ io.quarkus - quarkus-resteasy-jackson-deployment + quarkus-resteasy-deployment ${project.version} pom test @@ -385,7 +385,7 @@ io.quarkus - quarkus-rest-jackson-deployment + quarkus-resteasy-jackson-deployment ${project.version} pom test diff --git a/integration-tests/gradle/update-dependencies.sh b/integration-tests/gradle/update-dependencies.sh index df05d02469de9..11bea4fa36049 100755 --- a/integration-tests/gradle/update-dependencies.sh +++ b/integration-tests/gradle/update-dependencies.sh @@ -34,6 +34,10 @@ echo '' # get the Quarkus artifact ids from all gradle build files in this repo # pipefail is switched off briefly so that a better error can be logged when nothing is found set +o pipefail + +# make sure ordering is not locale-dependent +export LANG="C" + # note on sed: -deployment deps are added explicitly later and bom is upstream anyway ARTIFACT_IDS=$(grep -EhR --include 'build*.gradle*' --exclude-dir=build '[iI]mplementation|api|quarkusDev' "${PRG_PATH}" | \ grep -Eo 'quarkus-[a-z0-9-]+' | \ diff --git a/update-extension-dependencies.sh b/update-extension-dependencies.sh index 0751e0a7abebc..b82c138e67fc4 100755 --- a/update-extension-dependencies.sh +++ b/update-extension-dependencies.sh @@ -54,6 +54,10 @@ echo '' # get all "artifact-id" values from the generated json file # pipefail is switched off briefly so that a better error can be logged when nothing is found set +o pipefail + +# make sure ordering is not locale-dependent +export LANG="C" + # note: quarkus-amazon-common was removed from this repo without a relocation ARTIFACT_IDS=$(cd "${PRG_PATH}" && grep '^ "artifact"' devtools/bom-descriptor-json/target/quarkus-bom-quarkus-platform-descriptor-*.json \ | grep -Eo 'quarkus-[a-z0-9-]+' | grep -v quarkus-amazon-common | sort)