This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new be0779e Bump parent pom to 45
be0779e is described below
commit be0779ebb1dc838d7f2be872ce32a269de23f433
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Nov 16 01:42:17 2025 +0100
Bump parent pom to 45
---
pom.xml | 8 +++--
.../resources/remote/RemoteResourcesMojoTest.java | 2 +-
...ependencyPoms.java => ITBadDependencyPoms.java} | 2 +-
...Delimiter.java => ITCustomFilterDelimiter.java} | 2 +-
...calOverride.java => ITFilterLocalOverride.java} | 2 +-
...teFromBundle.java => ITGenerateFromBundle.java} | 2 +-
...ITGenerateFromBundleWithTypeAndClassifier.java} | 2 +-
...omOverride.java => ITGenerateFromOverride.java} | 2 +-
...yProjects.java => ITGetDependencyProjects.java} | 2 +-
...tionRoot.java => ITRunOnlyAtExecutionRoot.java} | 2 +-
...alArtifact.java => ITSupplementalArtifact.java} | 2 +-
.../plugin/resources/remote/stub/ArtifactStub.java | 36 +++++++++++-----------
.../remote/stub/MavenProjectBuildStub.java | 2 ++
13 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9860f25..7ac8a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>43</version>
+ <version>45</version>
<relativePath />
</parent>
@@ -72,6 +72,8 @@ under the License.
<!-- Used by site documentation as well, do not remove -->
<mavenFilteringVersion>3.4.0</mavenFilteringVersion>
+
+ <version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
</properties>
<dependencyManagement>
@@ -143,6 +145,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
+ <version>${version.maven-plugin-tools}</version>
<scope>provided</scope>
</dependency>
@@ -180,7 +183,6 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.9.0.M4</version>
<scope>provided</scope>
</dependency>
@@ -419,7 +421,7 @@ under the License.
<systemPropertyVariables>
<!--
The tests have to pick the right repository.
- SUREFIRE-1385: Cannot set maven.repo.local directly
because it might have been set by the user
+ SUREFIRE-1385: Cannot set maven.repo.local directly
because it might have been set by the user
on the CLI directly (and it would be preferred)
-->
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
index 7cbdcf1..583732b 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
@@ -62,7 +62,7 @@ public class RemoteResourcesMojoTest extends
AbstractMojoTestCase {
static final String DEFAULT_BUNDLE_POM_PATH =
"target/test-classes/unit/rrmojotest/bundle-plugin-config.xml";
static final String DEFAULT_PROCESS_POM_PATH =
"target/test-classes/unit/rrmojotest/process-plugin-config.xml";
- private final String LOCAL_REPO = "target/local-repo/";
+ private static final String LOCAL_REPO = "target/local-repo/";
@Override
public void setUp() throws Exception {
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
similarity index 97%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
index ccb0856..b3d6cf1 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
/**
* @author Benjamin Bentmann
*/
-public class IT_BadDependencyPoms extends AbstractIT {
+public class ITBadDependencyPoms extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
File dir = TestUtils.getTestDir("bad-dependency-poms");
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
similarity index 96%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
index c8776ad..32212d0 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class IT_CustomFilterDelimiter extends AbstractIT {
+public class ITCustomFilterDelimiter extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
File dir = TestUtils.getTestDir("custom-filter-delim");
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
similarity index 96%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
index 73cc527..8e5308e 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class IT_FilterLocalOverride extends AbstractIT {
+public class ITFilterLocalOverride extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
File dir = TestUtils.getTestDir("filter-local-override");
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
similarity index 97%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
index ce42626..89f3eeb 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class IT_GenerateFromBundle extends AbstractIT {
+public class ITGenerateFromBundle extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
File dir = TestUtils.getTestDir("generate-from-bundle");
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
similarity index 95%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
index 345730a..631e008 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class IT_GenerateFromBundleWithTypeAndClassifier extends AbstractIT {
+public class ITGenerateFromBundleWithTypeAndClassifier extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
similarity index 96%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
index c4ba634..9cd6586 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
-public class IT_GenerateFromOverride extends AbstractIT {
+public class ITGenerateFromOverride extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
File dir = TestUtils.getTestDir("generate-from-override");
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
similarity index 97%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
index e178a84..91ae97a 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
/**
* @author Benjamin Bentmann
*/
-public class IT_GetDependencyProjects extends AbstractIT {
+public class ITGetDependencyProjects extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
File dir = TestUtils.getTestDir("get-dependency-projects");
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
similarity index 98%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
index a151ed4..f01b4b0 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
@@ -36,7 +36,7 @@ import static org.junit.Assume.assumeTrue;
/**
* @author Benjamin Bentmann
*/
-public class IT_RunOnlyAtExecutionRoot extends AbstractIT {
+public class ITRunOnlyAtExecutionRoot extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
// Workaround for Windows + Maven-3.5.x/3.6.0 + Jenkins due to MNG-6261
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
similarity index 97%
rename from
src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
rename to
src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
index a4af81c..6db4d7a 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
/**
* @author John Casey
*/
-public class IT_SupplementalArtifact extends AbstractIT {
+public class ITSupplementalArtifact extends AbstractIT {
@Test
public void test() throws IOException, URISyntaxException,
VerificationException {
File dir = TestUtils.getTestDir("supplemental-artifact");
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java
index df746a4..5d5f441 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java
@@ -106,8 +106,8 @@ public class ArtifactStub implements Artifact {
}
@Override
- public void setFile(File _file) {
- file = _file;
+ public void setFile(File file) {
+ this.file = file;
}
@Override
@@ -131,8 +131,8 @@ public class ArtifactStub implements Artifact {
}
@Override
- public void setVersion(String _version) {
- version = _version;
+ public void setVersion(String version) {
+ this.version = version;
}
@Override
@@ -185,8 +185,8 @@ public class ArtifactStub implements Artifact {
}
@Override
- public void setDownloadUrl(String _downloadUrl) {
- downloadUrl = _downloadUrl;
+ public void setDownloadUrl(String downloadUrl) {
+ this.downloadUrl = downloadUrl;
}
@Override
@@ -211,8 +211,8 @@ public class ArtifactStub implements Artifact {
public void setDependencyTrail(List<String> dependencyTrail) {}
@Override
- public void setScope(String _scope) {
- scope = _scope;
+ public void setScope(String scope) {
+ this.scope = scope;
}
@Override
@@ -229,13 +229,13 @@ public class ArtifactStub implements Artifact {
}
@Override
- public void setGroupId(String _groupId) {
- groupId = _groupId;
+ public void setGroupId(String groupId) {
+ this.groupId = groupId;
}
@Override
- public void setArtifactId(String _artifactId) {
- artifactId = _artifactId;
+ public void setArtifactId(String artifactId) {
+ this.artifactId = artifactId;
}
@Override
@@ -244,8 +244,8 @@ public class ArtifactStub implements Artifact {
}
@Override
- public void setResolved(boolean _resolved) {
- resolved = _resolved;
+ public void setResolved(boolean resolved) {
+ this.resolved = resolved;
}
@Override
@@ -267,8 +267,8 @@ public class ArtifactStub implements Artifact {
}
@Override
- public void setRelease(boolean _release) {
- release = _release;
+ public void setRelease(boolean release) {
+ this.release = release;
}
@Override
@@ -285,8 +285,8 @@ public class ArtifactStub implements Artifact {
}
@Override
- public void setOptional(boolean _optional) {
- optional = _optional;
+ public void setOptional(boolean optional) {
+ this.optional = optional;
}
@Override
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
index 92326ce..f13f065 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
@@ -223,6 +223,8 @@ public class MavenProjectBuildStub extends
MavenProjectBasicStub {
case ROOT_FILE:
retVal = rootFileList;
break;
+ default:
+ break;
}
return retVal;
