Skip to content

Commit 54dc320

Browse files
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](apache/maven@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](apache/maven@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](apache/maven@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](apache/maven@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](apache/maven@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](apache/maven@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] <[email protected]> * 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](apache/maven-plugin-testing@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] <[email protected]> * Fixes --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Guillaume Nodet <[email protected]>
1 parent 41f9037 commit 54dc320

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/maven-verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
2828
with:
2929
maven4-build: true
30-
maven4-version: '4.0.0-rc-2' # as in project
30+
maven4-version: '4.0.0-rc-3' # as in project

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ under the License.
6969

7070
<properties>
7171
<javaVersion>17</javaVersion>
72-
<mavenVersion>4.0.0-rc-2</mavenVersion>
72+
<mavenVersion>4.0.0-rc-3</mavenVersion>
7373

7474
<guiceVersion>6.0.0</guiceVersion>
7575
<mavenAntrunPluginVersion>${version.maven-antrun-plugin}</mavenAntrunPluginVersion>
@@ -83,7 +83,7 @@ under the License.
8383
<mavenSourcePluginVersion>${version.maven-source-plugin}</mavenSourcePluginVersion>
8484
<mavenSurefirePluginVersion>${version.maven-surefire}</mavenSurefirePluginVersion>
8585
<mavenWarPluginVersion>${version.maven-war-plugin}</mavenWarPluginVersion>
86-
<mavenPluginTestingVersion>4.0.0-beta-3</mavenPluginTestingVersion>
86+
<mavenPluginTestingVersion>4.0.0-beta-4</mavenPluginTestingVersion>
8787
<mavenResolverVersion>2.0.7</mavenResolverVersion>
8888
<mockitoVersion>5.16.1</mockitoVersion>
8989
<slf4jVersion>2.0.17</slf4jVersion>

src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.apache.maven.api.services.ArtifactDeployer;
4343
import org.apache.maven.api.services.ArtifactDeployerRequest;
4444
import org.apache.maven.api.services.ArtifactManager;
45-
import org.apache.maven.internal.impl.InternalSession;
45+
import org.apache.maven.impl.InternalSession;
4646
import org.junit.jupiter.api.Test;
4747

4848
import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;

src/test/java/org/apache/maven/plugins/deploy/DeployMojoPomPackagingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.apache.maven.api.services.ArtifactManager;
4545
import org.apache.maven.api.services.ProjectManager;
4646
import org.apache.maven.api.services.RepositoryFactory;
47-
import org.apache.maven.internal.impl.InternalSession;
47+
import org.apache.maven.impl.InternalSession;
4848
import org.junit.jupiter.api.Test;
4949
import org.junit.jupiter.api.extension.ExtendWith;
5050
import org.mockito.ArgumentCaptor;
@@ -115,7 +115,7 @@ private ArtifactDeployerRequest execute(DeployMojo mojo) {
115115
private InternalSession createSession() {
116116
InternalSession session = SessionMock.getMockSession(LOCAL_REPO);
117117
when(session.getArtifact(any()))
118-
.thenAnswer(iom -> new org.apache.maven.internal.impl.DefaultArtifact(
118+
.thenAnswer(iom -> new org.apache.maven.impl.DefaultArtifact(
119119
session, iom.getArgument(0, org.eclipse.aether.artifact.Artifact.class)));
120120
when(session.createRemoteRepository(any())).thenAnswer(iom -> session.getService(RepositoryFactory.class)
121121
.createRemote(iom.getArgument(0, Repository.class)));

src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.apache.maven.api.services.ArtifactManager;
4747
import org.apache.maven.api.services.ProjectManager;
4848
import org.apache.maven.api.services.RepositoryFactory;
49-
import org.apache.maven.internal.impl.InternalSession;
49+
import org.apache.maven.impl.InternalSession;
5050
import org.junit.jupiter.api.Test;
5151
import org.junit.jupiter.api.extension.ExtendWith;
5252
import org.mockito.ArgumentCaptor;
@@ -286,7 +286,7 @@ private ArtifactDeployerRequest execute(DeployMojo mojo) {
286286
private InternalSession createSession() {
287287
InternalSession session = SessionMock.getMockSession(LOCAL_REPO);
288288
when(session.getArtifact(any()))
289-
.thenAnswer(iom -> new org.apache.maven.internal.impl.DefaultArtifact(
289+
.thenAnswer(iom -> new org.apache.maven.impl.DefaultArtifact(
290290
session, iom.getArgument(0, org.eclipse.aether.artifact.Artifact.class)));
291291
when(session.createRemoteRepository(any())).thenAnswer(iom -> session.getService(RepositoryFactory.class)
292292
.createRemote(iom.getArgument(0, Repository.class)));

0 commit comments

Comments
 (0)