You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/05/29 19:05:39 UTC
[tomcat] branch 8.5.x updated: Switch to Maven Resolver Ant tasks
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new e4ba820 Switch to Maven Resolver Ant tasks
e4ba820 is described below
commit e4ba8202d24a3230e845a1746c51e3d0bcf996a5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 29 10:48:54 2020 +0100
Switch to Maven Resolver Ant tasks
---
.gitignore | 2 +-
build.xml | 2 +-
res/maven/mvn-pub.xml | 106 +++++++++++++++++++++++++++------------
res/maven/mvn.properties.default | 8 +--
webapps/docs/changelog.xml | 5 ++
5 files changed, 86 insertions(+), 37 deletions(-)
diff --git a/.gitignore b/.gitignore
index 08b1edc..aa1345f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ mvn.properties
*.asc
*.jj
*.tmp
-maven-ant-tasks-*.jar
+maven-resolver-ant-tasks-*.jar
thumbs.db
Thumbs.db
bin/setenv.*
diff --git a/build.xml b/build.xml
index e17c8ea..91929a4 100644
--- a/build.xml
+++ b/build.xml
@@ -2133,7 +2133,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
<filename name="**/*.asc" />
<filename name="**/*.tmp" />
<filename name="**/*.jj" />
- <filename name="**/maven-ant-tasks-*.jar" />
+ <filename name="**/maven-resolver-ant-tasks-*.jar" />
<filename name="**/thumbs.db" />
<filename name="**/Thumbs.db" />
<filename name="*.launch"/>
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 976afd6..626b6a5 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project name="Tomcat 8.5 Maven Deployment" default="" basedir="."
- xmlns:artifact="urn:maven-artifact-ant"
+ xmlns:resolver="antlib:org.apache.maven.resolver.ant"
xmlns:if="ant:if"
xmlns:unless="ant:unless">
<!--
@@ -29,19 +29,61 @@
<target name="init-maven">
<antcall target="downloadfile">
- <param name="sourcefile" value="${maven-ant-tasks.loc}"/>
- <param name="destfile" value="${maven-ant-tasks.jar}"/>
- <param name="destdir" value="${maven-ant-tasks.home}"/>
+ <param name="sourcefile" value="${maven-resolver-ant-tasks.loc}"/>
+ <param name="destfile" value="${maven-resolver-ant-tasks.jar}"/>
+ <param name="destdir" value="${maven-resolver-ant-tasks.home}"/>
</antcall>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="urn:maven-artifact-ant">
+ <taskdef resource="org/apache/maven/resolver/ant/antlib.xml"
+ uri="antlib:org.apache.maven.resolver.ant">
<classpath>
- <pathelement location="${maven-ant-tasks.jar}" />
+ <pathelement location="${maven-resolver-ant-tasks.jar}" />
</classpath>
- </typedef>
+ </taskdef>
</target>
+<<<<<<< HEAD
+=======
+ <target name="maven-install" depends="init-maven">
+ <!--cleanup-->
+ <delete file="${pom}.tmp"/>
+
+ <!--replace the version in the pom-->
+ <copy file="${pom}" tofile="${pom}.tmp">
+ <filterset>
+ <filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
+ </filterset>
+ </copy>
+
+ <resolver:install file="${file}">
+ <pom file="${pom}.tmp"/>
+ </resolver:install>
+
+ <delete file="${pom}.tmp"/>
+ </target>
+
+ <macrodef name="doMavenInstall">
+ <attribute name="artifactId"/>
+ <attribute name="jarFileName" default="@{artifactId}.jar" />
+ <attribute name="groupId" default="org.apache.tomcat" />
+ <attribute name="file" default="${tomcat.lib.path}/@{jarFileName}" />
+ <attribute name="pom" default="@{artifactId}.pom" />
+ <attribute name="srcJarFileName" default="@{artifactId}-src.jar" />
+ <attribute name="src" default="${tomcat.src.path}/@{srcJarFileName}" />
+ <sequential>
+ <antcall target="maven-install">
+ <param name="file" value="@{file}"/>
+ <param name="groupId" value="@{groupId}"/>
+ <param name="artifactId" value="@{artifactId}"/>
+ <param name="pom" value="${tomcat.pom.path}/@{pom}"/>
+ <param name="src" value="@{src}"/>
+ <param name="src.skip" value="@{src.skip}"/>
+ <param name="maven.deploy.version" value="${maven.asf.release.deploy.version}-dev"/>
+ </antcall>
+ </sequential>
+ </macrodef>
+
+>>>>>>> 5db7d814d0... Switch to Maven Resolver Ant tasks
<target name="maven-deploy" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
@@ -70,18 +112,19 @@
<param name="file.out" value="${pom}.asc" />
</antcall>
- <artifact:deploy file="${file}">
+ <resolver:deploy>
+ <artifact file="${file}" />
<pom file="${pom}.tmp"/>
- <remoteRepository id="${maven.repo.repositoryId}" url="${maven.repo.url}">
+ <remoterepo id="${maven.repo.repositoryId}" url="${maven.repo.url}">
<authentication username="${asf.ldap.username}"
password="${asf.ldap.password}"
unless:set="maven.auth.useSettings" />
- </remoteRepository>
- <attach file="${file}.asc" type="jar.asc" if:set="gpg.passphrase"/>
- <attach file="${src}" classifier="sources" type="jar"/>
- <attach file="${src}.asc" classifier="sources" type="jar.asc" if:set="gpg.passphrase"/>
- <attach file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
- </artifact:deploy>
+ </remoterepo>
+ <artifact file="${file}.asc" type="jar.asc" if:set="gpg.passphrase"/>
+ <artifact file="${src}" classifier="sources" type="jar"/>
+ <artifact file="${src}.asc" classifier="sources" type="jar.asc" if:set="gpg.passphrase"/>
+ <artifact file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
+ </resolver:deploy>
<delete file="${pom}.tmp"/>
<delete file="${pom}.asc"/>
@@ -132,16 +175,17 @@
<param name="file.out" value="${pom}.asc" />
</antcall>
- <artifact:deploy file="${file}">
+ <resolver:deploy>
+ <artifact file="${file}" />
<pom file="${pom}.tmp"/>
- <remoteRepository id="${maven.repo.repositoryId}" url="${maven.repo.url}">
+ <remoterepo id="${maven.repo.repositoryId}" url="${maven.repo.url}">
<authentication username="${asf.ldap.username}"
password="${asf.ldap.password}"
unless:set="maven.auth.useSettings"/>
- </remoteRepository>
- <attach file="${file}.asc" type="jar.asc" if:set="gpg.passphrase"/>
- <attach file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
- </artifact:deploy>
+ </remoterepo>
+ <artifact file="${file}.asc" type="jar.asc" if:set="gpg.passphrase"/>
+ <artifact file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
+ </resolver:deploy>
<delete file="${pom}.tmp"/>
<delete file="${pom}.asc"/>
@@ -192,19 +236,19 @@
<param name="file.out" value="${pom}.asc" />
</antcall>
- <artifact:deploy file="${pom}">
+ <resolver:deploy>
<pom file="${pom}.tmp"/>
- <remoteRepository id="${maven.repo.repositoryId}" url="${maven.repo.url}">
+ <remoterepo id="${maven.repo.repositoryId}" url="${maven.repo.url}">
<authentication username="${asf.ldap.username}"
password="${asf.ldap.password}"
unless:set="maven.auth.useSettings"/>
- </remoteRepository>
- <attach file="${file}.zip" type="zip"/>
- <attach file="${file}.zip.asc" type="zip.asc" if:set="gpg.passphrase"/>
- <attach file="${file}.tar.gz" type="tar.gz"/>
- <attach file="${file}.tar.gz.asc" type="tar.gz.asc" if:set="gpg.passphrase"/>
- <attach file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
- </artifact:deploy>
+ </remoterepo>
+ <artifact file="${file}.zip" type="zip"/>
+ <artifact file="${file}.zip.asc" type="zip.asc" if:set="gpg.passphrase"/>
+ <artifact file="${file}.tar.gz" type="tar.gz"/>
+ <artifact file="${file}.tar.gz.asc" type="tar.gz.asc" if:set="gpg.passphrase"/>
+ <artifact file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
+ </resolver:deploy>
<delete file="${pom}.tmp"/>
<delete file="${pom}.asc"/>
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 5898a318..3a864fc 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -61,7 +61,7 @@ tomcat.pom.path=../../res/maven
base.path=${user.home}/tomcat-build-libs
# ----- Maven Ant Tasks -----
-maven-ant-tasks.version=2.1.3
-maven-ant-tasks.home=${base.path}/maven-ant-tasks-${maven-ant-tasks.version}
-maven-ant-tasks.loc=https://archive.apache.org/dist/maven/ant-tasks/${maven-ant-tasks.version}/binaries/maven-ant-tasks-${maven-ant-tasks.version}.jar
-maven-ant-tasks.jar=${maven-ant-tasks.home}/maven-ant-tasks-${maven-ant-tasks.version}.jar
+maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
+maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
+maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 248520e..0ce02e6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -102,6 +102,11 @@
environment variable that defines a command to which captured stdout and
stderr will be redirected. Patch provided by Harald Dunkel. (markt)
</add>
+ <update>
+ Switch from the unsupported Maven Ant Tasks to the supported Maven
+ Resolver Ant Tasks to upload artifacts to the ASF Maven repository (and
+ from there to Maven Central). (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch 8.5.x updated: Switch to Maven Resolver Ant tasks
Posted by Rémy Maucherat <re...@apache.org>.
On Fri, May 29, 2020 at 9:05 PM <ma...@apache.org> wrote:
>
> +<<<<<<< HEAD
> +=======
> +
> +>>>>>>> 5db7d814d0... Switch to Maven Resolver Ant tasks
> <target name="maven-deploy" depends="init-maven">
>
> The CI run complained and indeed there's a merge conflict here.
Rémy