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-filtering.git
The following commit(s) were added to refs/heads/master by this push:
new 2daa954 [MSHARED-1473] Bump
org.apache.maven.shared:maven-shared-components from 43 to 44 (#145)
2daa954 is described below
commit 2daa9549e2045c61d9684c4cb1533aa7becca02e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 3 20:05:19 2025 +0200
[MSHARED-1473] Bump org.apache.maven.shared:maven-shared-components from 43
to 44 (#145)
* Bump org.apache.maven.shared:maven-shared-components from 43 to 44
Bumps
[org.apache.maven.shared:maven-shared-components](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.shared:maven-shared-components
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <supp...@github.com>
* Fix checkstyle in tests
---------
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>
---
pom.xml | 2 +-
...ractInterpolatorFilterReaderLineEndingTest.java | 8 +++----
.../maven/shared/filtering/FilteringUtilsTest.java | 8 +++----
.../InterpolatorFilterReaderLineEndingTest.java | 4 ++--
...iterInterpolatorFilterReaderLineEndingTest.java | 4 ++--
.../maven/shared/filtering/PropertyUtilsTest.java | 12 +++++------
.../apache/maven/shared/filtering/StubSession.java | 25 +++++++++++++++++++++-
7 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2c50957..9c059bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>43</version>
+ <version>44</version>
<relativePath />
</parent>
diff --git
a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
index e31affb..121f06c 100644
---
a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
@@ -91,12 +91,12 @@ public abstract class
AbstractInterpolatorFilterReaderLineEndingTest {
.thenReturn("DONE");
Reader in = new StringReader("aaaFILTER.a.MEaaa");
- Reader reader = getAaa_AaaReader(in, interpolator);
+ Reader reader = getAaaAaaReader(in, interpolator);
assertEquals("DONE", IOUtils.toString(reader));
in = new StringReader("abcFILTER.a.MEabc");
- reader = getAbc_AbcReader(in, interpolator);
+ reader = getAbcAbcReader(in, interpolator);
assertEquals("DONE", IOUtils.toString(reader));
}
@@ -108,9 +108,9 @@ public abstract class
AbstractInterpolatorFilterReaderLineEndingTest {
}
}
- protected abstract Reader getAbc_AbcReader(Reader in, Interpolator
interpolator);
+ protected abstract Reader getAbcAbcReader(Reader in, Interpolator
interpolator);
- protected abstract Reader getAaa_AaaReader(Reader in, Interpolator
interpolator);
+ protected abstract Reader getAaaAaaReader(Reader in, Interpolator
interpolator);
protected abstract Reader getDollarBracesReader(Reader in, Interpolator
interpolator, String escapeString);
diff --git
a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
index a4becde..4249526 100644
--- a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
@@ -38,12 +38,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*
*/
public class FilteringUtilsTest {
- private static final Path testDirectory = Paths.get(getBasedir(),
"target/test-classes/");
+ private static final Path TEST_DIRECTORY = Paths.get(getBasedir(),
"target/test-classes/");
@Test
public void testMSHARED1213CopyWithTargetAlreadyExisting0ByteFile() throws
IOException {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
- Path toFile = testDirectory.resolve("MSHARED-1213-enunciate.xml");
+ Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.writeString(toFile, "");
FilteringUtils.copyFile(
fromFile,
@@ -66,7 +66,7 @@ public class FilteringUtilsTest {
@Test
public void testMSHARED1213CopyWithTargetAlreadyExistingJunkFile() throws
IOException {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
- Path toFile = testDirectory.resolve("MSHARED-1213-enunciate.xml");
+ Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.writeString(toFile, "junk");
FilteringUtils.copyFile(
fromFile,
@@ -89,7 +89,7 @@ public class FilteringUtilsTest {
@Test
public void testMSHARED1213CopyWithTargetAlreadyExistingSameFile() throws
IOException {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
- Path toFile = testDirectory.resolve("MSHARED-1213-enunciate.xml");
+ Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.copy(fromFile, toFile, StandardCopyOption.REPLACE_EXISTING);
FilteringUtils.copyFile(
fromFile,
diff --git
a/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
b/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
index c56c1b1..37e1a46 100644
---
a/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
@@ -24,12 +24,12 @@ import org.codehaus.plexus.interpolation.Interpolator;
public class InterpolatorFilterReaderLineEndingTest extends
AbstractInterpolatorFilterReaderLineEndingTest {
@Override
- protected Reader getAaa_AaaReader(Reader in, Interpolator interpolator) {
+ protected Reader getAaaAaaReader(Reader in, Interpolator interpolator) {
return new InterpolatorFilterReaderLineEnding(in, interpolator, "aaa",
"aaa", true);
}
@Override
- protected Reader getAbc_AbcReader(Reader in, Interpolator interpolator) {
+ protected Reader getAbcAbcReader(Reader in, Interpolator interpolator) {
return new InterpolatorFilterReaderLineEnding(in, interpolator, "abc",
"abc", true);
}
diff --git
a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
index 8ec0eac..e2b8ea9 100644
---
a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
@@ -44,7 +44,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEndingTest
private Interpolator interpolator;
@Override
- protected Reader getAaa_AaaReader(Reader in, Interpolator interpolator) {
+ protected Reader getAaaAaaReader(Reader in, Interpolator interpolator) {
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
new MultiDelimiterInterpolatorFilterReaderLineEnding(in,
interpolator, true);
reader.setDelimiterSpecs(Collections.singleton("aaa*aaa"));
@@ -52,7 +52,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEndingTest
}
@Override
- protected Reader getAbc_AbcReader(Reader in, Interpolator interpolator) {
+ protected Reader getAbcAbcReader(Reader in, Interpolator interpolator) {
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
new MultiDelimiterInterpolatorFilterReaderLineEnding(in,
interpolator, true);
reader.setDelimiterSpecs(Collections.singleton("abc*abc"));
diff --git
a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
index b049731..c6acf72 100644
--- a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
@@ -46,11 +46,11 @@ import static org.mockito.Mockito.verify;
*/
@MavenDITest
public class PropertyUtilsTest {
- private static final Path testDirectory = Paths.get(getBasedir(),
"target/test-classes/");
+ private static final Path TEST_DIRECTORY = Paths.get(getBasedir(),
"target/test-classes/");
@Test
public void testBasic() throws Exception {
- Path basicProp = testDirectory.resolve("basic.properties");
+ Path basicProp = TEST_DIRECTORY.resolve("basic.properties");
Files.deleteIfExists(basicProp);
@@ -68,7 +68,7 @@ public class PropertyUtilsTest {
@Test
public void testSystemProperties() throws Exception {
- Path systemProp = testDirectory.resolve("system.properties");
+ Path systemProp = TEST_DIRECTORY.resolve("system.properties");
Files.deleteIfExists(systemProp);
@@ -83,7 +83,7 @@ public class PropertyUtilsTest {
@Test
public void testException() {
- Path nonExistent = testDirectory.resolve("not_existent_file");
+ Path nonExistent = TEST_DIRECTORY.resolve("not_existent_file");
assertFalse(Files.exists(nonExistent), "property file exist: " +
nonExistent);
@@ -110,7 +110,7 @@ public class PropertyUtilsTest {
*/
@Test
public void testCircularReferences() throws IOException {
- Path basicProp = testDirectory.resolve("circular.properties");
+ Path basicProp = TEST_DIRECTORY.resolve("circular.properties");
Files.deleteIfExists(basicProp);
@@ -138,7 +138,7 @@ public class PropertyUtilsTest {
*/
@Test
public void testCircularReferences3Vars() throws IOException {
- Path basicProp = testDirectory.resolve("circular.properties");
+ Path basicProp = TEST_DIRECTORY.resolve("circular.properties");
Files.deleteIfExists(basicProp);
diff --git a/src/test/java/org/apache/maven/shared/filtering/StubSession.java
b/src/test/java/org/apache/maven/shared/filtering/StubSession.java
index 1ae17ef..7bc02e8 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubSession.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubSession.java
@@ -26,7 +26,30 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import org.apache.maven.api.*;
+import org.apache.maven.api.Artifact;
+import org.apache.maven.api.ArtifactCoordinates;
+import org.apache.maven.api.Dependency;
+import org.apache.maven.api.DependencyCoordinates;
+import org.apache.maven.api.DependencyScope;
+import org.apache.maven.api.DownloadedArtifact;
+import org.apache.maven.api.Language;
+import org.apache.maven.api.Listener;
+import org.apache.maven.api.LocalRepository;
+import org.apache.maven.api.Node;
+import org.apache.maven.api.Packaging;
+import org.apache.maven.api.PathScope;
+import org.apache.maven.api.PathType;
+import org.apache.maven.api.ProducedArtifact;
+import org.apache.maven.api.Project;
+import org.apache.maven.api.ProjectScope;
+import org.apache.maven.api.RemoteRepository;
+import org.apache.maven.api.Service;
+import org.apache.maven.api.Session;
+import org.apache.maven.api.SessionData;
+import org.apache.maven.api.Type;
+import org.apache.maven.api.Version;
+import org.apache.maven.api.VersionConstraint;
+import org.apache.maven.api.VersionRange;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.model.Repository;
