diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index dff9e7e754a31..4c7b0762ac039 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1357,3 +1357,9 @@ jobs: cd ui-test npm install --save-dev node --experimental-vm-modules node_modules/.bin/jest + + maven-test: + permissions: + packages: write + name: Run + uses: ./.github/workflows/maven_test.yml diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000000000..ea7e7ea904113 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,24 @@ + + + + + eu.maveniverse.maven.nisse + extension + 0.4.6 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000000000..e61f1a94abdef --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dnisse.compat.osDetector diff --git a/build/mvn b/build/mvn index fef589fc03476..94c205b62b75e 100755 --- a/build/mvn +++ b/build/mvn @@ -125,7 +125,7 @@ install_mvn() { fi if [ $(version $MVN_DETECTED_VERSION) -ne $(version $MVN_VERSION) ]; then local MVN_TARBALL="apache-maven-${MVN_VERSION}-bin.tar.gz" - local FILE_PATH="maven/maven-3/${MVN_VERSION}/binaries/${MVN_TARBALL}" + local FILE_PATH="maven/maven-${MVN_VERSION:0:1}/${MVN_VERSION}/binaries/${MVN_TARBALL}" local APACHE_MIRROR=${APACHE_MIRROR:-'https://www.apache.org/dyn/closer.lua'} local MIRROR_URL_QUERY="?action=download" diff --git a/connect-examples/server-library-example/common/pom.xml b/connect-examples/server-library-example/common/pom.xml index 592c43f26770b..07ebd0d48ac15 100644 --- a/connect-examples/server-library-example/common/pom.xml +++ b/connect-examples/server-library-example/common/pom.xml @@ -47,13 +47,6 @@ - - - kr.motd.maven - os-maven-plugin - 1.7.0 - true - org.xolstice.maven.plugins protobuf-maven-plugin diff --git a/dev/test-dependencies.sh b/dev/test-dependencies.sh index 563a7e1acab4f..c91133be23152 100755 --- a/dev/test-dependencies.sh +++ b/dev/test-dependencies.sh @@ -37,6 +37,9 @@ HADOOP_HIVE_PROFILES=( hadoop-3-hive-2.3 ) +MVN_EXEC_PLUGIN_VERSION=$(build/mvn help:evaluate \ + -Dexpression=exec-maven-plugin.version -q -DforceStdout | grep -o -E "[0-9]+\.[0-9]+\.[0-9]+") + # We'll switch the version to a temp. one, publish POMs using that new version, then switch back to # the old version. We need to do this because the `dependency:build-classpath` task needs to # resolve Spark's internal submodule dependencies. @@ -47,11 +50,11 @@ OLD_VERSION=$($MVN -q \ -Dexec.executable="echo" \ -Dexec.args='${project.version}' \ --non-recursive \ - org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E '[0-9]+\.[0-9]+\.[0-9]+') + org.codehaus.mojo:exec-maven-plugin:3.5.0:exec | grep -E '[0-9]+\.[0-9]+\.[0-9]+') # dependency:get for guava and jetty-io are workaround for SPARK-37302. -GUAVA_VERSION=$(build/mvn help:evaluate -Dexpression=guava.version -q -DforceStdout | grep -E "^[0-9\.]+") +GUAVA_VERSION=$(build/mvn help:evaluate -Dexpression=guava.version -q -DforceStdout | grep -o -E "[0-9][0-9a-zA-Z\.]+") build/mvn dependency:get -Dartifact=com.google.guava:guava:${GUAVA_VERSION} -q -JETTY_VERSION=$(build/mvn help:evaluate -Dexpression=jetty.version -q -DforceStdout | grep -E "[0-9]+\.[0-9]+\.[0-9]+") +JETTY_VERSION=$(build/mvn help:evaluate -Dexpression=jetty.version -q -DforceStdout | grep -o -E "[0-9]+\.[0-9]+\.[0-9]+") build/mvn dependency:get -Dartifact=org.eclipse.jetty:jetty-io:${JETTY_VERSION} -q if [ $? != 0 ]; then echo -e "Error while getting version string from Maven:\n$OLD_VERSION" @@ -61,7 +64,7 @@ SCALA_BINARY_VERSION=$($MVN -q \ -Dexec.executable="echo" \ -Dexec.args='${scala.binary.version}' \ --non-recursive \ - org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E '[0-9]+\.[0-9]+') + org.codehaus.mojo:exec-maven-plugin:3.5.0:exec | grep -E '[0-9]+\.[0-9]+') if [[ "$SCALA_BINARY_VERSION" != "2.13" ]]; then echo "Skip dependency testing on $SCALA_BINARY_VERSION" exit 0 diff --git a/pom.xml b/pom.xml index ec0b9db3ca2aa..f6016c8b44750 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ UTF-8 17 ${java.version} - 3.9.10 + 4.0.0-rc-3 3.5.0 spark 9.8 @@ -2968,7 +2968,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.1 + 3.5.0 @@ -3490,20 +3490,14 @@ --> snapshots-and-staging - - - https://repository.apache.org/content/groups/staging/ - https://repository.apache.org/content/repositories/snapshots/ - - ASF Staging - ${asf.staging} + https://repository.apache.org/content/groups/staging/ ASF Snapshots - ${asf.snapshots} + https://repository.apache.org/content/repositories/snapshots/ true @@ -3516,11 +3510,11 @@ ASF Staging - ${asf.staging} + https://repository.apache.org/content/groups/staging/ ASF Snapshots - ${asf.snapshots} + https://repository.apache.org/content/repositories/snapshots/ true diff --git a/sql/connect/common/pom.xml b/sql/connect/common/pom.xml index 18fb06ff3341d..6ff47ec6d68ce 100644 --- a/sql/connect/common/pom.xml +++ b/sql/connect/common/pom.xml @@ -105,13 +105,6 @@ - - - kr.motd.maven - os-maven-plugin - 1.6.2 - - target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes