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 cc310c0 SLING-12717 - feature-converter-maven-plugin Windows buid
fails (#13)
cc310c0 is described below
commit cc310c021a6a1ffe5c4197f80e8d8237983d43e3
Author: Robert Munteanu <[email protected]>
AuthorDate: Wed Jan 14 13:14:54 2026 +0100
SLING-12717 - feature-converter-maven-plugin Windows buid fails (#13)
---
.sling-module.json | 7 ----
.../verify.bsh | 37 +++++++---------------
.../verify.bsh | 37 +++++++---------------
.../verify.bsh | 37 +++++++---------------
4 files changed, 33 insertions(+), 85 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
deleted file mode 100644
index 7ff980b..0000000
--- a/.sling-module.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "jenkins": {
- "operatingSystems": [
- "linux"
- ]
- }
-}
\ No newline at end of file
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 7cd361d..61e6b7c 100644
--- a/src/it/package-with-single-bundle-no-parameters/verify.bsh
+++ b/src/it/package-with-single-bundle-no-parameters/verify.bsh
@@ -18,7 +18,7 @@ import java.io.*;
import java.util.*;
import org.codehaus.plexus.util.*;
- boolean check() {
+ void check() throws Exception {
String projectName =
"sling-feature-converter-maven-plugin-test-no-param.ui.apps";
String projectCoreName =
"sling-feature-converter-maven-plugin-test-no-param.core";
// These are <scriptVariables/> provided by the plugin POM
@@ -29,19 +29,16 @@ import org.codehaus.plexus.util.*;
File targetFolder = new File(basedir, "ui.apps/target");
File packageFile = new File(targetFolder, projectName + "-" +
projectVersion + ".zip");
if(!packageFile.exists()) {
- System.out.println("Content Package was not created: " +
packageFile);
- return false;
+ throw new Exception("Content Package was not created: " +
packageFile);
}
File outputFolder = new File(targetFolder, "cp-conversion");
File featureModelFolder = new File(outputFolder, "fm.out");
if(!featureModelFolder.exists()) {
- System.out.println("Feature Model Folder was not created" +
featureModelFolder);
- return false;
+ throw new Exception("Feature Model Folder was not created" +
featureModelFolder);
}
File featureModelFile = new File(featureModelFolder, projectName +
".json");
if(!featureModelFile.exists()) {
- System.out.println("Feature Model File was not created: " +
featureModelFile);
- return false;
+ throw new Exception("Feature Model File was not created: " +
featureModelFile);
}
String log = FileUtils.fileRead(featureModelFile);
System.out.println("Feature Model File Content: " + log);
@@ -54,39 +51,27 @@ import org.codehaus.plexus.util.*;
};
for (String value : values) {
if (log.indexOf(value) < 0) {
- System.out.println("Did not find line: " + value + " ->
FAILED!");
- return false;
+ throw new Exception("Did not find line: " + value + " ->
FAILED!");
}
}
File convertedPackageFolder = new File(outputFolder, projectGroupPath
+ "/" + projectName + "/" + projectVersion);
if(!convertedPackageFolder.exists()) {
- System.out.println("Converted Package Folder was not created: " +
convertedPackageFolder);
- return false;
+ throw new Exception("Converted Package Folder was not created: " +
convertedPackageFolder);
}
File convertedPackageFile = new File(convertedPackageFolder,
projectName + "-" + projectVersion + "-cp2fm-converted.zip");
if(!convertedPackageFile.exists()) {
- System.out.println("Converted Package File was not created: " +
convertedPackageFile);
- return false;
+ throw new Exception("Converted Package File was not created: " +
convertedPackageFile);
}
// 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;
+ throw new Exception("Converted Package Target (Maven) Folder was
not created: " + convertedPackageTargetFolder);
}
File convertedPackageTargetFile = new
File(convertedPackageTargetFolder, projectName + "-" + projectVersion +
"-cp2fm-converted.zip");
if(!convertedPackageTargetFile.exists()) {
- System.out.println("Converted Package Target File was not created:
" + convertedPackageTargetFile);
- return false;
+ throw new Exception("Converted Package Target File was not
created: " + convertedPackageTargetFile);
}
-
- return true;
- }
- try {
- return check();
- }
- catch(Throwable t) {
- t.printStackTrace();
- return false;
}
+
+ check();
return true;
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 1d7f862..bd0dbcd 100644
--- a/src/it/package-with-single-bundle-target-mode/verify.bsh
+++ b/src/it/package-with-single-bundle-target-mode/verify.bsh
@@ -18,7 +18,7 @@ import java.io.*;
import java.util.*;
import org.codehaus.plexus.util.*;
- boolean check() {
+ void check() throws Exception {
String projectArtifact =
"sling-feature-converter-maven-plugin-test-target-mode";
String projectName = projectArtifact + ".ui.apps";
String projectCoreName = projectArtifact + ".core";
@@ -31,20 +31,17 @@ import org.codehaus.plexus.util.*;
File cpTargetFolder = new File(basedir, "ui.apps/target");
File packageFile = new File(cpTargetFolder, projectName + "-" +
projectVersion + ".zip");
if(!packageFile.exists()) {
- System.out.println("Content Package was not created: " +
packageFile);
- return false;
+ throw new Exception("Content Package was not created: " +
packageFile);
}
File targetFolder = new File(basedir, "fm.launcher/target");
File outputFolder = new File(targetFolder, "cp-conversion");
File featureModelFolder = new File(outputFolder, "fm.out");
if(!featureModelFolder.exists()) {
- System.out.println("Feature Model Folder was not created" +
featureModelFolder);
- return false;
+ throw new Exception("Feature Model Folder was not created" +
featureModelFolder);
}
File featureModelFile = new File(featureModelFolder, projectName +
".json");
if(!featureModelFile.exists()) {
- System.out.println("Feature Model File was not created: " +
featureModelFile);
- return false;
+ throw new Exception("Feature Model File was not created: " +
featureModelFile);
}
String log = FileUtils.fileRead(featureModelFile);
System.out.println("Feature Model File Content: " + log);
@@ -57,39 +54,27 @@ import org.codehaus.plexus.util.*;
};
for (String value : values) {
if (log.indexOf(value) < 0) {
- System.out.println("Did not find line: " + value + " ->
FAILED!");
- return false;
+ throw new Exception("Did not find line: " + value + " ->
FAILED!");
}
}
File convertedPackageFolder = new File(outputFolder, projectGroupPath
+ "/" + projectName + "/" + projectVersion);
if(!convertedPackageFolder.exists()) {
- System.out.println("Converted Package Folder was not created: " +
convertedPackageFolder);
- return false;
+ throw new Exception("Converted Package Folder was not created: " +
convertedPackageFolder);
}
File convertedPackageFile = new File(convertedPackageFolder,
projectName + "-" + projectVersion + "-cp2fm-converted.zip");
if(!convertedPackageFile.exists()) {
- System.out.println("Converted Package File was not created: " +
convertedPackageFile);
- return false;
+ throw new Exception("Converted Package File was not created: " +
convertedPackageFile);
}
// 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;
+ throw new Exception("Converted Package Target (Maven) Folder was
not created: " + convertedPackageTargetFolder);
}
File convertedPackageTargetFile = new
File(convertedPackageTargetFolder, projectName + "-" + projectVersion +
"-cp2fm-converted.zip");
if(!convertedPackageTargetFile.exists()) {
- System.out.println("Converted Package Target File was not created:
" + convertedPackageTargetFile);
- return false;
+ throw new Exception("Converted Package Target File was not
created: " + convertedPackageTargetFile);
}
-
- return true;
- }
- try {
- return check();
- }
- catch(Throwable t) {
- t.printStackTrace();
- return false;
}
+
+ check();
return true;
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 2114d39..af458af 100644
--- a/src/it/package-with-single-bundle-with-parameters/verify.bsh
+++ b/src/it/package-with-single-bundle-with-parameters/verify.bsh
@@ -18,7 +18,7 @@ import java.io.*;
import java.util.*;
import org.codehaus.plexus.util.*;
- boolean check() {
+ void check() throws Exception {
String projectArtifact =
"sling-feature-converter-maven-plugin-test-with-param";
String projectName = projectArtifact + ".ui.apps";
String projectCoreName = projectArtifact + ".core";
@@ -30,19 +30,16 @@ import org.codehaus.plexus.util.*;
File targetFolder = new File(basedir, "ui.apps/target");
File packageFile = new File(targetFolder, projectName + "-" +
projectVersion + ".zip");
if(!packageFile.exists()) {
- System.out.println("Content Package was not created: " +
packageFile);
- return false;
+ throw new Exception("Content Package was not created: " +
packageFile);
}
File outputFolder = new File(targetFolder, "cp-conversion");
File featureModelFolder = new File(outputFolder, "fm.out");
if(!featureModelFolder.exists()) {
- System.out.println("Feature Model Folder was not created" +
featureModelFolder);
- return false;
+ throw new Exception("Feature Model Folder was not created" +
featureModelFolder);
}
File featureModelFile = new File(featureModelFolder, projectName +
".json");
if(!featureModelFile.exists()) {
- System.out.println("Feature Model File was not created: " +
featureModelFile);
- return false;
+ throw new Exception("Feature Model File was not created: " +
featureModelFile);
}
String log = FileUtils.fileRead(featureModelFile);
System.out.println("Feature Model File Content: " + log);
@@ -55,39 +52,27 @@ import org.codehaus.plexus.util.*;
};
for (String value : values) {
if (log.indexOf(value) < 0) {
- System.out.println("Did not find line: " + value + " ->
FAILED!");
- return false;
+ throw new Exception("Did not find line: " + value + " ->
FAILED!");
}
}
File convertedPackageFolder = new File(outputFolder, projectGroupPath
+ "/" + projectName + "/" + projectVersion);
if(!convertedPackageFolder.exists()) {
- System.out.println("Converted Package Folder was not created: " +
convertedPackageFolder);
- return false;
+ throw new Exception("Converted Package Folder was not created: " +
convertedPackageFolder);
}
File convertedPackageFile = new File(convertedPackageFolder,
projectName + "-" + projectVersion + "-cp2fm-converted.zip");
if(!convertedPackageFile.exists()) {
- System.out.println("Converted Package File was not created: " +
convertedPackageFile);
- return false;
+ throw new Exception("Converted Package File was not created: " +
convertedPackageFile);
}
// 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;
+ throw new Exception("Converted Package Target (Maven) Folder was
not created: " + convertedPackageTargetFolder);
}
File convertedPackageTargetFile = new
File(convertedPackageTargetFolder, projectName + "-" + projectVersion +
"-cp2fm-converted.zip");
if(!convertedPackageTargetFile.exists()) {
- System.out.println("Converted Package Target File was not created:
" + convertedPackageTargetFile);
- return false;
+ throw new Exception("Converted Package Target File was not
created: " + convertedPackageTargetFile);
}
-
- return true;
- }
- try {
- return check();
- }
- catch(Throwable t) {
- t.printStackTrace();
- return false;
}
+
+ check();
return true;
