This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
The following commit(s) were added to refs/heads/master by this push: new 54dc320 Bump mavenVersion from 4.0.0-rc-2 to 4.0.0-rc-3 (#115) 54dc320 is described below commit 54dc32039b5824ffcd940d68348e90df4981fba6 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Apr 2 18:13:32 2025 +0200 Bump mavenVersion from 4.0.0-rc-2 to 4.0.0-rc-3 (#115) * Bump mavenVersion from 4.0.0-rc-2 to 4.0.0-rc-3 Bumps `mavenVersion` from 4.0.0-rc-2 to 4.0.0-rc-3. Updates `org.apache.maven:maven-api-core` from 4.0.0-rc-2 to 4.0.0-rc-3 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-2...maven-4.0.0-rc-3) Updates `org.apache.maven:maven-api-di` from 4.0.0-rc-2 to 4.0.0-rc-3 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-2...maven-4.0.0-rc-3) Updates `org.apache.maven:maven-api-annotations` from 4.0.0-rc-2 to 4.0.0-rc-3 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-2...maven-4.0.0-rc-3) Updates `org.apache.maven:maven-api-model` from 4.0.0-rc-2 to 4.0.0-rc-3 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-2...maven-4.0.0-rc-3) Updates `org.apache.maven:maven-core` from 4.0.0-rc-2 to 4.0.0-rc-3 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-2...maven-4.0.0-rc-3) Updates `org.apache.maven:maven-impl` from 4.0.0-rc-2 to 4.0.0-rc-3 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-2...maven-4.0.0-rc-3) --- updated-dependencies: - dependency-name: org.apache.maven:maven-api-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-di dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-model dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-core dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-impl dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <supp...@github.com> * Bump org.apache.maven.plugin-testing:maven-plugin-testing-harness Bumps [org.apache.maven.plugin-testing:maven-plugin-testing-harness](https://github.com/apache/maven-plugin-testing) from 4.0.0-beta-3 to 4.0.0-beta-4. - [Release notes](https://github.com/apache/maven-plugin-testing/releases) - [Commits](https://github.com/apache/maven-plugin-testing/compare/maven-plugin-testing-4.0.0-beta-3...v4.0.0-beta-4) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-testing:maven-plugin-testing-harness dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <supp...@github.com> * Fixes --------- Signed-off-by: dependabot[bot] <supp...@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Guillaume Nodet <gno...@gmail.com> --- .github/workflows/maven-verify.yml | 2 +- pom.xml | 4 ++-- src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java | 2 +- .../org/apache/maven/plugins/deploy/DeployMojoPomPackagingTest.java | 4 ++-- src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 1145a39..587cc35 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -27,4 +27,4 @@ jobs: uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 with: maven4-build: true - maven4-version: '4.0.0-rc-2' # as in project + maven4-version: '4.0.0-rc-3' # as in project diff --git a/pom.xml b/pom.xml index f136a0e..c932907 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ under the License. <properties> <javaVersion>17</javaVersion> - <mavenVersion>4.0.0-rc-2</mavenVersion> + <mavenVersion>4.0.0-rc-3</mavenVersion> <guiceVersion>6.0.0</guiceVersion> <mavenAntrunPluginVersion>${version.maven-antrun-plugin}</mavenAntrunPluginVersion> @@ -83,7 +83,7 @@ under the License. <mavenSourcePluginVersion>${version.maven-source-plugin}</mavenSourcePluginVersion> <mavenSurefirePluginVersion>${version.maven-surefire}</mavenSurefirePluginVersion> <mavenWarPluginVersion>${version.maven-war-plugin}</mavenWarPluginVersion> - <mavenPluginTestingVersion>4.0.0-beta-3</mavenPluginTestingVersion> + <mavenPluginTestingVersion>4.0.0-beta-4</mavenPluginTestingVersion> <mavenResolverVersion>2.0.7</mavenResolverVersion> <mockitoVersion>5.16.1</mockitoVersion> <slf4jVersion>2.0.17</slf4jVersion> diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java index 2bfb8cc..882d66f 100644 --- a/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java @@ -42,7 +42,7 @@ import org.apache.maven.api.plugin.testing.stubs.SessionMock; import org.apache.maven.api.services.ArtifactDeployer; import org.apache.maven.api.services.ArtifactDeployerRequest; import org.apache.maven.api.services.ArtifactManager; -import org.apache.maven.internal.impl.InternalSession; +import org.apache.maven.impl.InternalSession; import org.junit.jupiter.api.Test; import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir; diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoPomPackagingTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoPomPackagingTest.java index 9fe0d97..c82e994 100644 --- a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoPomPackagingTest.java +++ b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoPomPackagingTest.java @@ -44,7 +44,7 @@ import org.apache.maven.api.services.ArtifactDeployerRequest; import org.apache.maven.api.services.ArtifactManager; import org.apache.maven.api.services.ProjectManager; import org.apache.maven.api.services.RepositoryFactory; -import org.apache.maven.internal.impl.InternalSession; +import org.apache.maven.impl.InternalSession; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -115,7 +115,7 @@ public class DeployMojoPomPackagingTest { private InternalSession createSession() { InternalSession session = SessionMock.getMockSession(LOCAL_REPO); when(session.getArtifact(any())) - .thenAnswer(iom -> new org.apache.maven.internal.impl.DefaultArtifact( + .thenAnswer(iom -> new org.apache.maven.impl.DefaultArtifact( session, iom.getArgument(0, org.eclipse.aether.artifact.Artifact.class))); when(session.createRemoteRepository(any())).thenAnswer(iom -> session.getService(RepositoryFactory.class) .createRemote(iom.getArgument(0, Repository.class))); diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java index 413ef0d..4f6809f 100644 --- a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java @@ -46,7 +46,7 @@ import org.apache.maven.api.services.ArtifactDeployerRequest; import org.apache.maven.api.services.ArtifactManager; import org.apache.maven.api.services.ProjectManager; import org.apache.maven.api.services.RepositoryFactory; -import org.apache.maven.internal.impl.InternalSession; +import org.apache.maven.impl.InternalSession; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -286,7 +286,7 @@ public class DeployMojoTest { private InternalSession createSession() { InternalSession session = SessionMock.getMockSession(LOCAL_REPO); when(session.getArtifact(any())) - .thenAnswer(iom -> new org.apache.maven.internal.impl.DefaultArtifact( + .thenAnswer(iom -> new org.apache.maven.impl.DefaultArtifact( session, iom.getArgument(0, org.eclipse.aether.artifact.Artifact.class))); when(session.createRemoteRepository(any())).thenAnswer(iom -> session.getService(RepositoryFactory.class) .createRemote(iom.getArgument(0, Repository.class)));