You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/09/17 12:51:55 UTC
[sling-slingfeature-maven-plugin] branch master updated: SLING-9743
: Javadoc generation fails on Java 11+ if jquery is included
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new e0e55d7 SLING-9743 : Javadoc generation fails on Java 11+ if jquery is included
e0e55d7 is described below
commit e0e55d7fc07d75ef8bc89f0c12ff01211d21df00
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Sep 17 14:51:16 2020 +0200
SLING-9743 : Javadoc generation fails on Java 11+ if jquery is included
---
src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index f2cdcf6..0442e65 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -650,6 +650,12 @@ public class ApisJarMojo extends AbstractIncludingFeatureMojo {
otherPackages.removeAll(ctx.getPackagesWithoutJavaClasses());
apiPackages.addAll(otherPackages);
+ if ( artifactType == ArtifactType.JAVADOC ) {
+ // jquery might be part of javadoc
+ final Collection<String> jqueryPackages = Arrays.asList("jquery", "jquery.external.jquery", "jquery.images", "jquery.jszip-utils.dist", "jquery.jszip.dist", "resources");
+ apiPackages.removeAll(jqueryPackages);
+ }
+
if (missing.isEmpty() && apiPackages.isEmpty()) {
getLog().info("Verified " + artifactType.getId() + " jar for region " + apiRegion.getName());
} else {