You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2018/01/08 17:52:06 UTC
svn commit: r1820589 - in /axis/axis2/java/core/trunk: ./
modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/
modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/
modules/tool/axis2-mar-m...
Author: veithen
Date: Mon Jan 8 17:52:05 2018
New Revision: 1820589
URL: http://svn.apache.org/viewvc?rev=1820589&view=rev
Log:
Upgraded some Maven plugins
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateSourcesMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateTestSourcesMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java Mon Jan 8 17:52:05 2018
@@ -46,14 +46,14 @@ public class AarMojo extends AbstractAar
*
* @required
* @readonly
- * @parameter expression="${session}"
+ * @parameter property="session"
*/
private MavenSession session;
/**
* The directory for the generated aar.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
*/
private String outputDirectory;
@@ -61,7 +61,7 @@ public class AarMojo extends AbstractAar
/**
* The name of the generated aar.
*
- * @parameter expression="${project.build.finalName}"
+ * @parameter default-value="${project.build.finalName}"
* @required
*/
private String aarName;
@@ -93,11 +93,13 @@ public class AarMojo extends AbstractAar
* Whether this is the main artifact being built. Set to <code>false</code> if you don't want to
* install or deploy it to the local repository instead of the default one in an execution.
*
- * @parameter expression="${primaryArtifact}" default-value="true"
+ * @parameter default-value="true"
*/
private boolean primaryArtifact;
- /** @component */
+ /**
+ * @component
+ */
private MavenProjectHelper projectHelper;
/**
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java Mon Jan 8 17:52:05 2018
@@ -41,7 +41,7 @@ public abstract class AbstractAarMojo
/**
* The projects base directory.
*
- * @parameter expression="${project.basedir}"
+ * @parameter property="project.basedir"
* @required
* @readonly
*/
@@ -50,7 +50,7 @@ public abstract class AbstractAarMojo
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter property="project"
* @required
* @readonly
*/
@@ -59,7 +59,7 @@ public abstract class AbstractAarMojo
/**
* The directory containing generated classes.
*
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter default-value="${project.build.outputDirectory}"
* @required
*/
private File classesDirectory;
@@ -67,7 +67,7 @@ public abstract class AbstractAarMojo
/**
* The directory where the aar is built.
*
- * @parameter expression="${project.build.directory}/aar"
+ * @parameter default-value="${project.build.directory}/aar"
* @required
*/
protected File aarDirectory;
@@ -107,7 +107,7 @@ public abstract class AbstractAarMojo
/**
* Whether the dependency jars should be included in the aar
*
- * @parameter expression="${includeDependencies}" default-value="true"
+ * @parameter default-value="true"
*/
private boolean includeDependencies;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java Mon Jan 8 17:52:05 2018
@@ -48,21 +48,21 @@ public class DeployAarMojo extends Abstr
/**
* The URL of the Axis2 administration console.
*
- * @parameter default-value="http://localhost:8080/axis2/axis2-admin" expression="${axis2.aar.axis2AdminConsoleURL}"
+ * @parameter default-value="http://localhost:8080/axis2/axis2-admin" property="axis2.aar.axis2AdminConsoleURL"
*/
private URL axis2AdminConsoleURL;
/**
* The administrator user name for the Axis2 administration console.
*
- * @parameter expression="${axis2.aar.axis2AdminUser}"
+ * @parameter property="axis2.aar.axis2AdminUser"
*/
private String axis2AdminUser;
/**
* The administrator password for the Axis2 administration console.
*
- * @parameter expression="${axis2.aar.axis2AdminPassword}"
+ * @parameter property="axis2.aar.axis2AdminPassword"
*/
private String axis2AdminPassword;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java Mon Jan 8 17:52:05 2018
@@ -52,7 +52,7 @@ public class Java2WSDLMojo extends Abstr
/**
* The maven project.
- * @parameter expression="${project}"
+ * @parameter property="project"
* @read-only
* @required
*/
@@ -60,111 +60,111 @@ public class Java2WSDLMojo extends Abstr
/**
* Fully qualified name of the class, which is being inspected.
- * @parameter expression="${axis2.java2wsdl.className}"
+ * @parameter property="axis2.java2wsdl.className"
* @required
*/
private String className;
/**
* Target namespace of the generated WSDL.
- * @parameter expression="${axis2.java2wsdl.targetNamespace}"
+ * @parameter property="axis2.java2wsdl.targetNamespace"
*/
private String targetNamespace;
/**
* The namespace prefix, which is being used for the WSDL's
* target namespace.
- * @parameter expression="${axis2.java2wsdl.targetNamespacePrefix}"
+ * @parameter property="axis2.java2wsdl.targetNamespacePrefix"
*/
private String targetNamespacePrefix;
/**
* The generated schemas target namespace.
- * @parameter expression="${axis2.java2wsdl.schemaTargetNamespace}"
+ * @parameter property="axis2.java2wsdl.schemaTargetNamespace"
*/
private String schemaTargetNamespace;
/**
* The generated schemas target namespace prefix.
- * @parameter expression="${axis2.java2wsdl.schemaTargetNamespacePrefix}"
+ * @parameter property="axis2.java2wsdl.schemaTargetNamespacePrefix"
*/
private String schemaTargetNamespacePrefix;
/**
* Name of the generated service.
- * @parameter expression="${axis2.java2wsdl.serviceName}"
+ * @parameter property="axis2.java2wsdl.serviceName"
*/
private String serviceName;
/**
* Name of the service file, which is being generated.
- * @parameter expression="${axis2.java2wsdl.outputFileName}" default-value="${project.build.directory}/generated-resources/service.wsdl"
+ * @parameter property="axis2.java2wsdl.outputFileName" default-value="${project.build.directory}/generated-resources/service.wsdl"
*/
private String outputFileName;
/**
* Style for the wsdl
- * @parameter expression="${axis2.java2wsdl.style}"
+ * @parameter property="axis2.java2wsdl.style"
*/
private String style;
/**
* Use for the wsdl
- * @parameter expression="${axis2.java2wsdl.use}"
+ * @parameter property="axis2.java2wsdl.use"
*/
private String use;
/**
* Version for the wsdl
- * @parameter expression="${axis2.java2wsdl.wsdlVersion}"
+ * @parameter property="axis2.java2wsdl.wsdlVersion"
*/
private String wsdlVersion;
/**
* Namespace Generator
- * @parameter expression="${axis2.java2wsdl.nsGenClassName}"
+ * @parameter property="axis2.java2wsdl.nsGenClassName"
*/
private String nsGenClassName;
/**
* Schema Generator
- * @parameter expression="${axis2.java2wsdl.schemaGenClassName}"
+ * @parameter property="axis2.java2wsdl.schemaGenClassName"
*/
private String schemaGenClassName;
/**
* Location URI in the wsdl
- * @parameter expression="${axis2.java2wsdl.locationUri}"
+ * @parameter property="axis2.java2wsdl.locationUri"
*/
private String locationUri;
/**
* attrFormDefault setting for the schema
- * @parameter expression="${axis2.java2wsdl.attrFormDefault}"
+ * @parameter property="axis2.java2wsdl.attrFormDefault"
*/
private String attrFormDefault;
/**
* elementFormDefault setting for the schema
- * @parameter expression="${axis2.java2wsdl.elementFormDefault}"
+ * @parameter property="axis2.java2wsdl.elementFormDefault"
*/
private String elementFormDefault;
/**
* Switch on the Doc/Lit/Bare style schema
- * @parameter expression="${axis2.java2wsdl.docLitBare}"
+ * @parameter property="axis2.java2wsdl.docLitBare"
*/
private String docLitBare;
/**
* Additional classes for which we need to generate schema
- * @parameter expression="${axis2.java2wsdl.extraClasses}"
+ * @parameter property="axis2.java2wsdl.extraClasses"
*/
private String[] extraClasses;
/**
* Specify namespaces explicitly for packages
- * @parameter expression="${axis2.java2wsdl.package2Namespace}"
+ * @parameter property="axis2.java2wsdl.package2Namespace"
*/
private Properties package2Namespace;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java Mon Jan 8 17:52:05 2018
@@ -45,7 +45,7 @@ public abstract class AbstractMarMojo
/**
* The projects base directory.
*
- * @parameter expression="${project.basedir}"
+ * @parameter property="project.basedir"
* @required
* @readonly
*/
@@ -54,7 +54,7 @@ public abstract class AbstractMarMojo
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter property="project"
* @required
* @readonly
*/
@@ -63,7 +63,7 @@ public abstract class AbstractMarMojo
/**
* The directory containing generated classes.
*
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter property="project.build.outputDirectory"
* @required
*/
private File classesDirectory;
@@ -71,7 +71,7 @@ public abstract class AbstractMarMojo
/**
* The directory where the mar is built.
*
- * @parameter expression="${project.build.directory}/mar"
+ * @parameter default-value="${project.build.directory}/mar"
* @required
*/
protected File marDirectory;
@@ -95,7 +95,7 @@ public abstract class AbstractMarMojo
/**
* Whether the dependency jars should be included in the mar
*
- * @parameter expression="${includeDependencies}" default-value="true"
+ * @parameter default-value="true"
*/
private boolean includeDependencies;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java Mon Jan 8 17:52:05 2018
@@ -47,14 +47,14 @@ public class MarMojo extends AbstractMar
*
* @required
* @readonly
- * @parameter expression="${session}"
+ * @parameter property="session"
*/
private MavenSession session;
/**
* The directory for the generated mar.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
*/
private String outputDirectory;
@@ -62,7 +62,7 @@ public class MarMojo extends AbstractMar
/**
* The name of the generated mar.
*
- * @parameter expression="${project.build.finalName}"
+ * @parameter default-value="${project.build.finalName}"
* @required
*/
private String marName;
@@ -93,7 +93,7 @@ public class MarMojo extends AbstractMar
* Whether this is the main artifact being built. Set to <code>false</code> if you don't want to install or deploy
* it to the local repository instead of the default one in an execution.
*
- * @parameter expression="${primaryArtifact}" default-value="true"
+ * @parameter default-value="true"
*/
private boolean primaryArtifact;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java Mon Jan 8 17:52:05 2018
@@ -61,14 +61,14 @@ import org.codehaus.plexus.util.StringUt
public abstract class AbstractCreateRepositoryMojo extends AbstractMojo {
/**
- * @parameter expression="${project.artifacts}"
+ * @parameter property="project.artifacts"
* @readonly
* @required
*/
private Set<Artifact> projectArtifacts;
/**
- * @parameter expression="${project.collectedProjects}"
+ * @parameter property="project.collectedProjects"
* @required
* @readonly
*/
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java Mon Jan 8 17:52:05 2018
@@ -47,7 +47,7 @@ public class CreateRepositoryMojo extend
private File outputDirectory;
/**
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter property="project.build.outputDirectory"
* @readonly
*/
private File buildOutputDirectory;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java Mon Jan 8 17:52:05 2018
@@ -50,19 +50,19 @@ public class CreateTestRepositoryMojo ex
private File outputDirectory;
/**
- * @parameter expression="${maven.test.skip}"
+ * @parameter property="maven.test.skip"
* @readonly
*/
private boolean skip;
/**
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter property="project.build.outputDirectory"
* @readonly
*/
private File buildOutputDirectory;
/**
- * @parameter expression="${project.build.testOutputDirectory}"
+ * @parameter property="project.build.testOutputDirectory"
* @readonly
*/
private File buildTestOutputDirectory;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java Mon Jan 8 17:52:05 2018
@@ -39,7 +39,7 @@ public abstract class AbstractWSDL2CodeM
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter property="project"
* @readonly
* @required
*/
@@ -48,7 +48,7 @@ public abstract class AbstractWSDL2CodeM
/**
* The WSDL file, which is being read.
*
- * @parameter expression="${axis2.wsdl2code.wsdlFile}" default-value="src/main/resources/service.wsdl"
+ * @parameter property="axis2.wsdl2code.wsdlFile" default-value="src/main/resources/service.wsdl"
*/
private String wsdlFile;
@@ -56,28 +56,28 @@ public abstract class AbstractWSDL2CodeM
* Package name of the generated sources; will be used to create a package structure below the
* output directory.
*
- * @parameter expression="${axis2.wsdl2code.package}"
+ * @parameter property="axis2.wsdl2code.package"
*/
private String packageName;
/**
* The programming language of the generated sources.
*
- * @parameter expression="${axis2.wsdl2code.language}" default-value="java"
+ * @parameter property="axis2.wsdl2code.language" default-value="java"
*/
private String language;
/**
* The databinding framework, which is being used by the generated sources.
*
- * @parameter expression="${axis2.wsdl2code.databindingName}" default-value="adb"
+ * @parameter property="axis2.wsdl2code.databindingName" default-value="adb"
*/
private String databindingName;
/**
* The binding file for JiBX databinding.
*
- * @parameter expression="${axis2.wsdl2code.jibxBindingFile}"
+ * @parameter property="axis2.wsdl2code.jibxBindingFile"
*/
private String jibxBindingFile;
@@ -85,7 +85,7 @@ public abstract class AbstractWSDL2CodeM
* Port name, for which to generate sources. By default, sources will be generated for a
* randomly picked port.
*
- * @parameter expression="${axis2.wsdl2code.portName}"
+ * @parameter property="axis2.wsdl2code.portName"
*/
private String portName;
@@ -93,35 +93,35 @@ public abstract class AbstractWSDL2CodeM
* Service name, for which to generate sources. By default, sources will be generated for all
* services.
*
- * @parameter expression="${axis2.wsdl2code.serviceName}"
+ * @parameter property="axis2.wsdl2code.serviceName"
*/
private String serviceName;
/**
* Mode, for which sources are being generated; either of "sync", "async" or "both".
*
- * @parameter expression="${axis2.wsdl2code.syncMode}" default-value="both"
+ * @parameter property="axis2.wsdl2code.syncMode" default-value="both"
*/
private String syncMode;
/**
* Whether server side sources are being generated.
*
- * @parameter expression="${axis2.wsdl2code.generateServerSide}" default-value="false"
+ * @parameter property="axis2.wsdl2code.generateServerSide" default-value="false"
*/
private boolean generateServerSide;
/**
* Whether a test case is being generated.
*
- * @parameter expression="${axis2.wsdl2code.generateTestCase}" default-value="false"
+ * @parameter property="axis2.wsdl2code.generateTestCase" default-value="false"
*/
private boolean generateTestcase;
/**
* Whether a "services.xml" file is being generated.
*
- * @parameter expression="${axis2.wsdl2code.generateServicesXml}" default-value="false"
+ * @parameter property="axis2.wsdl2code.generateServicesXml" default-value="false"
*/
private boolean generateServicesXml;
@@ -129,46 +129,46 @@ public abstract class AbstractWSDL2CodeM
* Whether to generate simply all classes. This is only valid in conjunction with
* "generateServerSide".
*
- * @parameter expression="${axis2.wsdl2code.generateAllClasses}" default-value="false"
+ * @parameter property="axis2.wsdl2code.generateAllClasses" default-value="false"
*/
private boolean generateAllClasses;
/**
* Whether to unpack classes.
*
- * @parameter expression="${axis2.wsdl2code.unpackClasses}" default-value="false"
+ * @parameter property="axis2.wsdl2code.unpackClasses" default-value="false"
*/
private boolean unpackClasses;
/**
* Whether to generate the server side interface.
*
- * @parameter expression="${axis2.wsdl2code.generateServerSideInterface}" default-value="false"
+ * @parameter property="axis2.wsdl2code.generateServerSideInterface" default-value="false"
*/
private boolean generateServerSideInterface = false;
/**
- * @parameter expression="${axis2.wsdl2code.repositoryPath}"
+ * @parameter property="axis2.wsdl2code.repositoryPath"
*/
private String repositoryPath = null;
/**
- * @parameter expression="${axis2.wsdl2code.externalMapping}"
+ * @parameter property="axis2.wsdl2code.externalMapping"
*/
private File externalMapping = null;
/**
- * @parameter expression="${axis2.wsdl2code.wsdlVersion}" default-value="1.1"
+ * @parameter property="axis2.wsdl2code.wsdlVersion" default-value="1.1"
*/
private String wsdlVersion;
/**
- * @parameter expression="${axis2.wsdl2code.targetSourceFolderLocation}" default-value="src"
+ * @parameter property="axis2.wsdl2code.targetSourceFolderLocation" default-value="src"
*/
private String targetSourceFolderLocation;
/**
- * @parameter expression="${axis2.wsdl2code.targetResourcesFolderLocation}"
+ * @parameter property="axis2.wsdl2code.targetResourcesFolderLocation"
*/
private String targetResourcesFolderLocation = null;
@@ -176,56 +176,56 @@ public abstract class AbstractWSDL2CodeM
* This will select between wrapped and unwrapped during code generation. Maps to the -uw option
* of the command line tool.
*
- * @parameter expression="${axis2.wsdl2code.unwrap}" default-value="false"
+ * @parameter property="axis2.wsdl2code.unwrap" default-value="false"
*/
private boolean unwrap = false;
/**
* Set this to true to generate code for all ports.
*
- * @parameter expression="${axis2.wsdl2code.allPorts}" default-value="false"
+ * @parameter property="axis2.wsdl2code.allPorts" default-value="false"
*/
private boolean allPorts = false;
/**
- * @parameter expression="${axis2.wsdl2code.backwardCompatible}" default-value="false" *
+ * @parameter property="axis2.wsdl2code.backwardCompatible" default-value="false" *
*/
private boolean backwardCompatible = false;
/**
- * @parameter expression="${axis2.wsdl2code.flattenFiles}" default-value="false" *
+ * @parameter property="axis2.wsdl2code.flattenFiles" default-value="false" *
*/
private boolean flattenFiles = false;
/**
- * @parameter expression="${axis2.wsdl2code.skipMessageReceiver}" default-value="false" *
+ * @parameter property="axis2.wsdl2code.skipMessageReceiver" default-value="false" *
*/
private boolean skipMessageReceiver = false;
/**
- * @parameter expression="${axis2.wsdl2code.skipBuildXML}" default-value="false" *
+ * @parameter property="axis2.wsdl2code.skipBuildXML" default-value="false" *
*/
private boolean skipBuildXML = false;
/**
- * @parameter expression="${axis2.wsdl2code.skipWSDL}" default-value="false" *
+ * @parameter property="axis2.wsdl2code.skipWSDL" default-value="false" *
*/
private boolean skipWSDL = false;
/**
- * @parameter expression="${axis2.wsdl2code.overWrite}" default-value="false" *
+ * @parameter property="axis2.wsdl2code.overWrite" default-value="false" *
*/
private boolean overWrite = false;
/**
- * @parameter expression="${axis2.wsdl2code.suppressPrefixes}" default-value="false" *
+ * @parameter property="axis2.wsdl2code.suppressPrefixes" default-value="false" *
*/
private boolean suppressPrefixes = false;
/**
* Specify databinding specific extra options
*
- * @parameter expression="${axis2.java2wsdl.options}"
+ * @parameter property="axis2.java2wsdl.options"
*/
private Properties options;
@@ -234,7 +234,7 @@ public abstract class AbstractWSDL2CodeM
* this parameter is discouraged. In general, you should use the {@code namespaceUris}
* parameter. However, the latter cannot be set on the command line.
*
- * @parameter expression="${axis2.wsdl2code.namespaceToPackages}"
+ * @parameter property="axis2.wsdl2code.namespaceToPackages"
*/
private String namespaceToPackages = null;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateSourcesMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateSourcesMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateSourcesMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateSourcesMojo.java Mon Jan 8 17:52:05 2018
@@ -32,7 +32,7 @@ public class GenerateSourcesMojo extends
/**
* The output directory, where the generated sources are being created.
*
- * @parameter expression="${axis2.wsdl2code.target}" default-value="${project.build.directory}/generated-sources/wsdl2code"
+ * @parameter property="axis2.wsdl2code.target" default-value="${project.build.directory}/generated-sources/wsdl2code"
*/
private File outputDirectory;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateTestSourcesMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateTestSourcesMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateTestSourcesMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateTestSourcesMojo.java Mon Jan 8 17:52:05 2018
@@ -34,7 +34,7 @@ public class GenerateTestSourcesMojo ext
/**
* The output directory, where the generated sources are being created.
*
- * @parameter expression="${axis2.wsdl2code.target}" default-value="${project.build.directory}/generated-test-sources/wsdl2code"
+ * @parameter property="axis2.wsdl2code.target" default-value="${project.build.directory}/generated-test-sources/wsdl2code"
*/
private File outputDirectory;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java Mon Jan 8 17:52:05 2018
@@ -36,7 +36,7 @@ public class WSDL2CodeMojo extends Gener
/**
* The output directory, where the generated sources are being created.
*
- * @parameter expression="${axis2.wsdl2code.target}" default-value="${project.build.directory}/generated-sources/axis2/wsdl2code"
+ * @parameter property="axis2.wsdl2code.target" default-value="${project.build.directory}/generated-sources/axis2/wsdl2code"
*/
private File outputDirectory;
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java Mon Jan 8 17:52:05 2018
@@ -36,7 +36,7 @@ public abstract class AbstractXSD2JavaMo
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter property="project"
* @readonly
* @required
*/
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1820589&r1=1820588&r2=1820589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Mon Jan 8 17:52:05 2018
@@ -1197,15 +1197,15 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.6</version>
+ <version>3.5</version>
</plugin>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
@@ -1213,7 +1213,7 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.2</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>