javaee / metro-jaxws-commons

Metro has been contributed to Eclipse Foundation. This repository is for legacy review only. Please refer to the Eclipse EE4J Metro project for the very latest
https://eclipse-ee4j.github.io/metro-wsit/
Other
10 stars 9 forks source link

fix plugin code configuration #133

Open glassfishrobot opened 9 years ago

glassfishrobot commented 9 years ago

there are some inconsistencies: I'll provide a patch

Affected Versions

[2.3.1]

glassfishrobot commented 9 years ago

Reported by hboutemy

glassfishrobot commented 9 years ago

hboutemy said: uh, can't attach a patch?

glassfishrobot commented 9 years ago

hboutemy said:

Index: pom.xml
===================================================================
--- pom.xml (révision 1189)
+++ pom.xml (copie de travail)
@@ -19,7 +19,7 @@

 -->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>

@@ -30,7 +30,6 @@
         <relativePath>../pom/pom.xml</relativePath>
     </parent>

-    <groupId>org.jvnet.jax-ws-commons</groupId>
     <artifactId>jaxws-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>Maven JAXWS 2.x Plugin</name>
@@ -92,7 +91,7 @@

     <licenses>
         <license>
-            <name>The Apache Software License, Version 2.0</name>
+            <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>
@@ -99,7 +98,7 @@
     </licenses>

     <prerequisites>
-        <maven>3.0</maven>
+        <maven>3.1.1</maven>
     </prerequisites>

     <dependencyManagement>
@@ -116,28 +115,13 @@
             </dependency>
             <dependency>
 <groupId>org.apache.maven</groupId>
-<artifactId>maven-project</artifactId>
-<version>3.0-alpha-2</version>
-<exclusions>
-    <exclusion>
-        <artifactId>maven-model</artifactId>
-        <groupId>org.apache.maven</groupId>
-    </exclusion>
-    <exclusion>
-        <artifactId>plexus-interpolation</artifactId>
-        <groupId>org.codehaus.plexus</groupId>
-    </exclusion>
-</exclusions>
-            </dependency>
-            <dependency>
-<groupId>org.apache.maven</groupId>
 <artifactId>maven-plugin-api</artifactId>
-<version>3.2.3</version>
+<version>3.1.1</version>
             </dependency>
             <dependency>
 <groupId>org.apache.maven</groupId>
 <artifactId>maven-core</artifactId>
-<version>3.2.3</version>
+<version>3.1.1</version>
             </dependency>
             <dependency>
 <groupId>org.codehaus.plexus</groupId>
@@ -159,7 +143,7 @@
             <dependency>
 <groupId>org.apache.maven</groupId>
 <artifactId>maven-settings</artifactId>
-<version>3.2.3</version>
+<version>3.1.1</version>
             </dependency>
             <dependency>
 <groupId>org.eclipse.aether</groupId>
@@ -186,10 +170,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
         </dependency>
         <dependency>
@@ -248,11 +228,25 @@
     <artifactId>maven-plugin-plugin</artifactId>
     <version>3.3</version>
     <configuration>
-        <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
         <extractors>
             <extractor>java-annotations</extractor>
         </extractors>
     </configuration>
+    <executions>
+        <execution>
+            <id>default-descriptor</id>
+            <phase>process-classes</phase>
+        </execution>
+        <execution>
+            <id>generated-helpmojo</id>
+            <goals>
+<goal>helpmojo</goal>
+            </goals>
+            <configuration><!-- TODO: remove when upgrading plugin-tools to 3.4: see MPLUGIN-238 -->
+<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+            </configuration>
+        </execution>
+    </executions>
 </plugin>
 <!-- inherited plugins -->
 <plugin>
@@ -288,15 +282,6 @@
             <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-plugin-plugin</artifactId>
-<executions>
-    <execution>
-        <id>mojo-descriptor</id>
-        <goals>
-            <goal>descriptor</goal>
-            <goal>helpmojo</goal>
-        </goals>
-    </execution>
-</executions>
             </plugin>
         </plugins>
     </build>
@@ -323,12 +308,12 @@
             <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-plugin-plugin</artifactId>
-<version>3.2</version>
+<version>3.3</version>
             </plugin>
             <plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-jxr-plugin</artifactId>
-<version>2.3</version>
+<version>2.4</version>
 <configuration>
     <linkJavadoc>false</linkJavadoc>
 </configuration>
Index: src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractJaxwsMojo.java
===================================================================
--- src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractJaxwsMojo.java (révision 1189)
+++ src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractJaxwsMojo.java (copie de travail)
@@ -88,7 +88,7 @@
     /**
      * The Maven Project Object.
      */
-    @Component
+    @Parameter(defaultValue = "${project}", readonly = true, required = true)
     protected MavenProject project;

     /**
@@ -112,7 +112,7 @@
     /**
      * Specify character encoding used by source files.
      */
-    @Parameter(property = "project.build.sourceEncoding")
+    @Parameter(defaultValue = "${project.build.sourceEncoding}")
     protected String encoding;

     /**
Index: src/main/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojo.java
===================================================================
--- src/main/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojo.java  (révision 1189)
+++ src/main/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojo.java  (copie de travail)
@@ -266,7 +266,7 @@

     /**
      */
-    @Parameter(property = "settings", readonly = true)
+    @Parameter(defaultValue = "${settings}", readonly = true, required = true)
     private Settings settings;

     protected abstract File getImplDestDir();
glassfishrobot commented 9 years ago

hboutemy said: issue created and fixed in MojoHaus https://github.com/mojohaus/jaxws-maven-plugin/issues/1

glassfishrobot commented 7 years ago

This issue was imported from java.net JIRA JAX_WS_COMMONS-133