This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-feature-converter-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new a6bcd3a SLING-13057 use correct configured local maven repository
path (#14)
a6bcd3a is described below
commit a6bcd3a7ad828f80f15c751dfa23327b97ccc036
Author: Stefan Seifert <[email protected]>
AuthorDate: Wed Jan 14 13:03:16 2026 +0100
SLING-13057 use correct configured local maven repository path (#14)
---
src/it/package-with-single-bundle-no-parameters/verify.bsh | 6 ++----
src/it/package-with-single-bundle-target-mode/verify.bsh | 6 ++----
.../package-with-single-bundle-with-parameters/verify.bsh | 6 ++----
.../sling/cpconverter/maven/mojos/ConvertCPMojo.java | 14 +++++---------
4 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/src/it/package-with-single-bundle-no-parameters/verify.bsh
b/src/it/package-with-single-bundle-no-parameters/verify.bsh
index a8b39cd..7cd361d 100644
--- a/src/it/package-with-single-bundle-no-parameters/verify.bsh
+++ b/src/it/package-with-single-bundle-no-parameters/verify.bsh
@@ -68,10 +68,8 @@ import org.codehaus.plexus.util.*;
System.out.println("Converted Package File was not created: " +
convertedPackageFile);
return false;
}
- // TODO: Adjust the code here to also support local repositories when
this is activated
- File userHomeFolder = new File(System.getProperty("user.home"));
- File localMavenRepo = new File(userHomeFolder, ".m2/repository");
- File convertedPackageTargetFolder = new File(localMavenRepo,
projectGroupPath + "/" + projectName + "/" + projectVersion);
+ // Use the local repository path configured for the invoker plugin
+ File convertedPackageTargetFolder = new File(localRepositoryPath,
projectGroupPath + "/" + projectName + "/" + projectVersion);
if(!convertedPackageTargetFolder.exists()) {
System.out.println("Converted Package Target (Maven) Folder was
not created: " + convertedPackageTargetFolder);
return false;
diff --git a/src/it/package-with-single-bundle-target-mode/verify.bsh
b/src/it/package-with-single-bundle-target-mode/verify.bsh
index 9a9d11e..1d7f862 100644
--- a/src/it/package-with-single-bundle-target-mode/verify.bsh
+++ b/src/it/package-with-single-bundle-target-mode/verify.bsh
@@ -71,10 +71,8 @@ import org.codehaus.plexus.util.*;
System.out.println("Converted Package File was not created: " +
convertedPackageFile);
return false;
}
- // TODO: Adjust the code here to also support local repositories when
this is activated
- File userHomeFolder = new File(System.getProperty("user.home"));
- File localMavenRepo = new File(userHomeFolder, ".m2/repository");
- File convertedPackageTargetFolder = new File(localMavenRepo,
projectGroupPath + "/" + projectName + "/" + projectVersion);
+ // Use the local repository path configured for the invoker plugin
+ File convertedPackageTargetFolder = new File(localRepositoryPath,
projectGroupPath + "/" + projectName + "/" + projectVersion);
if(!convertedPackageTargetFolder.exists()) {
System.out.println("Converted Package Target (Maven) Folder was
not created: " + convertedPackageTargetFolder);
return false;
diff --git a/src/it/package-with-single-bundle-with-parameters/verify.bsh
b/src/it/package-with-single-bundle-with-parameters/verify.bsh
index b0aa115..2114d39 100644
--- a/src/it/package-with-single-bundle-with-parameters/verify.bsh
+++ b/src/it/package-with-single-bundle-with-parameters/verify.bsh
@@ -69,10 +69,8 @@ import org.codehaus.plexus.util.*;
System.out.println("Converted Package File was not created: " +
convertedPackageFile);
return false;
}
- // TODO: Adjust the code here to also support local repositories when
this is activated
- File userHomeFolder = new File(System.getProperty("user.home"));
- File localMavenRepo = new File(userHomeFolder, ".m2/repository");
- File convertedPackageTargetFolder = new File(localMavenRepo,
projectGroupPath + "/" + projectName + "/" + projectVersion);
+ // Use the local repository path configured for the invoker plugin
+ File convertedPackageTargetFolder = new File(localRepositoryPath,
projectGroupPath + "/" + projectName + "/" + projectVersion);
if(!convertedPackageTargetFolder.exists()) {
System.out.println("Converted Package Target (Maven) Folder was
not created: " + convertedPackageTargetFolder);
return false;
diff --git
a/src/main/java/org/apache/sling/cpconverter/maven/mojos/ConvertCPMojo.java
b/src/main/java/org/apache/sling/cpconverter/maven/mojos/ConvertCPMojo.java
index 48985a1..975c21c 100644
--- a/src/main/java/org/apache/sling/cpconverter/maven/mojos/ConvertCPMojo.java
+++ b/src/main/java/org/apache/sling/cpconverter/maven/mojos/ConvertCPMojo.java
@@ -290,7 +290,6 @@ public class ConvertCPMojo
artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(),
"compile", ZIP_TYPE, PACKAGE_CLASSIFIER,
artifactHandlerManager.getArtifactHandler(ZIP_TYPE)
);
-// installConvertedCP(convertedPackage);
} else {
getLog().error("Artifact is not found: " +
artifact);
}
@@ -322,14 +321,11 @@ public class ConvertCPMojo
*/
private void installGeneratedArtifacts() {
if(installConvertedCP) {
- File userHome = new File(System.getProperty("user.home"));
- if(userHome.isDirectory()) {
- File destFolder = new File(userHome, ".m2/repository");
- if(destFolder.isDirectory()) {
- copyFiles(convertedCPOutput, destFolder);
- if(isContentPackage) {
- installFMDescriptor(project.getArtifact());
- }
+ File destFolder = repoSession.getLocalRepository().getBasedir();
+ if(destFolder.isDirectory()) {
+ copyFiles(convertedCPOutput, destFolder);
+ if(isContentPackage) {
+ installFMDescriptor(project.getArtifact());
}
}
}
