karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3089] Ignore artifacts with scope test in the generation of the feature descriptor
Date Wed, 02 Jul 2014 08:55:17 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x 61109a0b2 -> 51236d1d5


[KARAF-3089] Ignore artifacts with scope test in the generation of the feature descriptor


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

Branch: refs/heads/karaf-2.3.x
Commit: 51236d1d5cd150b0e02638d8be78520ecc384ab3
Parents: 61109a0
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jul 2 10:43:21 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jul 2 10:55:04 2014 +0200

----------------------------------------------------------------------
 .../tooling/features/GenerateFeaturesFileMojo.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/51236d1d/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java
----------------------------------------------------------------------
diff --git a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java
b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java
index a82f1d0..152ca65 100644
--- a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java
+++ b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesFileMojo.java
@@ -250,12 +250,14 @@ public class GenerateFeaturesFileMojo extends MojoSupport {
         Set<Artifact> dependencies = (Set<Artifact>)project.getDependencyArtifacts();
         dependencies.removeAll(provided);
         for (Artifact artifact : dependencies) {
-            getLog().info(" Generating feature " + artifact.getArtifactId() + " from " +
artifact);
-            out.println("  <feature name='" + artifact.getArtifactId() + "'>");
-            currentFeature.clear();
-            writeBundle(out, artifact);
-            features.add(artifact);
-            out.println("  </feature>");
+            if (!artifact.getScope().equalsIgnoreCase("test")) {
+                getLog().info(" Generating feature " + artifact.getArtifactId() + " from
" + artifact);
+                out.println("  <feature name='" + artifact.getArtifactId() + "'>");
+                currentFeature.clear();
+                writeBundle(out, artifact);
+                features.add(artifact);
+                out.println("  </feature>");
+            }
         }
         if (missingBundles.size() > 0) {
         	getLog().info("-- Some bundles were missing  --");


Mime
View raw message