karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject karaf git commit: [KARAF-4842] Karaf Maven Plugin builds features with invalid configuration
Date Wed, 30 Nov 2016 09:05:31 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x b87bb42a9 -> b51331cb6


[KARAF-4842] Karaf Maven Plugin builds features with invalid configuration

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

Branch: refs/heads/karaf-4.0.x
Commit: b51331cb6cb9d561c82a052247e3758c4301d0ce
Parents: b87bb42
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Wed Nov 30 10:04:50 2016 +0100
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Wed Nov 30 10:05:22 2016 +0100

----------------------------------------------------------------------
 archetypes/feature/src/main/resources/archetype-resources/pom.xml | 1 -
 .../org/apache/karaf/tooling/features/GenerateDescriptorMojo.java | 3 ---
 2 files changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/b51331cb/archetypes/feature/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/feature/src/main/resources/archetype-resources/pom.xml b/archetypes/feature/src/main/resources/archetype-resources/pom.xml
index b438037..47a5edc 100644
--- a/archetypes/feature/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/feature/src/main/resources/archetype-resources/pom.xml
@@ -51,7 +51,6 @@
                 <configuration>
                     <startLevel>50</startLevel>
                     <aggregateFeatures>true</aggregateFeatures>
-                    <resolver>(obr)</resolver>
                     <checkDependencyChange>true</checkDependencyChange>
                     <failOnDependencyChange>false</failOnDependencyChange>
                     <logDependencyChanges>true</logDependencyChanges>

http://git-wip-us.apache.org/repos/asf/karaf/blob/b51331cb/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index 821cc93..1ee0a65 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -397,9 +397,6 @@ public class GenerateDescriptorMojo extends MojoSupport {
         if (feature.getDescription() == null) {
             feature.setDescription(project.getName());
         }
-        if (resolver != null) {
-            feature.setResolver(resolver);
-        }
         if (installMode != null) {
             feature.setInstall(installMode);
         }


Mime
View raw message