diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 405dfe812..0ebe75568 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,6 @@ jobs: distribution: temurin java-version: 21 - name: Maven Install - run: mvn install -B -V -DskipTests -Dair.check.skip-all + run: ./mvnw install -B -V -DskipTests -Dair.check.skip-all - name: Maven Tests - run: mvn install -B -P ci + run: ./mvnw install -B -P ci diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..d58dfb70b --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/drift-client/pom.xml b/drift-client/pom.xml index 9724da546..c254536ce 100644 --- a/drift-client/pom.xml +++ b/drift-client/pom.xml @@ -19,7 +19,6 @@ - com.google.errorprone error_prone_annotations @@ -111,4 +110,20 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + + + diff --git a/drift-codec/pom.xml b/drift-codec/pom.xml index 4e1cb45e3..ea19d701b 100644 --- a/drift-codec/pom.xml +++ b/drift-codec/pom.xml @@ -77,6 +77,17 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + org.apache.maven.plugins maven-shade-plugin diff --git a/drift-idl-generator/pom.xml b/drift-idl-generator/pom.xml index 182eede69..bbbf9d3ce 100644 --- a/drift-idl-generator/pom.xml +++ b/drift-idl-generator/pom.xml @@ -45,4 +45,20 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + + + diff --git a/drift-integration-tests/pom.xml b/drift-integration-tests/pom.xml index 1bd103571..c8bf63bab 100644 --- a/drift-integration-tests/pom.xml +++ b/drift-integration-tests/pom.xml @@ -128,6 +128,12 @@ test + + io.netty + netty-buffer + test + + org.apache.thrift libthrift @@ -152,4 +158,20 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + + + diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java index 82acca69f..03d31924e 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java @@ -47,6 +47,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.net.URL; +import java.nio.file.Paths; import java.security.GeneralSecurityException; import java.util.List; import java.util.Optional; @@ -204,7 +205,7 @@ private static File getResourceFile(String name) if (resource == null) { throw new IllegalArgumentException("Resource not found " + name); } - return new File(resource.getFile()); + return Paths.get(resource.getFile()).toFile(); } @Target({FIELD, PARAMETER, METHOD}) diff --git a/drift-javadoc/pom.xml b/drift-javadoc/pom.xml index 7e9206d53..c8bc8e3a4 100644 --- a/drift-javadoc/pom.xml +++ b/drift-javadoc/pom.xml @@ -58,10 +58,29 @@ assertj-core test + + + org.junit.vintage + junit-vintage-engine + ${dep.junit.version} + test + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-junit-platform + ${dep.plugin.surefire.version} + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/drift-javadoc/src/test/java/io/airlift/drift/javadoc/TestJavdocIntegration.java b/drift-javadoc/src/test/java/io/airlift/drift/javadoc/TestJavdocIntegration.java index 974ee8baa..8cdc56d73 100644 --- a/drift-javadoc/src/test/java/io/airlift/drift/javadoc/TestJavdocIntegration.java +++ b/drift-javadoc/src/test/java/io/airlift/drift/javadoc/TestJavdocIntegration.java @@ -72,8 +72,9 @@ private static void assertGenerated(File basedir, String name) URL expected = getResource(format("basic/%s.txt", name)); name += META_SUFFIX; - assertThat(new File(basedir, format("target/classes/its/%s.class", name))).isFile(); - assertThat(new File(basedir, format("target/generated-sources/annotations/its/%s.java", name))) - .usingCharset(UTF_8).hasContent(asCharSource(expected, UTF_8).read()); + assertThat(basedir.toPath().resolve(format("target/classes/its/%s.class", name))).isRegularFile(); + assertThat(basedir.toPath().resolve(format("target/generated-sources/annotations/its/%s.java", name))) + .usingCharset(UTF_8) + .hasContent(asCharSource(expected, UTF_8).read()); } } diff --git a/drift-maven-plugin/pom.xml b/drift-maven-plugin/pom.xml index 7a689c511..44f3a5efb 100644 --- a/drift-maven-plugin/pom.xml +++ b/drift-maven-plugin/pom.xml @@ -73,6 +73,13 @@ junit test + + + org.junit.vintage + junit-vintage-engine + ${dep.junit.version} + test + diff --git a/drift-maven-plugin/src/test/java/io/airlift/drift/javadoc/TestIdlGeneratorIntegration.java b/drift-maven-plugin/src/test/java/io/airlift/drift/javadoc/TestIdlGeneratorIntegration.java index 10b0d851e..90e002def 100644 --- a/drift-maven-plugin/src/test/java/io/airlift/drift/javadoc/TestIdlGeneratorIntegration.java +++ b/drift-maven-plugin/src/test/java/io/airlift/drift/javadoc/TestIdlGeneratorIntegration.java @@ -72,7 +72,7 @@ private void assertGenerated(String testName) .assertErrorFreeLog(); String expected = Resources.toString(getResource(format("expected/%s.txt", testName)), UTF_8); - String actual = Files.asCharSource(new File(basedir, "target/test.thrift"), UTF_8).read(); + String actual = Files.asCharSource(basedir.toPath().resolve("target/test.thrift").toFile(), UTF_8).read(); assertEquals(expected, actual); } } diff --git a/drift-protocol/pom.xml b/drift-protocol/pom.xml index 641c81396..e226e0938 100644 --- a/drift-protocol/pom.xml +++ b/drift-protocol/pom.xml @@ -32,6 +32,17 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + com.mycila license-maven-plugin diff --git a/drift-server/pom.xml b/drift-server/pom.xml index 00df1e679..1235ec7c1 100644 --- a/drift-server/pom.xml +++ b/drift-server/pom.xml @@ -95,4 +95,20 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + + + diff --git a/drift-transport-apache/pom.xml b/drift-transport-apache/pom.xml index 04557984e..76bd49c66 100644 --- a/drift-transport-apache/pom.xml +++ b/drift-transport-apache/pom.xml @@ -105,4 +105,20 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + + + diff --git a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftClientConfig.java b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftClientConfig.java index a30f08d0c..f78cee376 100644 --- a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftClientConfig.java +++ b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftClientConfig.java @@ -22,7 +22,7 @@ import io.airlift.units.Duration; import org.testng.annotations.Test; -import java.io.File; +import java.nio.file.Paths; import java.util.Map; import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping; @@ -78,8 +78,8 @@ public void testExplicitPropertyMappings() .setSocksProxy(HostAndPort.fromParts("localhost", 11)) .setMaxFrameSize(new DataSize(55, MEGABYTE)) .setSslEnabled(true) - .setTrustCertificate(new File("trust")) - .setKey(new File("key")) + .setTrustCertificate(Paths.get("trust").toFile()) + .setKey(Paths.get("key").toFile()) .setKeyPassword("key_password"); assertFullMapping(properties, expected); diff --git a/drift-transport-netty/pom.xml b/drift-transport-netty/pom.xml index 38adc1435..4b581a6b6 100644 --- a/drift-transport-netty/pom.xml +++ b/drift-transport-netty/pom.xml @@ -89,7 +89,32 @@ io.netty - netty-all + netty-buffer + + + + io.netty + netty-codec-base + + + + io.netty + netty-common + + + + io.netty + netty-handler + + + + io.netty + netty-handler-proxy + + + + io.netty + netty-transport @@ -140,4 +165,20 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + + + diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/ReloadableSslContext.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/ReloadableSslContext.java index f47cb3751..f9ae5d175 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/ReloadableSslContext.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/ReloadableSslContext.java @@ -111,7 +111,8 @@ public synchronized void reload() SslContextBuilder sslContextBuilder; if (forClient) { - sslContextBuilder = SslContextBuilder.forClient().keyManager(privateKey, certificateChain); + sslContextBuilder = SslContextBuilder.forClient().keyManager(privateKey, certificateChain) + .endpointIdentificationAlgorithm(null); } else { sslContextBuilder = SslContextBuilder.forServer(privateKey, certificateChain); diff --git a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyClientConfig.java b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyClientConfig.java index 78f018700..4a3c41530 100644 --- a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyClientConfig.java +++ b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyClientConfig.java @@ -21,7 +21,7 @@ import io.airlift.units.Duration; import org.testng.annotations.Test; -import java.io.File; +import java.nio.file.Paths; import java.util.Map; import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping; @@ -85,8 +85,8 @@ public void testExplicitPropertyMappings() .setSocksProxy(HostAndPort.fromParts("localhost", 11)) .setMaxFrameSize(new DataSize(55, MEGABYTE)) .setSslEnabled(true) - .setTrustCertificate(new File("trust")) - .setKey(new File("key")) + .setTrustCertificate(Paths.get("trust").toFile()) + .setKey(Paths.get("key").toFile()) .setKeyPassword("key_password") .setSessionCacheSize(678) .setSessionTimeout(new Duration(78, HOURS)) diff --git a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/server/TestDriftNettyServerConfig.java b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/server/TestDriftNettyServerConfig.java index 1399ee11b..78adee70e 100644 --- a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/server/TestDriftNettyServerConfig.java +++ b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/server/TestDriftNettyServerConfig.java @@ -20,7 +20,7 @@ import io.airlift.units.Duration; import org.testng.annotations.Test; -import java.io.File; +import java.nio.file.Paths; import java.util.Map; import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping; @@ -87,8 +87,8 @@ public void testExplicitPropertyMappings() .setSslContextRefreshTime(new Duration(33, MINUTES)) .setAllowPlaintext(false) .setSslEnabled(true) - .setTrustCertificate(new File("trust")) - .setKey(new File("key")) + .setTrustCertificate(Paths.get("trust").toFile()) + .setKey(Paths.get("key").toFile()) .setKeyPassword("key_password") .setSessionCacheSize(678) .setSessionTimeout(new Duration(78, HOURS)) diff --git a/drift-transport-spi/pom.xml b/drift-transport-spi/pom.xml index d8f970450..0f13f3c80 100644 --- a/drift-transport-spi/pom.xml +++ b/drift-transport-spi/pom.xml @@ -70,4 +70,20 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.surefire + surefire-testng + ${dep.plugin.surefire.version} + + + + + diff --git a/mvnw b/mvnw new file mode 100755 index 000000000..19529ddf8 --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/pom.xml b/pom.xml index 2c60bd447..f8ad6d101 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 156 + 259 io.airlift.drift @@ -62,6 +62,13 @@ + + io.netty + netty-bom + 4.2.1.Final + pom + import + com.squareup @@ -183,12 +190,6 @@ ${project.version} - - io.netty - netty-all - 4.1.29.Final - - io.takari.maven.plugins takari-plugin-integration-testing