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/10/04 15:21:30 UTC
[sling-org-apache-sling-feature-extension-apiregions] branch master
updated: Revert "SLING-9265 : Add support for optional bundles"
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-org-apache-sling-feature-extension-apiregions.git
The following commit(s) were added to refs/heads/master by this push:
new 5b106b7 Revert "SLING-9265 : Add support for optional bundles"
5b106b7 is described below
commit 5b106b760cbd80da91674c7675438783d89280bf
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Oct 4 17:20:57 2020 +0200
Revert "SLING-9265 : Add support for optional bundles"
This reverts commit b099c2ae60501ad2dc14426ffb8d6412f54aacbb.
---
.gitignore | 1 -
pom.xml | 2 +-
.../apiregions/analyser/CheckApiRegionsBundleExportsImports.java | 5 ++---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index c7f991e..5b783ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ maven-eclipse.xml
*.iws
*.bak
.vlt
-.vscode
.DS_Store
jcr.log
atlassian-ide-plugin.xml
diff --git a/pom.xml b/pom.xml
index e65c2cb..695d168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.10</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckApiRegionsBundleExportsImports.java b/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckApiRegionsBundleExportsImports.java
index 072e69b..e3ca7cb 100644
--- a/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckApiRegionsBundleExportsImports.java
+++ b/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckApiRegionsBundleExportsImports.java
@@ -34,7 +34,6 @@ import java.util.stream.Stream;
import javax.json.JsonArray;
import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.ArtifactResolution;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
@@ -257,13 +256,13 @@ public class CheckApiRegionsBundleExportsImports implements AnalyserTask {
ctx.reportWarning(key + " is exporting package(s) " + getPackageInfo(entry.getValue().importWithoutVersion, false) + " without a version.");
}
- if ( !entry.getValue().missingExports.isEmpty() && entry.getKey().getArtifact().getResolution() == ArtifactResolution.MANDATORY ) {
+ if ( !entry.getValue().missingExports.isEmpty() ) {
ctx.reportError(key + " is importing package(s) " + getPackageInfo(entry.getValue().missingExports, false) + " in start level " +
String.valueOf(entry.getKey().getArtifact().getStartOrder())
+ " but no bundle is exporting these for that start level.");
errorReported = true;
}
- if ( !entry.getValue().missingExportsWithVersion.isEmpty() && entry.getKey().getArtifact().getResolution() == ArtifactResolution.MANDATORY ) {
+ if ( !entry.getValue().missingExportsWithVersion.isEmpty() ) {
StringBuilder message = new StringBuilder(key + " is importing package(s) " + getPackageInfo(entry.getValue().missingExportsWithVersion, true) + " in start level " +
String.valueOf(entry.getKey().getArtifact().getStartOrder())
+ " but no visible bundle is exporting these for that start level in the required version range.");