From e5c66d8bca70aab7d12a8bd4af0a181488a4d100 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Mon, 9 Dec 2024 21:43:41 +0530 Subject: [PATCH 01/17] ci(spanner): use airlock for fetching dependencies --- .kokoro/build.sh | 10 ++- .kokoro/dependencies.sh | 12 ++- .kokoro/presubmit/dependencies.cfg | 5 ++ .mvn/extensions.xml | 8 ++ google-cloud-spanner-bom/pom.xml | 113 +++++++++++++++++++++++++++++ pom.xml | 113 +++++++++++++++++++++++++++++ 6 files changed, 258 insertions(+), 3 deletions(-) create mode 100644 .mvn/extensions.xml diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d603c59859b..69d53d01dc2 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -15,6 +15,8 @@ set -eo pipefail +set -x + ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) ## cd to the parent directory, i.e. the root of the git repo @@ -33,9 +35,15 @@ fi mvn -version echo ${JOB_TYPE} +INSTALL_OPTS="" +if [[ $ENABLE_AIRLOCK = 'true' ]]; then + INSTALL_OPTS="-Pairlock-trusted" +fi + # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn install -B -V -ntp \ + mvn install -B -V \ + ${INSTALL_OPTS} \ -DskipTests=true \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 3c613d6b56d..623385d8a61 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -16,6 +16,8 @@ set -eo pipefail shopt -s nullglob +set -x + ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) ## cd to the parent directory, i.e. the root of the git repo @@ -53,9 +55,15 @@ if [ ! -z "${JAVA11_HOME}" ]; then setJava "${JAVA11_HOME}" fi +INSTALL_OPTS="" +if [[ $ENABLE_AIRLOCK = 'true' ]]; then + INSTALL_OPTS="-Pairlock-trusted" +fi + # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V -ntp \ + mvn install -B -V \ + ${INSTALL_OPTS} \ -DskipTests=true \ -Dmaven.javadoc.skip=true \ -Dclirr.skip=true @@ -64,4 +72,4 @@ if [ ! -z "${JAVA8_HOME}" ]; then setJava "${JAVA8_HOME}" fi -mvn -B dependency:analyze -DfailOnWarning=true +mvn -B ${INSTALL_OPTS} dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/presubmit/dependencies.cfg b/.kokoro/presubmit/dependencies.cfg index 808bf138e1c..9e1ffbc98d7 100644 --- a/.kokoro/presubmit/dependencies.cfg +++ b/.kokoro/presubmit/dependencies.cfg @@ -10,3 +10,8 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-spanner/.kokoro/dependencies.sh" } + +env_vars: { + key: "ENABLE_AIRLOCK", + value: "true" +} \ No newline at end of file diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 00000000000..38f37df431b --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + com.google.cloud.artifactregistry + artifactregistry-maven-wagon + 2.2.3 + + \ No newline at end of file diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 1db01f10946..71007d8b273 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -119,4 +119,117 @@ + + + + + airlock-trusted + + + airlock + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p-trusted + default + + true + + + true + + + + + airlock-staging + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven + default + + true + + + true + + + + central + + Maven Central remote repository + https://repo.maven.apache.org/maven2 + default + + false + + + false + + + + rso-public-grid + + Maven Central Sonatype repository + https://repository.sonatype.org/content/groups/sonatype-public-grid + default + + false + + + false + + + + + + airlock + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p-trusted + default + + true + + + true + + + + + airlock-staging + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven + default + + true + + + true + + + + central + + Maven Central remote repository + https://repo.maven.apache.org/maven2 + default + + false + + + false + + + + rso-public-grid + + Maven Central Sonatype repository + https://repository.sonatype.org/content/groups/sonatype-public-grid + default + + false + + + false + + + + + diff --git a/pom.xml b/pom.xml index 72a2a6797e3..a1b6a07cb27 100644 --- a/pom.xml +++ b/pom.xml @@ -234,4 +234,117 @@ + + + + + airlock-trusted + + + airlock + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p-trusted + default + + true + + + true + + + + + airlock-staging + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven + default + + true + + + true + + + + central + + Maven Central remote repository + https://repo.maven.apache.org/maven2 + default + + false + + + false + + + + rso-public-grid + + Maven Central Sonatype repository + https://repository.sonatype.org/content/groups/sonatype-public-grid + default + + false + + + false + + + + + + airlock + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p-trusted + default + + true + + + true + + + + + airlock-staging + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven + default + + true + + + true + + + + central + + Maven Central remote repository + https://repo.maven.apache.org/maven2 + default + + false + + + false + + + + rso-public-grid + + Maven Central Sonatype repository + https://repository.sonatype.org/content/groups/sonatype-public-grid + default + + false + + + false + + + + + From 3cd56b697b02ae4b23aeea3cf5fc945cc37544f3 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 08:27:49 +0530 Subject: [PATCH 02/17] remove staging 3p --- google-cloud-spanner-bom/pom.xml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 71007d8b273..37ac468949c 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -137,19 +137,6 @@ true - - - airlock-staging - Airlock - artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven - default - - true - - - true - - central @@ -190,19 +177,6 @@ true - - - airlock-staging - Airlock - artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven - default - - true - - - true - - central From a742d9bcccccc1f3f9d962e12aa750f9d0659e64 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 08:38:11 +0530 Subject: [PATCH 03/17] remove staging 3p --- pom.xml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/pom.xml b/pom.xml index a1b6a07cb27..f6c2da249b7 100644 --- a/pom.xml +++ b/pom.xml @@ -252,19 +252,6 @@ true - - - airlock-staging - Airlock - artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven - default - - true - - - true - - central @@ -305,19 +292,6 @@ true - - - airlock-staging - Airlock - artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven - default - - true - - - true - - central From bcd790edb672ee46fd08081a0bcc39532cb6c42a Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 08:55:01 +0530 Subject: [PATCH 04/17] enable maven --- pom.xml | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index f6c2da249b7..4ae0d81dc0c 100644 --- a/pom.xml +++ b/pom.xml @@ -252,19 +252,19 @@ true - - central - - Maven Central remote repository - https://repo.maven.apache.org/maven2 - default - - false - - - false - - + + + + + + + + + + + + + rso-public-grid @@ -292,19 +292,19 @@ true - - central - - Maven Central remote repository - https://repo.maven.apache.org/maven2 - default - - false - - - false - - + + + + + + + + + + + + + rso-public-grid From 13f396fe646ae44a9bab35fbb50ff6771717603e Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 09:01:38 +0530 Subject: [PATCH 05/17] enable maven --- pom.xml | 78 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 4ae0d81dc0c..a1b6a07cb27 100644 --- a/pom.xml +++ b/pom.xml @@ -252,19 +252,32 @@ true - - - - - - - - - - - - - + + + airlock-staging + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven + default + + true + + + true + + + + central + + Maven Central remote repository + https://repo.maven.apache.org/maven2 + default + + false + + + false + + rso-public-grid @@ -292,19 +305,32 @@ true - - - - - - - - - - - - - + + + airlock-staging + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/ah-3p-staging-maven + default + + true + + + true + + + + central + + Maven Central remote repository + https://repo.maven.apache.org/maven2 + default + + false + + + false + + rso-public-grid From b13b74815eaee2cd148879dec12d6f54de5ec91f Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 22:27:22 +0530 Subject: [PATCH 06/17] update query --- google-cloud-spanner-executor/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index ccb631bb1a2..b309f0b0ea3 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -45,7 +45,7 @@ com.google.cloud.opentelemetry exporter-trace - 0.32.0 + 0.33.0 com.google.cloud From 85d734d7b6ca6bcd0b10d00fdd5297104817158c Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 22:49:02 +0530 Subject: [PATCH 07/17] update query --- google-cloud-spanner-executor/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index b309f0b0ea3..839daf569bb 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -47,6 +47,11 @@ exporter-trace 0.33.0 + + com.google.cloud.opentelemetry + shared-resourcemapping + 0.33.0 + com.google.cloud google-cloud-spanner From 18adf7f41f2980a82a4f1a0429d2e7e53d373979 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 23:44:42 +0530 Subject: [PATCH 08/17] fix build --- google-cloud-spanner-executor/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index 839daf569bb..398040b04c3 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -271,7 +271,7 @@ org.apache.maven.plugins maven-dependency-plugin - com.google.api:gax,org.apache.maven.surefire:surefire-junit4 + com.google.api:gax,org.apache.maven.surefire:surefire-junit4,com.google.cloud.opentelemetry.shared-resourcemapping From ef93814552181e471cf2983d5e3c2f0136753d02 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Tue, 10 Dec 2024 23:59:22 +0530 Subject: [PATCH 09/17] fix ignored dependencies --- google-cloud-spanner-executor/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index 398040b04c3..9e25932d5a7 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -271,7 +271,7 @@ org.apache.maven.plugins maven-dependency-plugin - com.google.api:gax,org.apache.maven.surefire:surefire-junit4,com.google.cloud.opentelemetry.shared-resourcemapping + com.google.api:gax,org.apache.maven.surefire:surefire-junit4,com.google.cloud.opentelemetry:shared-resourcemapping From f457018cf70b318ad7adc9e02f5792d1f3722d89 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Wed, 11 Dec 2024 10:32:02 +0530 Subject: [PATCH 10/17] Add debug logs --- .kokoro/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 623385d8a61..df740cc7bb5 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -62,7 +62,7 @@ fi # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -X -B -V \ ${INSTALL_OPTS} \ -DskipTests=true \ -Dmaven.javadoc.skip=true \ From 5feefae7d226ecd7d44d9df55a1c98f6617a190d Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Wed, 11 Dec 2024 11:13:42 +0530 Subject: [PATCH 11/17] remove debug logs --- .kokoro/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index df740cc7bb5..623385d8a61 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -62,7 +62,7 @@ fi # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -X -B -V \ + mvn install -B -V \ ${INSTALL_OPTS} \ -DskipTests=true \ -Dmaven.javadoc.skip=true \ From e5c0266e4f2e5676e5c48756ad714ecde38b0930 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Wed, 11 Dec 2024 11:41:18 +0530 Subject: [PATCH 12/17] remove debug logs --- .kokoro/dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 623385d8a61..a59691791e3 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -62,7 +62,8 @@ fi # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install + -B -V \ ${INSTALL_OPTS} \ -DskipTests=true \ -Dmaven.javadoc.skip=true \ From 73063ecc9c4b527adc96eb5a6b8f6755da2fd737 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Fri, 13 Dec 2024 12:26:36 +0530 Subject: [PATCH 13/17] use airlock --- .kokoro/dependencies.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index a59691791e3..623385d8a61 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -62,8 +62,7 @@ fi # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install - -B -V \ + mvn install -B -V \ ${INSTALL_OPTS} \ -DskipTests=true \ -Dmaven.javadoc.skip=true \ From 49d3db8a51dcf26f35d717637eb3099d0cd1c903 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Fri, 13 Dec 2024 13:34:44 +0530 Subject: [PATCH 14/17] use airlock --- google-cloud-spanner-executor/pom.xml | 2 ++ samples/snippets/pom.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index 9e25932d5a7..c3a013f1401 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -205,7 +205,9 @@ + org.apache.maven.plugins maven-resources-plugin + 3.3.1 copy-resources diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index df0488ac116..e62493ba6ef 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -118,7 +118,9 @@ + org.apache.maven.plugins maven-resources-plugin + 3.3.1 copy-resources From 5156bf0bc0acf1344d2a7817a6e55967609fde80 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Fri, 13 Dec 2024 13:54:31 +0530 Subject: [PATCH 15/17] increase flatten-pom version --- google-cloud-spanner/pom.xml | 1 + grpc-google-cloud-spanner-admin-database-v1/pom.xml | 1 + grpc-google-cloud-spanner-admin-instance-v1/pom.xml | 1 + grpc-google-cloud-spanner-executor-v1/pom.xml | 1 + grpc-google-cloud-spanner-v1/pom.xml | 1 + proto-google-cloud-spanner-admin-database-v1/pom.xml | 1 + proto-google-cloud-spanner-admin-instance-v1/pom.xml | 1 + proto-google-cloud-spanner-executor-v1/pom.xml | 1 + proto-google-cloud-spanner-v1/pom.xml | 1 + 9 files changed, 9 insertions(+) diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index b7589c10203..211a01805e3 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -133,6 +133,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 000a88b6261..2338de4a496 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -83,6 +83,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index b794aca19dd..ad7affdf10b 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -83,6 +83,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml index b63e9bd6038..f6c371ddeff 100644 --- a/grpc-google-cloud-spanner-executor-v1/pom.xml +++ b/grpc-google-cloud-spanner-executor-v1/pom.xml @@ -75,6 +75,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index dc1c2c1c936..d45f8b991b9 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -75,6 +75,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index 4d29a245a80..b699e6dcd11 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -41,6 +41,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 08da9e3b853..8eb0a52e50e 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -41,6 +41,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml index 23a213ca72f..d1e31a89793 100644 --- a/proto-google-cloud-spanner-executor-v1/pom.xml +++ b/proto-google-cloud-spanner-executor-v1/pom.xml @@ -64,6 +64,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 org.codehaus.mojo diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 8c3dc7a8adf..b668ccabf6a 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -37,6 +37,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.6.0 From 40e77d4ba7de3cf248f061a654283db81768b49d Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Fri, 13 Dec 2024 14:00:42 +0530 Subject: [PATCH 16/17] increase flatten-pom version --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index a1b6a07cb27..a894136009a 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,11 @@ true + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + From c9415093ad0c1c62ca6c6d5177d0c8380e2e067b Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Fri, 13 Dec 2024 14:13:08 +0530 Subject: [PATCH 17/17] increase resource plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a894136009a..d3c2bae41cb 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.3.1 + 4.0.0-beta-1