You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2011/12/17 20:02:31 UTC
svn commit: r1215557 - in /tomcat/tc6.0.x/trunk/res/maven: README.txt
mvn-pub.xml mvn.properties.default
Author: jfclere
Date: Sat Dec 17 19:02:31 2011
New Revision: 1215557
URL: http://svn.apache.org/viewvc?rev=1215557&view=rev
Log:
Fix the deploy-release task.
Once done you should have an entry in https://repository.apache.org/index.html#stagingRepositories
Check it and click Close.
Once the release is voted just click Release.
If any wrong just click Drop.
Added:
tomcat/tc6.0.x/trunk/res/maven/README.txt
Modified:
tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
Added: tomcat/tc6.0.x/trunk/res/maven/README.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/README.txt?rev=1215557&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/README.txt (added)
+++ tomcat/tc6.0.x/trunk/res/maven/README.txt Sat Dec 17 19:02:31 2011
@@ -0,0 +1,6 @@
+To release do the following:
+1 - copy mvn.properties.default to mvn.propertie and adjust it.
+2 - ant -f mvn-pub.xml deploy-release
+ that step creates a staging in https://repository.apache.org/index.html#stagingRepositories
+3 - test it and do the vote process
+4 - in https://repository.apache.org/index.html#stagingRepositories close it and then promote it.
Modified: tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml?rev=1215557&r1=1215556&r2=1215557&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml Sat Dec 17 19:02:31 2011
@@ -68,6 +68,29 @@
<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-6"/>
</target>
+ <target name="maven-deploy-nexus" depends="init-maven" if="nexus.set">
+ <!--deploy it in nexus -->
+ <artifact:deploy file="${file}">
+ <pom file="${pom}"/>
+ <remoteRepository url="${maven.repo.url}" layout="default">
+ <authentication username="${maven.username}" password="${maven.password}"/>
+ </remoteRepository>
+ <attach file="${file}.asc" type="jar.asc"/>
+ </artifact:deploy>
+ </target>
+
+ <target name="maven-deploy-other" depends="init-maven" unless="nexus.set">
+ <!--deploy it in nexus -->
+ <artifact:deploy file="${file}">
+ <pom file="${pom}"/>
+ <remoteRepository url="${maven.repo.url}" layout="default">
+ <authentication username="${maven.scp.username}" privateKey="${maven.scp.privateKey}" passphrase="${maven.scp.passphrase}"/>
+ <authentication username="${maven.username}" password="${maven.password}"/>
+ </remoteRepository>
+ <attach file="${file}.asc" type="jar.asc"/>
+ </artifact:deploy>
+ </target>
+
<target name="maven-deploy" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
@@ -90,13 +113,14 @@
</exec>
<!--deploy it-->
- <artifact:deploy file="${file}">
- <pom file="${pom}.tmp"/>
- <remoteRepository url="${maven.repo.url}" layout="default">
- <authentication username="${maven.scp.username}" privateKey="${maven.scp.privateKey}" passphrase="${maven.scp.passphrase}"/>
- </remoteRepository>
- <attach file="${file}.asc" type="jar.asc"/>
- </artifact:deploy>
+ <antcall target="maven-deploy-nexus">
+ <param name="file" value="${file}"/>
+ <param name="pom" value="${pom}.tmp"/>
+ </antcall>
+ <antcall target="maven-deploy-other">
+ <param name="file" value="${file}"/>
+ <param name="pom" value="${pom}.tmp"/>
+ </antcall>
<!--
<exec executable="${maven.home}/bin/${maven.bin}" failonerror="true">
@@ -175,6 +199,7 @@
</target>
<target name="deploy-release">
+ <property name="nexus.set" value="true"/>
<antcall target="generic-deploy">
<param name="maven.repo.repositoryId" value="${maven.asf.release.repo.repositoryId}"/>
<param name="maven.repo.url" value="${maven.asf.release.repo.url}"/>
Modified: tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default?rev=1215557&r1=1215556&r2=1215557&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Sat Dec 17 19:02:31 2011
@@ -23,6 +23,8 @@
tomcat.version=6.0.20
#Maven properties
+maven.username=<!-- YOUR APACHE LDAP USERNAME -->
+maven.password=<!-- YOUR APACHE LDAP PASSWORD -->
maven.scp.username=fhanik
maven.scp.privateKey=${user.home}/.ssh/id_dsa
maven.scp.passphrase=
@@ -44,8 +46,8 @@ maven.release.repo.url=scp://people.apac
maven.release.repo.repositoryId=tomcat-staging
maven.release.deploy.version=${tomcat.version}
-#Maven release properties for the main ASF repo
-maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
+#Maven release properties for the main ASF repo (staging in nexus)
+maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2
maven.asf.release.repo.repositoryId=apache.releases
maven.asf.release.deploy.version=${tomcat.version}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1215557 - in /tomcat/tc6.0.x/trunk/res/maven: README.txt
mvn-pub.xml mvn.properties.default
Posted by jean-frederic clere <jf...@gmail.com>.
On 12/17/2011 11:05 PM, Konstantin Kolinko wrote:
> 2011/12/17<jf...@apache.org>:
>> Author: jfclere
>> Date: Sat Dec 17 19:02:31 2011
>> New Revision: 1215557
>>
>> URL: http://svn.apache.org/viewvc?rev=1215557&view=rev
>> Log:
>> Fix the deploy-release task.
>> Once done you should have an entry in https://repository.apache.org/index.html#stagingRepositories
>> Check it and click Close.
>> Once the release is voted just click Release.
>> If any wrong just click Drop.
>>
>> Added:
>> tomcat/tc6.0.x/trunk/res/maven/README.txt
>> Modified:
>> tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
>> tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
>>
>> Added: tomcat/tc6.0.x/trunk/res/maven/README.txt
>> URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/README.txt?rev=1215557&view=auto
>> ==============================================================================
>> --- tomcat/tc6.0.x/trunk/res/maven/README.txt (added)
>> +++ tomcat/tc6.0.x/trunk/res/maven/README.txt Sat Dec 17 19:02:31 2011
>> @@ -0,0 +1,6 @@
>> +To release do the following:
>> +1 - copy mvn.properties.default to mvn.propertie and adjust it.
>> +2 - ant -f mvn-pub.xml deploy-release
>> + that step creates a staging in https://repository.apache.org/index.html#stagingRepositories
>> +3 - test it and do the vote process
>> +4 - in https://repository.apache.org/index.html#stagingRepositories close it and then promote it.
>
>
> Note that
> 1) there is also a big comment at the top of mvn-pub.xml.
I have arranged it.
> 2) ASL header is needed? Nobody checks it in 6.0 but in thunk
> checkstyle would complain on such a file, I think.
Fixed.
>
>>
>> Modified: tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
> (...)
>
> Looks good.
>
>> --- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
>> +++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Sat Dec 17 19:02:31 2011
>> @@ -23,6 +23,8 @@
>> tomcat.version=6.0.20
>
> Can update the above sometime :)
>
>>
>> #Maven properties
>> +maven.username=<!-- YOUR APACHE LDAP USERNAME -->
>> +maven.password=<!-- YOUR APACHE LDAP PASSWORD -->
>
>
> Regarding plaintext passwords in config files:
> There is simple workaround: use<input> Ant task.
>
> 1. Remove maven.password from maven.properties.default
>
> 2. Add
> <input addproperty="maven.password" message="Your LDAP password for
> ${maven.user}" />
>
> Probably that goes into init-maven so that it executes only once.
>
> As docs say
> [[[
> Since Apache Ant 1.6,<input> will not prompt for input if a property
> should be set by the task that has already been set in the project
> (and the task wouldn't have any effect).
> ]]]
I will for trunk to do it ;-)
Cheers
Jean-Frederic
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1215557 - in /tomcat/tc6.0.x/trunk/res/maven:
README.txt mvn-pub.xml mvn.properties.default
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/12/17 <jf...@apache.org>:
> Author: jfclere
> Date: Sat Dec 17 19:02:31 2011
> New Revision: 1215557
>
> URL: http://svn.apache.org/viewvc?rev=1215557&view=rev
> Log:
> Fix the deploy-release task.
> Once done you should have an entry in https://repository.apache.org/index.html#stagingRepositories
> Check it and click Close.
> Once the release is voted just click Release.
> If any wrong just click Drop.
>
> Added:
> tomcat/tc6.0.x/trunk/res/maven/README.txt
> Modified:
> tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
> tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
>
> Added: tomcat/tc6.0.x/trunk/res/maven/README.txt
> URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/README.txt?rev=1215557&view=auto
> ==============================================================================
> --- tomcat/tc6.0.x/trunk/res/maven/README.txt (added)
> +++ tomcat/tc6.0.x/trunk/res/maven/README.txt Sat Dec 17 19:02:31 2011
> @@ -0,0 +1,6 @@
> +To release do the following:
> +1 - copy mvn.properties.default to mvn.propertie and adjust it.
> +2 - ant -f mvn-pub.xml deploy-release
> + that step creates a staging in https://repository.apache.org/index.html#stagingRepositories
> +3 - test it and do the vote process
> +4 - in https://repository.apache.org/index.html#stagingRepositories close it and then promote it.
Note that
1) there is also a big comment at the top of mvn-pub.xml.
2) ASL header is needed? Nobody checks it in 6.0 but in thunk
checkstyle would complain on such a file, I think.
>
> Modified: tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
(...)
Looks good.
> --- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
> +++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Sat Dec 17 19:02:31 2011
> @@ -23,6 +23,8 @@
> tomcat.version=6.0.20
Can update the above sometime :)
>
> #Maven properties
> +maven.username=<!-- YOUR APACHE LDAP USERNAME -->
> +maven.password=<!-- YOUR APACHE LDAP PASSWORD -->
Regarding plaintext passwords in config files:
There is simple workaround: use <input> Ant task.
1. Remove maven.password from maven.properties.default
2. Add
<input addproperty="maven.password" message="Your LDAP password for
${maven.user}" />
Probably that goes into init-maven so that it executes only once.
As docs say
[[[
Since Apache Ant 1.6, <input> will not prompt for input if a property
should be set by the task that has already been set in the project
(and the task wouldn't have any effect).
]]]
> maven.scp.username=fhanik
> maven.scp.privateKey=${user.home}/.ssh/id_dsa
> maven.scp.passphrase=
> @@ -44,8 +46,8 @@ maven.release.repo.url=scp://people.apac
> maven.release.repo.repositoryId=tomcat-staging
> maven.release.deploy.version=${tomcat.version}
>
> -#Maven release properties for the main ASF repo
> -maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
> +#Maven release properties for the main ASF repo (staging in nexus)
> +maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2
> maven.asf.release.repo.repositoryId=apache.releases
> maven.asf.release.deploy.version=${tomcat.version}
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org