karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [3/3] karaf git commit: Revert "[KARAF-4537] Karaf Maven Plugin should respect scope when building a feature"
Date Thu, 28 Jul 2016 10:00:15 GMT
Revert "[KARAF-4537] Karaf Maven Plugin should respect scope when building a feature"

This reverts commit 05d50c5737db4393d6d771d5a1b34b14eef9f9cc.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c4cec085
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c4cec085
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c4cec085

Branch: refs/heads/master
Commit: c4cec085cccce60250dff76f0388235c7c786a5c
Parents: 34d2819
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Thu Jul 28 11:53:56 2016 +0200
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Thu Jul 28 11:53:56 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, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c4cec085/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 2897f13..d0f9b53 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 dependency="true">mvn:test/dependency-bundle-b/1.0-SNAPSHOT</bundle>
+        <bundle>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/c4cec085/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 11b8640..4498f53 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,7 +42,6 @@
             <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/c4cec085/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 995345c..8deeeb2 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);
+            return !"test".equals(scope) && !"runtime".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);
+            return !"test".equals(scope) && !"provided".equals(scope) &&
!"runtime".equals(scope);
         }
 
         public DependencySelector deriveChildSelector(DependencyCollectionContext context)
{

http://git-wip-us.apache.org/repos/asf/karaf/blob/c4cec085/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 99882a9..89a1762 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);
+            return !"test".equals(scope) && !"runtime".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);
+            return !"test".equals(scope) && !"provided".equals(scope) &&
!"runtime".equals(scope);
         }
 
         public DependencySelector deriveChildSelector(DependencyCollectionContext context)
{


Mime
View raw message