[maven-deploy-plugin] branch CODE_IMPROVEMETS created (now 694f98d)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-deploy-plugin] branch CODE_IMPROVEMETS created (now 694f98d)

khmarbaise
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a change to branch CODE_IMPROVEMETS
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git.


      at 694f98d  No negative logic.

This branch includes the following new commits:

     new 694f98d  No negative logic.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Reply | Threaded
Open this post in threaded view
|

[maven-deploy-plugin] 01/01: No negative logic.

khmarbaise
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch CODE_IMPROVEMETS
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git

commit 694f98d41785a1df8cef505af2793cdb92b79dc2
Author: Karl Heinz Marbaise <[hidden email]>
AuthorDate: Thu Aug 9 19:36:24 2018 +0200

    No negative logic.
---
 .../java/org/apache/maven/plugins/deploy/DeployFileMojo.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
index 6dd5da7..b79010f 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
@@ -214,11 +214,7 @@ public class DeployFileMojo
     void initProperties()
         throws MojoExecutionException
     {
-        if ( pomFile != null )
-        {
-            processModel( readModel( pomFile ) );
-        }
-        else
+        if ( pomFile == null )
         {
             boolean foundPom = false;
 
@@ -300,6 +296,10 @@ public class DeployFileMojo
                 }
             }
         }
+        else
+        {
+            processModel( readModel( pomFile ) );
+        }
 
         if ( packaging == null && file != null )
         {