You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2017/10/20 01:40:59 UTC
svn commit: r1812694 - in
/jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging:
ImportPackageBuilder.java VaultMojo.java
Author: tripod
Date: Fri Oct 20 01:40:59 2017
New Revision: 1812694
URL: http://svn.apache.org/viewvc?rev=1812694&view=rev
Log:
JCRVLT-207 make auto-import package a analyzer work with htl scripts
Modified:
jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ImportPackageBuilder.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ImportPackageBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ImportPackageBuilder.java?rev=1812694&r1=1812693&r2=1812694&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ImportPackageBuilder.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ImportPackageBuilder.java Fri Oct 20 01:40:59 2017
@@ -230,7 +230,7 @@ public class ImportPackageBuilder {
report.append(bundleId).append("\n");
}
- report.append("\nAuto generated import-package: \n");
+ report.append("\nPackages used in the analyzed classes: \n");
report.append("------------------------------\n");
for (Map.Entry<String, Attrs> e: importParameters.entrySet()) {
report.append(e.getKey());
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java?rev=1812694&r1=1812693&r2=1812694&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java Fri Oct 20 01:40:59 2017
@@ -287,7 +287,14 @@ public class VaultMojo extends AbstractE
* Defines additional bundle dependency via the osgi import-package entry in the manifest.
* @since 0.5.12
*/
- @Parameter(property = "vault.importPackage")
+ @Parameter(
+ property = "vault.importPackage",
+ defaultValue =
+ // exclude HTL compiler packages as they are never real dependencies of the content
+ "-org.apache.sling.scripting.sightly.compiler.expression.nodes," +
+ "-org.apache.sling.scripting.sightly.java.compiler," +
+ "-org.apache.sling.scripting.sightly.render"
+ )
private String importPackage;
/**
@@ -587,6 +594,7 @@ public class VaultMojo extends AbstractE
// override computed patterns
if (importPackage != null) {
+ getLog().debug("merging analyzer-packages with:\n" + importPackage + "\n");
for (Map.Entry<String, Attrs> entry : new Parameters(importPackage).entrySet()) {
boolean delete = false;
String pkg = entry.getKey();
@@ -626,8 +634,22 @@ public class VaultMojo extends AbstractE
}
}
}
-
importPackage = Processor.printClauses(importParams);
+
+ if (!importPackage.isEmpty()) {
+ getLog().info("Merged detected packages from analyzer with 'importPackage':");
+ for (Map.Entry<String, Attrs> e: importParams.entrySet()) {
+ StringBuilder report = new StringBuilder();
+ report.append(" ").append(e.getKey());
+ try {
+ Processor.printClause(e.getValue(), report);
+ } catch (IOException e1) {
+ throw new IllegalStateException("Internal error while generating report", e1);
+ }
+ getLog().info(report);
+ }
+ getLog().info("");
+ }
}
private MavenArchiveConfiguration getMavenArchiveConfiguration(Properties vaultProperties) throws IOException {