[KARAF-4537] Karaf Maven Plugin should respect scope when building a feature
diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/control.xml b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/control.xml
index d0f9b53..2897f13 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/control.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/control.xml
@@ -22,7 +22,7 @@
<feature name="dependency-feature-a" description="dependency-feature-a" version="1.0.0.SNAPSHOT">
<feature version="1.0.0.SNAPSHOT" prerequisite="false" dependency="false">dependency-feature-c</feature>
<bundle>mvn:test/dependency-bundle-a/1.0-SNAPSHOT</bundle>
- <bundle>mvn:test/dependency-bundle-b/1.0-SNAPSHOT</bundle>
+ <bundle dependency="true">mvn:test/dependency-bundle-b/1.0-SNAPSHOT</bundle>
</feature>
<feature name="dependency-feature-c" description="dependency-feature-c" version="1.0.0.SNAPSHOT">
<bundle>mvn:test/dependency-bundle-c/1.0-SNAPSHOT</bundle>
diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-bundle-a/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-bundle-a/pom.xml
index 4498f53..11b8640 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-bundle-a/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-bundle-a/pom.xml
@@ -42,6 +42,7 @@
<groupId>test</groupId>
<artifactId>dependency-bundle-b</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
index 8deeeb2..995345c 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
@@ -160,7 +160,7 @@
public boolean selectDependency(Dependency dependency) {
String scope = dependency.getScope();
- return !"test".equals(scope) && !"runtime".equals(scope);
+ return !"test".equals(scope);
}
public DependencySelector deriveChildSelector(DependencyCollectionContext context) {
@@ -173,7 +173,7 @@
public boolean selectDependency(Dependency dependency) {
String scope = dependency.getScope();
- return !"test".equals(scope) && !"provided".equals(scope) && !"runtime".equals(scope);
+ return !"test".equals(scope);
}
public DependencySelector deriveChildSelector(DependencyCollectionContext context) {
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
index 89a1762..99882a9 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
@@ -159,7 +159,7 @@
public boolean selectDependency(Dependency dependency) {
String scope = dependency.getScope();
- return !"test".equals(scope) && !"runtime".equals(scope);
+ return !"test".equals(scope);
}
public DependencySelector deriveChildSelector(DependencyCollectionContext context) {
@@ -172,7 +172,7 @@
public boolean selectDependency(Dependency dependency) {
String scope = dependency.getScope();
- return !"test".equals(scope) && !"provided".equals(scope) && !"runtime".equals(scope);
+ return !"test".equals(scope);
}
public DependencySelector deriveChildSelector(DependencyCollectionContext context) {
