You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/12/06 14:43:56 UTC
[maven-filtering] branch MSHARED-912 created (now a7ede41)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-912
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git.
at a7ede41 [MSHARED-912] Fix plexus-build-api tests
This branch includes the following new commits:
new af76f90 [MSHARED-937] Demote log statement to debug
new a7ede41 [MSHARED-912] Fix plexus-build-api tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-filtering] 01/02: [MSHARED-937] Demote log statement to debug
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-912
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit af76f90f8ddeca4a81579e7cc4cc317e41b7f8a8
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Dec 6 03:21:55 2021 +0100
[MSHARED-937] Demote log statement to debug
---
.../maven/shared/filtering/DefaultMavenResourcesFiltering.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index 4e06402..da6fa05 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -140,19 +140,19 @@ public class DefaultMavenResourcesFiltering
}
else
{
- getLogger().info( "Using '" + mavenResourcesExecution.getEncoding()
+ getLogger().debug( "Using '" + mavenResourcesExecution.getEncoding()
+ "' encoding to copy filtered resources." );
}
if ( mavenResourcesExecution.getPropertiesEncoding() == null
|| mavenResourcesExecution.getPropertiesEncoding().length() < 1 )
{
- getLogger().info( "Using '" + mavenResourcesExecution.getEncoding()
+ getLogger().debug( "Using '" + mavenResourcesExecution.getEncoding()
+ "' encoding to copy filtered properties files." );
}
else
{
- getLogger().info( "Using '" + mavenResourcesExecution.getPropertiesEncoding()
+ getLogger().debug( "Using '" + mavenResourcesExecution.getPropertiesEncoding()
+ "' encoding to copy filtered properties files." );
}
[maven-filtering] 02/02: [MSHARED-912] Fix plexus-build-api tests
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-912
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit a7ede41e37ce9433afc7fe5e3790e33c4bfce71f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Dec 6 15:43:46 2021 +0100
[MSHARED-912] Fix plexus-build-api tests
---
pom.xml | 13 ++++++-------
.../shared/filtering/IncrementalResourceFilteringTest.java | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 19365cf..fc317fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,11 +106,6 @@
<version>1.26</version>
</dependency>
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-build-api</artifactId>
- <version>0.0.7</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
@@ -125,8 +120,12 @@
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
- <!-- FIXME: Upgrade from 0.0.4 to 0.0.7 will fail some tests -->
- <version>0.0.4</version>
+ <version>0.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-build-api</artifactId>
+ <version>0.0.7</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
diff --git a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
index 0353ec5..d63b02d 100644
--- a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
@@ -80,7 +80,7 @@ public class IncrementalResourceFilteringTest
assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(), changedFiles,
- Collections.emptyMap() );
+ Collections.emptyMap(), new ArrayList(), new ArrayList() );
ThreadBuildContext.setThreadBuildContext( ctx );
filter( "moretime" );
@@ -145,7 +145,7 @@ public class IncrementalResourceFilteringTest
Set<String> deletedFiles = new HashSet<>();
deletedFiles.add( "filters.txt" );
TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(),
- deletedFiles, Collections.emptyMap() );
+ deletedFiles, Collections.emptyMap(), new ArrayList(), new ArrayList() );
ThreadBuildContext.setThreadBuildContext( ctx );
filter( "notime" );