[sling-org-apache-sling-feature-analyser] branch master updated: Revert "SLING-9265 : Add support for optional bundles"

[cziegeler]

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-analyser.git


The following commit(s) were added to refs/heads/master by this push:
     new 26ef083  Revert "SLING-9265 : Add support for optional bundles"
26ef083 is described below

commit 26ef0836a81829359419e9365b95396e838fb7ca
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sun Oct 4 17:19:31 2020 +0200

    Revert "SLING-9265 : Add support for optional bundles"
    
    This reverts commit 04185eb7db86e8c5774611869ecfaf12f7cec4b5.
---
 .gitignore                                                           | 1 -
 pom.xml                                                              | 2 +-
 .../sling/feature/analyser/task/impl/CheckBundleExportsImports.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 844bcc3..fcb3297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git 
a/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckBundleExportsImports.java
 
b/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckBundleExportsImports.java
index 7b7e1a8..37ecafa 100644
--- 
a/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckBundleExportsImports.java
+++ 
b/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckBundleExportsImports.java
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.sling.feature.ArtifactResolution;
 import org.apache.sling.feature.analyser.task.AnalyserTask;
 import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
 import org.apache.sling.feature.scanner.BundleDescriptor;
@@ -172,13 +171,13 @@ public class CheckBundleExportsImports 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() ) {
                 ctx.reportError(key + " is importing package(s) "
                         + 
getPackageInfo(entry.getValue().missingExportsWithVersion, true) + " in start 
level "
                         + 
String.valueOf(entry.getKey().getArtifact().getStartOrder())