You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/12/18 14:51:23 UTC
[maven-filtering] 01/01: [MSHARED-1175] Copying x resources from rel/path to rel/path
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MSHARED-1175
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 0f1dc3f61d891a3301c5f8908d3433269d774cc2
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Dec 18 15:51:05 2022 +0100
[MSHARED-1175] Copying x resources from rel/path to rel/path
---
.../maven/shared/filtering/DefaultMavenResourcesFiltering.java | 5 ++++-
.../maven/shared/filtering/DefaultMavenResourcesFilteringTest.java | 6 +++---
.../java/org/apache/maven/shared/filtering/EscapeStringTest.java | 2 +-
.../java/org/apache/maven/shared/filtering/InvalidMarkTest.java | 2 +-
.../shared/filtering/MuliLinesMavenResourcesFilteringTest.java | 2 +-
5 files changed, 10 insertions(+), 7 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 e61d6ec..1021469 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -238,8 +238,11 @@ public class DefaultMavenResourcesFiltering
List<String> includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+ File basedir = mavenResourcesExecution.getMavenProject().getBasedir();
LOGGER.info( "Copying " + includedFiles.size() + " resource" + ( includedFiles.size() > 1 ? "s" : "" )
- + ( targetPath == null ? "" : " to " + targetPath ) );
+ + " from " + basedir.toPath().relativize( resourceDirectory.toPath() )
+ + " to " + basedir.toPath().relativize( getDestinationFile( outputDirectory, targetPath, "",
+ mavenResourcesExecution ).toPath() ) );
for ( String name : includedFiles )
{
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
index 7cf19cf..0a669be 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -46,7 +46,7 @@ public class DefaultMavenResourcesFilteringTest
{
private File outputDirectory = new File( getBasedir(), "target/DefaultMavenResourcesFilteringTest" );
- private File baseDir = new File( "c:\\foo\\bar" );
+ private File baseDir = new File( getBasedir() );
private StubMavenProject mavenProject = new StubMavenProject( baseDir );
private MavenResourcesFiltering mavenResourcesFiltering;
@@ -442,7 +442,7 @@ public class DefaultMavenResourcesFilteringTest
public void testFlattenDirectoryStructure()
throws Exception
{
- File baseDir = new File( "c:\\foo\\bar" );
+ File baseDir = new File( getBasedir() );
StubMavenProject mavenProject = new StubMavenProject( baseDir );
mavenProject.setVersion( "1.0" );
mavenProject.setGroupId( "org.apache" );
@@ -485,7 +485,7 @@ public class DefaultMavenResourcesFilteringTest
public void testFlattenDirectoryStructureWithoutOverride()
throws Exception
{
- File baseDir = new File( "c:\\foo\\bar" );
+ File baseDir = new File( getBasedir() );
StubMavenProject mavenProject = new StubMavenProject( baseDir );
mavenProject.setVersion( "1.0" );
mavenProject.setGroupId( "org.apache" );
diff --git a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
index 1977e1a..897240c 100644
--- a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
@@ -55,7 +55,7 @@ public class EscapeStringTest
public void testEscape()
throws Exception
{
- File baseDir = new File( "c:\\foo\\bar" );
+ File baseDir = new File( getBasedir() );
StubMavenProject mavenProject = new StubMavenProject( baseDir );
mavenProject.setVersion( "1.0" );
mavenProject.setGroupId( "org.apache" );
diff --git a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
index d154ccd..8a7629a 100644
--- a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
@@ -56,7 +56,7 @@ public class InvalidMarkTest
MavenResourcesExecution mavenResourcesExecution =
new MavenResourcesExecution( Collections.singletonList( resource ), outputDirectory,
- new StubMavenProject( new File( "." ) ), "UTF-8",
+ new StubMavenProject( new File( "" ) ), "UTF-8",
Collections.<String>emptyList(), Collections.<String>emptyList(),
new StubMavenSession() );
diff --git a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
index 3a903f4..47e1a2a 100644
--- a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
@@ -57,7 +57,7 @@ public class MuliLinesMavenResourcesFilteringTest
public void testFilteringTokenOnce()
throws Exception
{
- File baseDir = new File( "c:\\foo\\bar" );
+ File baseDir = new File( getBasedir() );
StubMavenProject mavenProject = new StubMavenProject( baseDir );
mavenProject.setVersion( "1.0" );
mavenProject.setGroupId( "org.apache" );