diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml index cdc8b7ac25f2..31fad28c3129 100644 --- a/.github/workflows/milestone.yml +++ b/.github/workflows/milestone.yml @@ -20,7 +20,7 @@ jobs: - name: Get milestone from pom.xml run: | .github/bin/retry ./mvnw -v - MILESTONE_NUMBER="$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d- -f1)" + MILESTONE_NUMBER="$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout --raw-streams | cut -d- -f1)" echo "Setting PR milestone to ${MILESTONE_NUMBER}" echo "MILESTONE_NUMBER=${MILESTONE_NUMBER}" >> $GITHUB_ENV - name: Set milestone to PR diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 12fbe1e9078d..1c4045059ae5 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.2 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip +distributionUrl=https://repository.apache.org/content/repositories/snapshots/org/apache/maven/apache-maven/4.0.0-SNAPSHOT/apache-maven-4.0.0-20251027.151952-115-bin.zip diff --git a/core/docker/build.sh b/core/docker/build.sh index cc6e554e07f3..c0a5b51e2ac2 100755 --- a/core/docker/build.sh +++ b/core/docker/build.sh @@ -104,12 +104,12 @@ if [ -n "$TRINO_VERSION" ]; then for artifactId in "io.trino:${SERVER_ARTIFACT}:${TRINO_VERSION}:tar.gz" io.trino:trino-cli:"${TRINO_VERSION}":jar:executable; do "${SOURCE_DIR}/mvnw" -C dependency:get -Dtransitive=false -Dartifact="$artifactId" done - local_repo=$("${SOURCE_DIR}/mvnw" -B help:evaluate -Dexpression=settings.localRepository -q -DforceStdout) + local_repo=$("${SOURCE_DIR}/mvnw" -B help:evaluate -Dexpression=settings.localRepository -q -DforceStdout --raw-streams) trino_server="$local_repo/io/trino/${SERVER_ARTIFACT}/${TRINO_VERSION}/${SERVER_ARTIFACT}-${TRINO_VERSION}.tar.gz" trino_client="$local_repo/io/trino/trino-cli/${TRINO_VERSION}/trino-cli-${TRINO_VERSION}-executable.jar" chmod +x "$trino_client" else - TRINO_VERSION=$("${SOURCE_DIR}/mvnw" -f "${SOURCE_DIR}/pom.xml" --quiet help:evaluate -Dexpression=project.version -DforceStdout) + TRINO_VERSION=$("${SOURCE_DIR}/mvnw" -f "${SOURCE_DIR}/pom.xml" --quiet help:evaluate -Dexpression=project.version -DforceStdout --raw-streams) echo "🎯 Using currently built artifacts from the core/${SERVER_ARTIFACT} and client/trino-cli modules and version ${TRINO_VERSION}" trino_server="${SOURCE_DIR}/core/${SERVER_ARTIFACT}/target/${SERVER_ARTIFACT}-${TRINO_VERSION}.tar.gz" trino_client="${SOURCE_DIR}/client/trino-cli/target/trino-cli-${TRINO_VERSION}-executable.jar" diff --git a/testing/trino-product-tests-launcher/bin/run-launcher b/testing/trino-product-tests-launcher/bin/run-launcher index a4e2a2f9fc9c..b35981cd686b 100755 --- a/testing/trino-product-tests-launcher/bin/run-launcher +++ b/testing/trino-product-tests-launcher/bin/run-launcher @@ -9,7 +9,7 @@ if command -v mvnd >/dev/null; then trino_version=$(mvnd -B help:evaluate -Dexpression=pom.version -q -DforceStdout --raw-streams -Dmvnd.logPurgePeriod=999999d) mvn="mvnd" else - trino_version=$(./mvnw -B help:evaluate -Dexpression=pom.version -q -DforceStdout) + trino_version=$(./mvnw -B help:evaluate -Dexpression=pom.version -q -DforceStdout --raw-streams) mvn="./mvnw" fi launcher_jar="${target}/trino-product-tests-launcher-${trino_version}-executable.jar" diff --git a/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh b/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh index 3221785525e6..0f4bdbe002e4 100755 --- a/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh +++ b/testing/trino-test-jdbc-compatibility-old-driver/bin/run_tests.sh @@ -8,7 +8,7 @@ maven_run_tests="${maven} clean test ${MAVEN_TEST:--B} -pl :trino-test-jdbc-comp "${maven}" -version -current_version=$(${maven} help:evaluate -Dexpression=project.version -q -DforceStdout) +current_version=$(${maven} help:evaluate -Dexpression=project.version -q -DforceStdout --raw-streams) previous_released_version=$((${current_version%-SNAPSHOT}-1)) first_tested_version=352 # test n-th version only