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 2021/01/07 08:16:46 UTC
[sling-slingfeature-maven-plugin] branch master updated: Fix it
test errors as https://osgi.org is not available anymore. Changed javadoc
urls to https://docs.osgi.org
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 79efebe Fix it test errors as https://osgi.org is not available anymore. Changed javadoc urls to https://docs.osgi.org
79efebe is described below
commit 79efebeeb718e67910b95db3bb5daa4760ff2735
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jan 7 09:16:33 2021 +0100
Fix it test errors as https://osgi.org is not available anymore. Changed javadoc urls to https://docs.osgi.org
---
src/it/apis-jar-exported-package-no-classes/pom.xml | 6 +++---
src/it/apis-jar-invalid-javadoc/pom.xml | 6 +++---
src/it/apis-jar/pom.xml | 6 +++---
.../java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java | 6 +++++-
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/it/apis-jar-exported-package-no-classes/pom.xml b/src/it/apis-jar-exported-package-no-classes/pom.xml
index 0f803ea..c869610 100644
--- a/src/it/apis-jar-exported-package-no-classes/pom.xml
+++ b/src/it/apis-jar-exported-package-no-classes/pom.xml
@@ -46,9 +46,9 @@
<includeResource>*.tld</includeResource>
</includeResources>
<javadocLinks>
- <javadocLink>https://osgi.org/javadoc/r6/core/</javadocLink>
- <javadocLink>https://osgi.org/javadoc/r6/annotation/</javadocLink>
- <javadocLink>https://osgi.org/javadoc/r6/cmpn/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/core/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/annotation/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/cmpn/</javadocLink>
</javadocLinks>
<incrementalApis>false</incrementalApis>
</configuration>
diff --git a/src/it/apis-jar-invalid-javadoc/pom.xml b/src/it/apis-jar-invalid-javadoc/pom.xml
index 0f803ea..c869610 100644
--- a/src/it/apis-jar-invalid-javadoc/pom.xml
+++ b/src/it/apis-jar-invalid-javadoc/pom.xml
@@ -46,9 +46,9 @@
<includeResource>*.tld</includeResource>
</includeResources>
<javadocLinks>
- <javadocLink>https://osgi.org/javadoc/r6/core/</javadocLink>
- <javadocLink>https://osgi.org/javadoc/r6/annotation/</javadocLink>
- <javadocLink>https://osgi.org/javadoc/r6/cmpn/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/core/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/annotation/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/cmpn/</javadocLink>
</javadocLinks>
<incrementalApis>false</incrementalApis>
</configuration>
diff --git a/src/it/apis-jar/pom.xml b/src/it/apis-jar/pom.xml
index f9d0d2c..9eb81a0 100644
--- a/src/it/apis-jar/pom.xml
+++ b/src/it/apis-jar/pom.xml
@@ -46,9 +46,9 @@
<includeResource>**/*.tld</includeResource>
</includeResources>
<javadocLinks>
- <javadocLink>https://osgi.org/javadoc/r6/core/</javadocLink>
- <javadocLink>https://osgi.org/javadoc/r6/annotation/</javadocLink>
- <javadocLink>https://osgi.org/javadoc/r6/cmpn/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/core/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/annotation/</javadocLink>
+ <javadocLink>https://docs.osgi.org/javadoc/r6/cmpn/</javadocLink>
</javadocLinks>
<incrementalApis>false</incrementalApis>
</configuration>
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java b/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java
index 8896173..1616818 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisUtil.java
@@ -141,7 +141,11 @@ public class ApisUtil {
result = new HashSet<>();
linkedPackagesMap.put(javadocUrl, result);
try {
- final URL url = new URL(javadocUrl.concat("/package-list"));
+ String prefix = javadocUrl;
+ if ( prefix.endsWith("/") ) {
+ prefix = prefix.substring(0, prefix.length() - 1);
+ }
+ final URL url = new URL(prefix.concat("/package-list"));
try (final LineNumberReader reader = new LineNumberReader(new InputStreamReader(url.openConnection().getInputStream(), StandardCharsets.UTF_8))) {
String line = null;
while ( (line = reader.readLine()) != null ) {