You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/08/22 09:30:13 UTC
[15/50] [abbrv] karaf git commit: [KARAF-4537] Karaf Maven Plugin
should respect scope when building a feature
[KARAF-4537] Karaf Maven Plugin should respect scope when building a feature
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/89d1abd9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/89d1abd9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/89d1abd9
Branch: refs/heads/master
Commit: 89d1abd982167dbe022fefac5cda2ea5fe275ebd
Parents: 2f3fed8
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Jul 25 18:32:57 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Aug 22 11:29:19 2016 +0200
----------------------------------------------------------------------
.../src/it/test-feature-dependencies/control.xml | 2 +-
.../src/it/test-feature-dependencies/dependency-bundle-a/pom.xml | 1 +
.../java/org/apache/karaf/tooling/utils/Dependency30Helper.java | 4 ++--
.../java/org/apache/karaf/tooling/utils/Dependency31Helper.java | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/89d1abd9/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/control.xml
----------------------------------------------------------------------
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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/89d1abd9/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/dependency-bundle-a/pom.xml
----------------------------------------------------------------------
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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/89d1abd9/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
----------------------------------------------------------------------
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 class Dependency30Helper implements DependencyHelper {
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 class Dependency30Helper implements DependencyHelper {
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) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/89d1abd9/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
----------------------------------------------------------------------
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 class Dependency31Helper implements DependencyHelper {
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 class Dependency31Helper implements DependencyHelper {
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) {