2011/12/17  <jfcl...@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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to