From 94a1510f55e4bbee2d03c67149df0b774d163155 Mon Sep 17 00:00:00 2001 From: Jingsong Lee Date: Sun, 21 May 2023 20:38:25 +0800 Subject: [PATCH] [license] Remove maven wrapper files and add Path to license (#1178) --- .github/workflows/check-licensing.yml | 4 +- .github/workflows/e2e-tests-1.14-jdk11.yml | 4 +- .github/workflows/e2e-tests-1.14.yml | 4 +- .github/workflows/e2e-tests-1.15-jdk11.yml | 4 +- .github/workflows/e2e-tests-1.15.yml | 4 +- .github/workflows/e2e-tests-1.16-jdk11.yml | 4 +- .github/workflows/e2e-tests-1.16.yml | 4 +- .github/workflows/e2e-tests-1.17-jdk11.yml | 4 +- .github/workflows/e2e-tests-1.17.yml | 4 +- .github/workflows/publish_snapshot.yml | 4 +- .github/workflows/unitcase-flink-jdk11.yml | 4 +- .github/workflows/unitcase-jdk11.yml | 4 +- .github/workflows/utitcase-flink.yml | 4 +- .github/workflows/utitcase.yml | 4 +- .mvn/wrapper/maven-wrapper.properties | 18 -- LICENSE | 1 + mvnw | 316 --------------------- mvnw.cmd | 188 ------------ tools/ci/sonar_check.sh | 2 +- 19 files changed, 30 insertions(+), 551 deletions(-) delete mode 100644 .mvn/wrapper/maven-wrapper.properties delete mode 100755 mvnw delete mode 100644 mvnw.cmd diff --git a/.github/workflows/check-licensing.yml b/.github/workflows/check-licensing.yml index 93043b23f6e1..4c73f3a0022d 100644 --- a/.github/workflows/check-licensing.yml +++ b/.github/workflows/check-licensing.yml @@ -43,12 +43,12 @@ jobs: run: | set -o pipefail - ./mvnw clean deploy ${{ env.MVN_COMMON_OPTIONS }} -Dmaven.test.skip=true \ + mvn clean deploy ${{ env.MVN_COMMON_OPTIONS }} -Dmaven.test.skip=true \ -DaltDeploymentRepository=validation_repository::default::file:${{ env.MVN_VALIDATION_DIR }} \ | tee ${{ env.MVN_BUILD_OUTPUT_FILE }} - name: Check licensing run: | - ./mvnw ${{ env.MVN_COMMON_OPTIONS }} exec:java@check-licensing -N \ + mvn ${{ env.MVN_COMMON_OPTIONS }} exec:java@check-licensing -N \ -Dexec.args="${{ env.MVN_BUILD_OUTPUT_FILE }} $(pwd) ${{ env.MVN_VALIDATION_DIR }}" \ -Dlog4j.configurationFile=file://$(pwd)/tools/ci/log4j.properties diff --git a/.github/workflows/e2e-tests-1.14-jdk11.yml b/.github/workflows/e2e-tests-1.14-jdk11.yml index fcc1463c9cce..88f5de46835f 100644 --- a/.github/workflows/e2e-tests-1.14-jdk11.yml +++ b/.github/workflows/e2e-tests-1.14-jdk11.yml @@ -45,11 +45,11 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.14 - run: ./mvnw clean install -DskipTests -Pflink-1.14 + run: mvn clean install -DskipTests -Pflink-1.14 - name: Test Flink 1.14 run: | # run tests with random timezone to find out timezone related bugs . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.14 + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.14 diff --git a/.github/workflows/e2e-tests-1.14.yml b/.github/workflows/e2e-tests-1.14.yml index cd75a290c4c6..505a95b0615e 100644 --- a/.github/workflows/e2e-tests-1.14.yml +++ b/.github/workflows/e2e-tests-1.14.yml @@ -45,7 +45,7 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.14 - run: ./mvnw clean install -DskipTests -Pflink-1.14 + run: mvn clean install -DskipTests -Pflink-1.14 - name: Test Flink 1.14 timeout-minutes: 60 run: | @@ -53,4 +53,4 @@ jobs: . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.14 + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.14 diff --git a/.github/workflows/e2e-tests-1.15-jdk11.yml b/.github/workflows/e2e-tests-1.15-jdk11.yml index 48ae5a33882a..92692002e072 100644 --- a/.github/workflows/e2e-tests-1.15-jdk11.yml +++ b/.github/workflows/e2e-tests-1.15-jdk11.yml @@ -45,11 +45,11 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.15 - run: ./mvnw clean install -DskipTests -Pflink-1.15 + run: mvn clean install -DskipTests -Pflink-1.15 - name: Test Flink 1.15 run: | # run tests with random timezone to find out timezone related bugs . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.15 + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.15 diff --git a/.github/workflows/e2e-tests-1.15.yml b/.github/workflows/e2e-tests-1.15.yml index ce827f8b6857..7485506c3b4e 100644 --- a/.github/workflows/e2e-tests-1.15.yml +++ b/.github/workflows/e2e-tests-1.15.yml @@ -45,7 +45,7 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.15 - run: ./mvnw clean install -DskipTests -Pflink-1.15 + run: mvn clean install -DskipTests -Pflink-1.15 - name: Test Flink 1.15 timeout-minutes: 60 run: | @@ -53,4 +53,4 @@ jobs: . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.15 + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.15 diff --git a/.github/workflows/e2e-tests-1.16-jdk11.yml b/.github/workflows/e2e-tests-1.16-jdk11.yml index b7acacaca0f9..96f841a54113 100644 --- a/.github/workflows/e2e-tests-1.16-jdk11.yml +++ b/.github/workflows/e2e-tests-1.16-jdk11.yml @@ -45,11 +45,11 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.16 - run: ./mvnw clean install -DskipTests + run: mvn clean install -DskipTests - name: Test Flink 1.16 run: | # run tests with random timezone to find out timezone related bugs . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone diff --git a/.github/workflows/e2e-tests-1.16.yml b/.github/workflows/e2e-tests-1.16.yml index bb2f85762d8c..b0b149ce1c8c 100644 --- a/.github/workflows/e2e-tests-1.16.yml +++ b/.github/workflows/e2e-tests-1.16.yml @@ -45,7 +45,7 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.16 - run: ./mvnw clean install -DskipTests -Pflink-1.16 + run: mvn clean install -DskipTests -Pflink-1.16 - name: Test Flink 1.16 timeout-minutes: 60 run: | @@ -53,4 +53,4 @@ jobs: . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.16 + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pflink-1.16 diff --git a/.github/workflows/e2e-tests-1.17-jdk11.yml b/.github/workflows/e2e-tests-1.17-jdk11.yml index 1f46eb8b91f7..94c6516d01a1 100644 --- a/.github/workflows/e2e-tests-1.17-jdk11.yml +++ b/.github/workflows/e2e-tests-1.17-jdk11.yml @@ -45,11 +45,11 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.17 - run: ./mvnw clean install -DskipTests + run: mvn clean install -DskipTests - name: Test Flink 1.17 run: | # run tests with random timezone to find out timezone related bugs . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone diff --git a/.github/workflows/e2e-tests-1.17.yml b/.github/workflows/e2e-tests-1.17.yml index 7c622c041d0c..ff30f4f5ecc0 100644 --- a/.github/workflows/e2e-tests-1.17.yml +++ b/.github/workflows/e2e-tests-1.17.yml @@ -44,7 +44,7 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build Flink 1.17 - run: ./mvnw clean install -DskipTests + run: mvn clean install -DskipTests - name: Test Flink 1.17 timeout-minutes: 60 run: | @@ -52,4 +52,4 @@ jobs: . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone + mvn test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml index 481c92ad7a9b..38e304b4f035 100644 --- a/.github/workflows/publish_snapshot.yml +++ b/.github/workflows/publish_snapshot.yml @@ -65,10 +65,10 @@ jobs: echo "$ASF_PASSWORD" >> $tmp_settings echo "" >> $tmp_settings - ./mvnw --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip -DskipTests -Papache-release + mvn --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip -DskipTests -Papache-release mv $tmp_settings /tmp/paimon-shade cd /tmp/paimon-shade - ./mvnw --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip -DskipTests -Papache-release + mvn --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip -DskipTests -Papache-release rm $tmp_settings diff --git a/.github/workflows/unitcase-flink-jdk11.yml b/.github/workflows/unitcase-flink-jdk11.yml index e9184bd099b0..39132243363b 100644 --- a/.github/workflows/unitcase-flink-jdk11.yml +++ b/.github/workflows/unitcase-flink-jdk11.yml @@ -45,11 +45,11 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build - run: ./mvnw clean install -DskipTests + run: mvn clean install -DskipTests - name: Test run: | # run tests with random timezone to find out timezone related bugs . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw clean install -pl 'org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone + mvn clean install -pl 'org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone diff --git a/.github/workflows/unitcase-jdk11.yml b/.github/workflows/unitcase-jdk11.yml index 33f6c35cda9e..ed74180ffc2e 100644 --- a/.github/workflows/unitcase-jdk11.yml +++ b/.github/workflows/unitcase-jdk11.yml @@ -45,11 +45,11 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build - run: ./mvnw clean install -DskipTests + run: mvn clean install -DskipTests - name: Test run: | # run tests with random timezone to find out timezone related bugs . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw clean install -pl '!paimon-e2e-tests,!org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone + mvn clean install -pl '!paimon-e2e-tests,!org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone diff --git a/.github/workflows/utitcase-flink.yml b/.github/workflows/utitcase-flink.yml index 532c81cad630..8749942ce40a 100644 --- a/.github/workflows/utitcase-flink.yml +++ b/.github/workflows/utitcase-flink.yml @@ -44,7 +44,7 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build - run: ./mvnw clean install -DskipTests + run: mvn clean install -DskipTests - name: Test timeout-minutes: 60 run: | @@ -52,4 +52,4 @@ jobs: . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw clean install -pl 'org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone + mvn clean install -pl 'org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone diff --git a/.github/workflows/utitcase.yml b/.github/workflows/utitcase.yml index d01e409c067c..5a6e56c08fae 100644 --- a/.github/workflows/utitcase.yml +++ b/.github/workflows/utitcase.yml @@ -45,7 +45,7 @@ jobs: java-version: ${{ env.JDK_VERSION }} distribution: 'adopt' - name: Build - run: ./mvnw clean install -DskipTests + run: mvn clean install -DskipTests - name: Test timeout-minutes: 60 run: | @@ -53,4 +53,4 @@ jobs: . .github/workflows/utils.sh jvm_timezone=$(random_timezone) echo "JVM timezone is set to $jvm_timezone" - ./mvnw clean install -pl '!paimon-e2e-tests,!org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone + mvn clean install -pl '!paimon-e2e-tests,!org.apache.paimon:paimon-flink-common' -Duser.timezone=$jvm_timezone diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 8c79a83ae43f..000000000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/LICENSE b/LICENSE index d98f6ed90f08..48c931558ebe 100644 --- a/LICENSE +++ b/LICENSE @@ -208,6 +208,7 @@ for text of these licenses. Apache Software Foundation License 2.0 -------------------------------------- +paimon-common/src/main/java/org/apache/paimon/fs/Path.java paimon-common/src/main/java/org/apache/paimon/lookup/hash/HashLookupStoreWriter.java paimon-common/src/main/java/org/apache/paimon/lookup/hash/HashLookupStoreReader.java paimon-common/src/main/java/org/apache/paimon/utils/VarLengthIntUtils.java diff --git a/mvnw b/mvnw deleted file mode 100755 index 5643201c7d82..000000000000 --- a/mvnw +++ /dev/null @@ -1,316 +0,0 @@ -#!/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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - 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" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`\\unset -f command; \\command -v java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index 8a15b7f311fe..000000000000 --- a/mvnw.cmd +++ /dev/null @@ -1,188 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/tools/ci/sonar_check.sh b/tools/ci/sonar_check.sh index 3d93984efab4..95673c3896d6 100644 --- a/tools/ci/sonar_check.sh +++ b/tools/ci/sonar_check.sh @@ -18,7 +18,7 @@ if [ ! "$SONAR_TOKEN" ]; then echo "SONAR_TOKEN environment is null, skip check" exit 0 fi -./mvnw --batch-mode verify sonar:sonar \ +mvn --batch-mode verify sonar:sonar \ -Dmaven.test.skip=true -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.organization=apache \ -Dsonar.projectKey=apache_incubator-paimon \