Author: markt
Date: Thu Apr 20 13:35:16 2017
New Revision: 1792055

URL: http://svn.apache.org/viewvc?rev=1792055&view=rev
Log:
Download the require Maven Ant tasks plugin as part of the build. This 
simplifies initial setup for new RMs and the CI system.

Modified:
    tomcat/trunk/res/maven/README.txt
    tomcat/trunk/res/maven/mvn-pub.xml
    tomcat/trunk/res/maven/mvn.properties.default

Modified: tomcat/trunk/res/maven/README.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/README.txt?rev=1792055&r1=1792054&r2=1792055&view=diff
==============================================================================
--- tomcat/trunk/res/maven/README.txt (original)
+++ tomcat/trunk/res/maven/README.txt Thu Apr 20 13:35:16 2017
@@ -16,10 +16,8 @@
 
================================================================================
 
 General preparations before any publishing:
-1 - Download Maven Ant Tasks (version 2.1.0 is known to work) and place it in
-    this directory
-2 - Generate a standard Tomcat release (ant release)
-3 - Copy mvn.properties.default to mvn.properties and adjust it as necessary.
+1 - Generate a standard Tomcat release (ant release)
+2 - Copy mvn.properties.default to mvn.properties and adjust it as necessary.
     You will need to set asf.ldap.username and you'll probably need to set
     gpg.exec
     The other properties should be OK. Note: you will be prompted for your

Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1792055&r1=1792054&r2=1792055&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Thu Apr 20 13:35:16 2017
@@ -28,10 +28,16 @@
   <property name="local.repo" value="${user.home}/.m2/repository"/>
 
   <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}"/>
+    </antcall>
+
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
              uri="urn:maven-artifact-ant">
       <classpath>
-        <pathelement location="${basedir}/maven-ant-tasks-2.1.0.jar" />
+        <pathelement location="${maven-ant-tasks.jar}" />
       </classpath>
     </typedef>
   </target>
@@ -390,4 +396,27 @@
     </exec>
   </target>
 
+  <!-- =============== Utility Targets to support downloads ================ 
-->
+
+  <target name="setproxy" if="${proxy.use}">
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+    <echo message="Using ${proxy.host}:${proxy.port} to download 
${sourcefile}"/>
+  </target>
+
+  <target name="testexist">
+    <echo message="Testing  for ${destfile}"/>
+    <available file="${destfile}" property="exist"/>
+  </target>
+
+  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
+    <!-- Download the file -->
+    <local name="temp.file"/>
+    <mkdir dir="${base.path}"/>
+    <tempfile property="temp.file" destdir="${base.path}" prefix="download-" 
suffix=".tmp"/>
+    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" 
dest="${temp.file}"/>
+    <mkdir dir="${destdir}"/>
+    <move file="${temp.file}" tofile="${destfile}"/>
+  </target>
+
 </project>

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792055&r1=1792054&r2=1792055&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu Apr 20 13:35:16 2017
@@ -53,3 +53,15 @@ tomcat.extras.src.path=../../output/extr
 
 #Where do we find the POM files
 tomcat.pom.path=../../res/maven
+
+# ----- Default Base Path for Dependent Packages -----
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+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/2.1.3/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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to