karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [5/5] karaf git commit: [KARAF-5003] Fix enableGeneration checked twice in the GenerateDescriptionMojo
Date Mon, 27 Mar 2017 04:33:54 GMT
[KARAF-5003] Fix enableGeneration checked twice in the GenerateDescriptionMojo


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

Branch: refs/heads/master
Commit: ff939b84df95a338bf6d1b1608ddf7e187150558
Parents: 2d7d952
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sun Mar 26 07:48:15 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Mar 27 06:33:32 2017 +0200

----------------------------------------------------------------------
 .../org/apache/karaf/tooling/features/GenerateDescriptorMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ff939b84/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 329280d..c6dc9fc 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) && !"feature".equals(packaging);
+                enableGeneration = !"feature".equals(packaging);
             }
 
             if (!enableGeneration) {


Mime
View raw message