karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: Revert "[KARAF-5373] Improve the fix"
Date Sun, 15 Oct 2017 16:54:27 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 0c4a81921 -> 2ebdf3c28


Revert "[KARAF-5373] Improve the fix"

This reverts commit 0c4a819217cb35c59cc4c2d41369ca3f27e7cd12.


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

Branch: refs/heads/master
Commit: 2ebdf3c2804f51a1cdf50ce8dd0b2c14cfe4efd4
Parents: 0c4a819
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sun Oct 15 18:54:20 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sun Oct 15 18:54:20 2017 +0200

----------------------------------------------------------------------
 .../apache/karaf/tooling/features/GenerateDescriptorMojo.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/2ebdf3c2/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 0b27da4..896c128 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
@@ -318,7 +318,7 @@ public class GenerateDescriptorMojo extends MojoSupport {
         try {
             if (enableGeneration == null) {
                 String packaging = this.project.getPackaging();
-                enableGeneration = "feature".equals(packaging);
+                enableGeneration = !"feature".equals(packaging);
             }
 
             if (!enableGeneration) {
@@ -329,8 +329,8 @@ public class GenerateDescriptorMojo extends MojoSupport {
                     }
                     filter(inputFile, outputFile);
                     projectHelper.attachArtifact(project, attachmentArtifactType, attachmentArtifactClassifier,
outputFile);
+                    return;
                 }
-                return;
             }
 
             this.dependencyHelper = DependencyHelperFactory.createDependencyHelper(this.container,
this.project, this.mavenSession, getLog());


Mime
View raw message