You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/06/14 17:49:30 UTC
[sling-slingfeature-maven-plugin] 02/02: several smaller fixes in
other ITs
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/SLING-9518-failing-it
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
commit 6d0d691d884c2ddb753318c553c5fdd4591af07f
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Sun Jun 14 19:49:15 2020 +0200
several smaller fixes in other ITs
---
src/it/apis-jar-wrapped-flattened-classes/pom.xml | 3 +--
src/it/apis-jar-wrapped-flattened-classes/verify.bsh | 4 ++--
src/it/apis-jar-wrapper-bundle/verify.bsh | 6 +++---
src/it/apis-jar/pom.xml | 4 ++--
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/it/apis-jar-wrapped-flattened-classes/pom.xml b/src/it/apis-jar-wrapped-flattened-classes/pom.xml
index 1ecf87e..e3f4705 100644
--- a/src/it/apis-jar-wrapped-flattened-classes/pom.xml
+++ b/src/it/apis-jar-wrapped-flattened-classes/pom.xml
@@ -42,8 +42,7 @@
<filesInclude>**/*.json</filesInclude>
</selection>
<includeResources>
- <includeResource>*.cnd</includeResource>
- <includeResource>*.tld</includeResource>
+ <includeResource>**/*.cnd</includeResource>
</includeResources>
</configuration>
</plugin>
diff --git a/src/it/apis-jar-wrapped-flattened-classes/verify.bsh b/src/it/apis-jar-wrapped-flattened-classes/verify.bsh
index a94a0cd..96a4705 100644
--- a/src/it/apis-jar-wrapped-flattened-classes/verify.bsh
+++ b/src/it/apis-jar-wrapped-flattened-classes/verify.bsh
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.*;
File baseApiJar = new File(apisJarDir, "slingfeature-maven-plugin-test-1.0.0-SNAPSHOT-base-apis.jar");
if (!baseApiJar.exists()) {
System.out.println("FAILED!");
- System.out.println("File '" + file + "' not found");
+ System.out.println("File '" + baseApiJar + "' not found");
return false;
}
@@ -42,7 +42,7 @@ import org.codehaus.plexus.util.*;
if (exportPackageHeader.indexOf("org.apache.lucene.analysis.standard") < 0) {
System.out.println("FAILED!");
- System.out.println("Export-Package header '" + exportPackageHeader + "' does not contain 'org.apache.lucene.analysis.standard' in bundle " + file);
+ System.out.println("Export-Package header '" + exportPackageHeader + "' does not contain 'org.apache.lucene.analysis.standard' in bundle " + baseApiJar);
return false;
}
diff --git a/src/it/apis-jar-wrapper-bundle/verify.bsh b/src/it/apis-jar-wrapper-bundle/verify.bsh
index d017b0a..de37f51 100644
--- a/src/it/apis-jar-wrapper-bundle/verify.bsh
+++ b/src/it/apis-jar-wrapper-bundle/verify.bsh
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.*;
File baseApiJar = new File(apisJarDir, "slingfeature-maven-plugin-test-1.0.0-SNAPSHOT-base-apis.jar");
if (!baseApiJar.exists()) {
System.out.println("FAILED!");
- System.out.println("File '" + file + "' not found");
+ System.out.println("File '" + baseApiJar + "' not found");
return false;
}
@@ -41,7 +41,7 @@ import org.codehaus.plexus.util.*;
if (exportPackageHeader.indexOf("com.google.gson.stream;version=\"2.8.4\"") < 0) {
System.out.println("FAILED!");
- System.out.println("Export-Package header '" + exportPackageHeader + "' does not contain 'com.google.gson.stream;version=\"2.8.4\"' in bundle " + file);
+ System.out.println("Export-Package header '" + exportPackageHeader + "' does not contain 'com.google.gson.stream;version=\"2.8.4\"' in bundle " + baseApiJar);
return false;
}
@@ -54,7 +54,7 @@ import org.codehaus.plexus.util.*;
}) {
if (jarFile.getJarEntry(expectedEntry) == null) {
System.out.println("FAILED!");
- System.out.println("Entry '" + expectedEntry + "' does not exist in bundle " + file);
+ System.out.println("Entry '" + expectedEntry + "' does not exist in bundle " + baseApiJar);
return false;
}
}
diff --git a/src/it/apis-jar/pom.xml b/src/it/apis-jar/pom.xml
index 0f803ea..f9d0d2c 100644
--- a/src/it/apis-jar/pom.xml
+++ b/src/it/apis-jar/pom.xml
@@ -42,8 +42,8 @@
<filesInclude>**/*.json</filesInclude>
</selection>
<includeResources>
- <includeResource>*.cnd</includeResource>
- <includeResource>*.tld</includeResource>
+ <includeResource>**/*.cnd</includeResource>
+ <includeResource>**/*.tld</includeResource>
</includeResources>
<javadocLinks>
<javadocLink>https://osgi.org/javadoc/r6/core/</javadocLink>