Re: svn commit: r1792055 - in /tomcat/trunk/res/maven: README.txt mvn-pub.xml mvn.properties.default

[Mark Thomas]

On 20/04/2017 15:11, Violeta Georgieva wrote:



> Here the version is hardcoded
> Instead of
> 
> https://archive.apache.org/dist/maven/ant-tasks/2.1.3
> 
> it should be
> 
> https://archive.apache.org/dist/maven/ant-tasks/${maven-ant-tasks.version}

Thanks. Fixed.

Mark


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

Re: svn commit: r1792055 - in /tomcat/trunk/res/maven: README.txt mvn-pub.xml mvn.properties.default

[Violeta Georgieva]

Hi Mark,

2017-04-20 16:35 GMT+03:00 :
>
> Author: markt
> Date: Thu Apr 20 13:35:16 2017
> New Revision: 1792055
>
> URL: http://svn.apache.org/viewvc?rev=1792055=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=1792054=1792055=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=1792054=1792055=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 @@
>
>
>
> +
> +  
> +  
> +  
> +
> +
> uri="urn:maven-artifact-ant">
>
> -
> +
>
>  
>
> @@ -390,4 +396,27 @@
>  
>
>
> +  
> +
> +  
> + +  proxyuser="${proxy.user}"
proxypassword="${proxy.password}" />
> +
> +  
> +
> +  
> +
> +
> +  
> +
> +  
> +
> +
> +
> +
> +
> +
> +
> +  
> +
>  
>
> Modified: tomcat/trunk/res/maven/mvn.properties.default
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792055=1792054=1792055=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

Here the version is hardcoded
Instead of

https://archive.apache.org/dist/maven/ant-tasks/2.1.3

it should be

https://archive.apache.org/dist/maven/ant-tasks/${maven-ant-tasks.version}

Regards,
Violeta

>
+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
>

svn commit: r1792055 - in /tomcat/trunk/res/maven: README.txt mvn-pub.xml mvn.properties.default

[markt]

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

URL: http://svn.apache.org/viewvc?rev=1792055=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=1792054=1792055=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=1792054=1792055=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 @@
   
 
   
+
+  
+  
+  
+
+
 
   
-
+
   
 
   
@@ -390,4 +396,27 @@
 
   
 
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
 

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792055=1792054=1792055=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