This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 7482721 Update maven-antrun-plugin
7482721 is described below
commit 7482721119f4fea9baf04adb184a8869fea928ee
Author: Andreas Veithen <[email protected]>
AuthorDate: Mon Dec 28 18:22:23 2020 +0000
Update maven-antrun-plugin
---
modules/adb-codegen/pom.xml | 4 ++--
modules/codegen/pom.xml | 8 ++++----
modules/distribution/pom.xml | 4 ++--
modules/fastinfoset/pom.xml | 4 ++--
modules/integration/pom.xml | 8 ++++----
modules/java2wsdl/pom.xml | 4 ++--
modules/jaxbri-codegen/pom.xml | 8 ++++----
modules/jaxws-integration/pom.xml | 4 ++--
modules/jaxws/pom.xml | 4 ++--
modules/jibx/pom.xml | 8 ++++----
modules/json/pom.xml | 4 ++--
modules/kernel/pom.xml | 12 ++++++------
modules/metadata/pom.xml | 4 ++--
modules/tool/axis2-ant-plugin/pom.xml | 4 ++--
modules/xmlbeans/pom.xml | 4 ++--
pom.xml | 2 +-
16 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml
index d76a8f2..b50a68c 100644
--- a/modules/adb-codegen/pom.xml
+++ b/modules/adb-codegen/pom.xml
@@ -122,7 +122,7 @@
<id>process-resources</id>
<phase>process-resources</phase>
<configuration>
- <tasks>
+ <target>
<tstamp>
<format property="build.time" pattern="MMM
dd, yyyy (hh:mm:ss z)" locale="en" />
</tstamp>
@@ -133,7 +133,7 @@
<filter token="today" value=" Built on
: ${build.time}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 3e9e199..9114f15 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -163,7 +163,7 @@
<id>generate-test-sources</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<!-- Set a property that can be picked up from
the ant build.xml's -->
<property name="maven.class.path"
refid="maven.test.classpath" />
<echo>Building WSDLs...</echo>
@@ -173,7 +173,7 @@
<path refid="maven.compile.classpath" />
</path>
<ant antfile="build-wsdls.xml"
inheritall="true" inheritrefs="true" dir="." target="wsdl-codegen" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -183,7 +183,7 @@
<id>process-resources</id>
<phase>process-resources</phase>
<configuration>
- <tasks>
+ <target>
<tstamp>
<format property="build.time" pattern="MMM
dd, yyyy (hh:mm:ss z)" locale="en" />
</tstamp>
@@ -194,7 +194,7 @@
<filter token="today" value=" Built on
: ${build.time}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index c3402bd..2c775bf 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -521,7 +521,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<unzip
src="${project.build.directory}/axis2-${project.version}-bin.zip"
dest="${project.build.directory}" />
<!-- Build the web app -->
@@ -540,7 +540,7 @@
<!-- Test of the json sample -->
<ant
dir="${project.build.directory}/axis2-${project.version}/samples/json"
target="generate.service" />
<ant
dir="${project.build.directory}/axis2-${project.version}/samples/json"
target="client.jar" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml
index 6b82afd..cfa9772 100644
--- a/modules/fastinfoset/pom.xml
+++ b/modules/fastinfoset/pom.xml
@@ -176,7 +176,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<mkdir dir="target/test-classes" />
<property name="axis2.home"
value="${basedir}/target" />
@@ -212,7 +212,7 @@
<classpath
location="${compiled.classes.dir}" />
<arg line="-uri
target/test-classes/SimpleAddService.wsdl -o target/wsdl/simpleAddService -S .
-or" />
</java>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index c5d8520..fe28760 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -489,7 +489,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<condition property="test.skip">
<equals arg1="true"
arg2="${maven.test.skip}" />
</condition>
@@ -498,7 +498,7 @@
<property name="maven.class.path"
refid="maven.runtime.classpath" />
<property name="maven.test.path"
refid="maven.compile.classpath" />
<ant antfile="itest-build.xml"
inheritall="true" inheritrefs="true" dir="." target="generate-test-sources" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -508,7 +508,7 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<condition property="test.skip">
<equals arg1="true"
arg2="${maven.test.skip}" />
</condition>
@@ -523,7 +523,7 @@
<path refid="maven.runtime.classpath" />
</path>
<ant antfile="itest-build.xml"
inheritall="true" inheritrefs="true" dir="." target="build-repos" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/java2wsdl/pom.xml b/modules/java2wsdl/pom.xml
index 83c4f01..b6c9e53 100644
--- a/modules/java2wsdl/pom.xml
+++ b/modules/java2wsdl/pom.xml
@@ -160,7 +160,7 @@
</goals>
<phase>test</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<echo message="Generating p2n.wsdl" />
<java
classname="org.apache.ws.java2wsdl.Java2WSDL"
classpathref="maven.test.classpath" fork="true" failonerror="true">
@@ -175,7 +175,7 @@
<arg value="-stn" />
<arg
value="http://www.example.org/calculator-service"; />
</java>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/modules/jaxbri-codegen/pom.xml b/modules/jaxbri-codegen/pom.xml
index 74f1d1f..601c5e0 100644
--- a/modules/jaxbri-codegen/pom.xml
+++ b/modules/jaxbri-codegen/pom.xml
@@ -130,7 +130,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
<arg line="-d jaxbri -ss -ssi -sd -o
'${project.build.directory}/gen/Test01' -u -uri src/test/wsdl/Test01.wsdl" />
@@ -139,7 +139,7 @@
<classpath refid="maven.test.classpath" />
<arg line="-d jaxbri -o
'${project.build.directory}/gen/Test01' -u -uri src/test/wsdl/Test01.wsdl" />
</java>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
@@ -149,11 +149,11 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<property name="axis2.home"
value="${basedir}/target" />
<property name="maven.class.path"
refid="maven.test.classpath" />
<ant
dir="${project.build.directory}/gen/Test01" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/modules/jaxws-integration/pom.xml
b/modules/jaxws-integration/pom.xml
index 53de80a..2fc3eb1 100644
--- a/modules/jaxws-integration/pom.xml
+++ b/modules/jaxws-integration/pom.xml
@@ -723,7 +723,7 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<property name="repo.dir"
value="${project.build.directory}/repo" />
<property name="services.dir"
value="${repo.dir}/services" />
<property name="servicejars.dir"
value="${repo.dir}/servicejars" />
@@ -1339,7 +1339,7 @@
<include name="**/axis2.xml" />
</fileset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml
index e5b9a86..4d89309 100644
--- a/modules/jaxws/pom.xml
+++ b/modules/jaxws/pom.xml
@@ -286,14 +286,14 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<copy toDir="target/test-classes/">
<fileset dir="test-resources/">
<include name="**/*.properties" />
<include name="**/axis2.xml" />
</fileset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/jibx/pom.xml b/modules/jibx/pom.xml
index e88c68b..6a4f2ac 100644
--- a/modules/jibx/pom.xml
+++ b/modules/jibx/pom.xml
@@ -118,7 +118,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
<arg line="-uri src/test/wsdl/library.wsdl
-o '${project.build.directory}/gen/library-unwrapped' -d jibx -uw -Ebindingfile
src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client";
/>
@@ -139,14 +139,14 @@
<classpath refid="maven.test.classpath" />
<arg line="-uri
src/test/wsdl/customer-echo.wsdl -o
'${project.build.directory}/gen/customer-echo' -d jibx -Ebindingfile
src/test/binding/customer-binding.xml --noBuildXML -ns2p
http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer"; />
</java>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
<id>compile</id>
<phase>test-compile</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<java classname="org.jibx.binding.Compile"
fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
<classpath location="target/test-classes"
/>
@@ -154,7 +154,7 @@
<arg
value="src/test/binding/customer-binding.xml" />
<arg
value="src/test/binding/library-binding.xml" />
</java>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 6f50c52..25accf4 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -127,13 +127,13 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
<arg line="-ss -sd -u -or -o
'${project.build.directory}/gen' -uri test-wsdl/LibraryService.wsdl" />
</java>
<delete
file="${project.build.directory}/gen/src/org/apache/axis2/json/adb/LibraryServiceSkeleton.java"
/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml
index bd62382..66a7307 100644
--- a/modules/kernel/pom.xml
+++ b/modules/kernel/pom.xml
@@ -189,14 +189,14 @@
<id>process-resources</id>
<phase>process-resources</phase>
<configuration>
- <tasks>
+ <target>
<tstamp>
<format property="build.time" pattern="MMM
dd, yyyy (hh:mm:ss z)" locale="en" />
</tstamp>
<filter token="axisVersion"
value="${project.version}" />
<filter token="TODAY" value="${build.time}" />
<copy
toDir="${basedir}/target/classes/org/apache/axis2/i18n" overwrite="true"
filtering="on" file="${basedir}/src/org/apache/axis2/i18n/resource.properties"
/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -206,7 +206,7 @@
<id>process-test-resources</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<copy
todir="${project.build.directory}/test-resources">
<fileset dir="${basedir}/test-resources" />
</copy>
@@ -216,7 +216,7 @@
<ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="test-resources/deployment/module1" />
<ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="test-resources/deployment/serviceModule" />
<copy
file="${basedir}/test-resources/deployment/axis2.xml"
tofile="${basedir}/target/test-resources/deployment/axis2.xml" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -226,10 +226,10 @@
<id>test-compile</id>
<phase>test-compile</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<property name="maven.build.dir"
location="${basedir}/target" />
<ant antfile="j2secbuild.xml"
inheritall="true" inheritrefs="true" dir="test-resources/" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/metadata/pom.xml b/modules/metadata/pom.xml
index ed1d2ca..4a83a1e 100755
--- a/modules/metadata/pom.xml
+++ b/modules/metadata/pom.xml
@@ -193,7 +193,7 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<copy toDir="target/test-classes/">
<fileset dir="test-resources/">
<include name="**/*.properties" />
@@ -202,7 +202,7 @@
<include
name="org/apache/axis2/jaxws/description/HandlerConfigFile.xml" />
</fileset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/modules/tool/axis2-ant-plugin/pom.xml
b/modules/tool/axis2-ant-plugin/pom.xml
index c4677d7..6e0c83f 100644
--- a/modules/tool/axis2-ant-plugin/pom.xml
+++ b/modules/tool/axis2-ant-plugin/pom.xml
@@ -114,7 +114,7 @@
</goals>
<phase>test</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<taskdef name="java2wsdl"
classname="org.apache.axis2.tool.ant.Java2WSDLTask">
<classpath>
<path refid="maven.test.classpath" />
@@ -139,7 +139,7 @@
<java2wsdl className="test.Service"
outputLocation="${project.build.directory}/java2wsdl"
outputFileName="mappings.wsdl"
schemaTargetNamespace="http://www.example.org/schema/test-service";>
<mapping package="test"
namespace="http://www.example.org/schema/test"; />
</java2wsdl>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/modules/xmlbeans/pom.xml b/modules/xmlbeans/pom.xml
index b85a9b3..975dd0d 100644
--- a/modules/xmlbeans/pom.xml
+++ b/modules/xmlbeans/pom.xml
@@ -122,10 +122,10 @@
<id>gen-cp</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<property name="cp"
refid="maven.runtime.classpath" />
<echo message="${cp}" file="target/cp.txt" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/pom.xml b/pom.xml
index 5157280..a84df48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1148,7 +1148,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
