Repository: karaf
Updated Branches:
  refs/heads/master 0e016eda6 -> 4627aa94f


[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/4627aa94
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4627aa94
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4627aa94

Branch: refs/heads/master
Commit: 4627aa94f647b53ac0fc0953c3df73a468a596f5
Parents: 0e016ed
Author: Guillaume Nodet <gno...@apache.org>
Authored: Wed Nov 30 10:04:50 2016 +0100
Committer: Guillaume Nodet <gno...@apache.org>
Committed: Wed Nov 30 10:04:50 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/4627aa94/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/4627aa94/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 73a58fa..1ee9f78 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
@@ -417,9 +417,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);
         }

Reply via email to