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-resources-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 23ad3e3 Bump org.apache.maven.plugins:maven-plugins from 43 to 44
(#109)
23ad3e3 is described below
commit 23ad3e38e386191ab05c825324e337d10e10aea3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 3 19:59:10 2025 +0200
Bump org.apache.maven.plugins:maven-plugins from 43 to 44 (#109)
* Bump org.apache.maven.plugins:maven-plugins from 43 to 44
Bumps
[org.apache.maven.plugins:maven-plugins](https://github.com/apache/maven-parent)
from 43 to 44.
- [Release notes](https://github.com/apache/maven-parent/releases)
- [Commits](https://github.com/apache/maven-parent/commits/v44)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugins
dependency-type: direct:production
update-type: version-update:semver-major
...
---------
Signed-off-by: dependabot[bot] <supp...@github.com>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sylwester Lachiewicz <slachiew...@apache.org>
---
pom.xml | 2 +-
.../maven/plugins/resources/BasicPropertyUtilsTest.java | 14 +++++++-------
.../maven/plugins/resources/CopyResourcesMojoTest.java | 3 ++-
.../maven/plugins/resources/ResourcesMojoTest.java | 16 ++++++++--------
.../resources/stub/MavenProjectResourcesStub.java | 5 ++++-
5 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 20babb6..95d5075 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>44</version>
<relativePath />
</parent>
diff --git
a/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
b/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
index e7ceb0c..72aa6e0 100644
---
a/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
+++
b/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
@@ -34,13 +34,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@MojoTest
public class BasicPropertyUtilsTest extends AbstractPropertyUtilsTest {
- protected static final String validationFileName =
+ protected static final String VALIDATION_FILE_NAME =
"target/test-classes/unit/propertiesutils-test/basic_validation.properties";
- protected static final String propFileName =
"target/test-classes/unit/propertiesutils-test/basic.properties";
+ protected static final String PROP_FILE_NAME =
"target/test-classes/unit/propertiesutils-test/basic.properties";
protected Path getPropertyFile() {
- Path propFile = Paths.get(getBasedir(), propFileName);
+ Path propFile = Paths.get(getBasedir(), PROP_FILE_NAME);
if (!Files.exists(propFile)) {
propFile = null;
@@ -50,7 +50,7 @@ public class BasicPropertyUtilsTest extends
AbstractPropertyUtilsTest {
}
protected Path getValidationFile() {
- Path validationFile = Paths.get(getBasedir(), validationFileName);
+ Path validationFile = Paths.get(getBasedir(), VALIDATION_FILE_NAME);
if (!Files.exists(validationFile)) {
validationFile = null;
@@ -65,7 +65,7 @@ public class BasicPropertyUtilsTest extends
AbstractPropertyUtilsTest {
* @throws Exception
*/
@Test
- public void testBasicLoadProperty_FF() throws Exception {
+ public void testBasicLoadPropertyFF() throws Exception {
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, false,
false);
assertNotNull(prop);
@@ -78,7 +78,7 @@ public class BasicPropertyUtilsTest extends
AbstractPropertyUtilsTest {
* @throws Exception
*/
@Test
- public void testBasicLoadProperty_TF() throws Exception {
+ public void testBasicLoadPropertyTF() throws Exception {
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true,
false);
assertNotNull(prop);
@@ -91,7 +91,7 @@ public class BasicPropertyUtilsTest extends
AbstractPropertyUtilsTest {
* @throws Exception
*/
@Test
- public void testBasicLoadProperty_TT() throws Exception {
+ public void testBasicLoadPropertyTT() throws Exception {
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true,
true);
validationProp.putAll(System.getProperties());
diff --git
a/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
b/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
index 6c928d1..287de4c 100644
---
a/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
+++
b/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
@@ -35,7 +35,8 @@ import org.apache.maven.shared.filtering.Resource;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
-import static org.apache.maven.api.plugin.testing.MojoExtension.*;
+import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
+import static
org.apache.maven.api.plugin.testing.MojoExtension.getPluginBasedir;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
diff --git
a/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
index a79d68a..c014893 100644
--- a/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
@@ -102,7 +102,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void testResourceDirectoryStructure_RelativePath(ResourcesMojo
mojo) throws Exception {
+ public void testResourceDirectoryStructureRelativePath(ResourcesMojo mojo)
throws Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
@@ -297,7 +297,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void testResourceSystemProperties_Filtering(ResourcesMojo mojo)
throws Exception {
+ public void testResourceSystemPropertiesFiltering(ResourcesMojo mojo)
throws Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
@@ -338,7 +338,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void testResourceProjectProperties_Filtering(ResourcesMojo mojo)
throws Exception {
+ public void testResourceProjectPropertiesFiltering(ResourcesMojo mojo)
throws Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
@@ -367,7 +367,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void
testProjectProperty_Filtering_PropertyDestination(ResourcesMojo mojo) throws
Exception {
+ public void testProjectPropertyFilteringPropertyDestination(ResourcesMojo
mojo) throws Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
@@ -399,7 +399,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void testPropertyFiles_Filtering(ResourcesMojo mojo) throws
Exception {
+ public void testPropertyFilesFiltering(ResourcesMojo mojo) throws
Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
@@ -431,7 +431,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void testPropertyFiles_Extra(ResourcesMojo mojo) throws Exception {
+ public void testPropertyFilesExtra(ResourcesMojo mojo) throws Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
@@ -463,7 +463,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void testPropertyFiles_MainAndExtra(ResourcesMojo mojo) throws
Exception {
+ public void testPropertyFilesMainAndExtra(ResourcesMojo mojo) throws
Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
@@ -506,7 +506,7 @@ public class ResourcesMojoTest {
@Test
@InjectMojo(goal = "resources", pom = CONFIG_XML)
@Basedir
- public void testPropertyFiles_Filtering_TokensInFilters(ResourcesMojo
mojo) throws Exception {
+ public void testPropertyFilesFilteringTokensInFilters(ResourcesMojo mojo)
throws Exception {
assertNotNull(mojo);
MavenProjectResourcesStub project = (MavenProjectResourcesStub)
mojo.project;
diff --git
a/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
index 78729bb..2ac1d92 100644
---
a/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
+++
b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
@@ -40,7 +40,10 @@ package org.apache.maven.plugins.resources.stub;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
import java.util.function.Function;
import org.apache.maven.api.model.Build;
