You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2018/04/10 12:38:33 UTC

[cxf] 02/03: [CXF-6324]cxf-java2ws-plugin:ensure can attach multiple wsdl with different classifier

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

ffang pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 2061c48a3d95020c3ff08d35e7b9f2ada0720fdb
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Apr 10 15:45:29 2018 +0800

    [CXF-6324]cxf-java2ws-plugin:ensure can attach multiple wsdl with different classifier
    
    (cherry picked from commit f30f3ce149fede81622fdb86fb4f5cee6a751230)
---
 .../src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index 2df61da..c659b33 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
@@ -446,14 +446,10 @@ public class Java2WSMojo extends AbstractMojo {
         if (attachWsdl && outputFile != null) {
             File wsdlFile = new File(outputFile);
             if (wsdlFile.exists()) {
-                if (classifier != null) {
-                    projectHelper.attachArtifact(project, wsdlFile.getName(), classifier, wsdlFile);
-                } else {
-                    projectHelper.attachArtifact(project, wsdlFile.getName(), wsdlFile);
-                }
+                
                 boolean hasWsdlAttached = false;
                 for (Artifact a : project.getAttachedArtifacts()) {
-                    if ("wsdl".equals(a.getType())) {
+                    if ("wsdl".equals(a.getType()) && classifier.equals(a.getClassifier())) {
                         hasWsdlAttached = true;
                     }
                 }

-- 
To stop receiving notification emails like this one, please contact
ffang@apache.org.