From a6def64cdc445a5d821fd9ece2e8c93509fe3ef9 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 24 Apr 2024 15:56:31 +0200 Subject: [PATCH 1/2] [MDEPLOY-316] Parent 42 and prerequisite 3.6.3 --- pom.xml | 4 ++-- .../org/apache/maven/plugins/deploy/AbstractDeployMojo.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f8422a88..92c4bc03 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 41 + 42 @@ -43,7 +43,7 @@ under the License. - 3.2.5 + 3.6.3 diff --git a/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java b/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java index 2c5c1d9c..d8da6922 100644 --- a/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java +++ b/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java @@ -99,6 +99,7 @@ protected void warnIfAffectedPackagingAndMaven(final String packaging) { * Creates resolver {@link RemoteRepository} equipped with needed whistles and bells. */ protected RemoteRepository getRemoteRepository(final String repositoryId, final String url) { + // TODO: RepositorySystem#newDeploymentRepository does this very same thing! RemoteRepository result = new RemoteRepository.Builder(repositoryId, "default", url).build(); if (result.getAuthentication() == null || result.getProxy() == null) { From 833967452509626db064415b984f8272fc7aba1e Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 24 Apr 2024 16:03:37 +0200 Subject: [PATCH 2/2] Quickfix: move to zulu --- .github/workflows/maven-verify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 932827cf..681f3d34 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -25,3 +25,5 @@ jobs: build: name: Verify uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 + with: + jdk-distribution-matrix: '[ "zulu" ]'