karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-5373] Correctly attach the artifacts when inputFile doesn't exist
Date Wed, 11 Oct 2017 14:00:37 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x b3c848fce -> ea5a18095


[KARAF-5373] Correctly attach the artifacts when inputFile doesn't exist


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

Branch: refs/heads/karaf-4.1.x
Commit: ea5a180959d5890f52d860d6f3ed7955403f72fc
Parents: b3c848f
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Oct 11 15:59:10 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Oct 11 16:00:29 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/ea5a1809/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 f975dbf..9f7e07f 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
@@ -330,8 +330,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());
@@ -348,7 +348,6 @@ public class GenerateDescriptorMojo extends MojoSupport {
                 }
                 // now lets attach it
                 projectHelper.attachArtifact(project, attachmentArtifactType, attachmentArtifactClassifier,
outputFile);
-
             } else {
                 throw new MojoExecutionException("Could not create directory for features
file: " + dir);
             }


Mime
View raw message