Author: kkolinko
Date: Sat Jun 23 09:46:50 2012
New Revision: 1353103
URL: http://svn.apache.org/viewvc?rev=1353103&view=rev
Log:
Review of r1352650
svn:eol-style native for README.txt
Correct typos in changelog.
Modified:
tomcat/tc6.0.x/trunk/res/maven/README.txt (contents, props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: 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=1353103&r1=1353102&r2=1353103&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/README.txt (original)
+++ tomcat/tc6.0.x/trunk/res/maven/README.txt Sat Jun 23 09:46:50 2012
@@ -1,41 +1,41 @@
-================================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-================================================================================
-
-$Id$
-
-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 (see BUILDING.txt)
-3 - 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
- GPG pass-phrase and LDAP password when the script runs.
-
-To publish a snapshot do the following:
-1 - ant -f mvn-pub.xml deploy-snapshot
- This populates
-
https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/
-
-To release do the following:
-1 - ant -f mvn-pub.xml deploy-release
- that step creates a staging area in
- https://repository.apache.org/index.html#stagingRepositories
-2 - check the upload and then close the repository
-3 - include the repository in the VOTE thread
-4 - in https://repository.apache.org/index.html#stagingRepositories release it
+================================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+================================================================================
+
+$Id$
+
+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 (see BUILDING.txt)
+3 - 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
+ GPG pass-phrase and LDAP password when the script runs.
+
+To publish a snapshot do the following:
+1 - ant -f mvn-pub.xml deploy-snapshot
+ This populates
+
https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/
+
+To release do the following:
+1 - ant -f mvn-pub.xml deploy-release
+ that step creates a staging area in
+ https://repository.apache.org/index.html#stagingRepositories
+2 - check the upload and then close the repository
+3 - include the repository in the VOTE thread
+4 - in https://repository.apache.org/index.html#stagingRepositories release it
Propchange: tomcat/tc6.0.x/trunk/res/maven/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1353103&r1=1353102&r2=1353103&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jun 23 09:46:50 2012
@@ -277,8 +277,9 @@
Improve <code>RUNNING.txt</code>. (kkolinko)
</update>
<update>
- Align the Maven deploy script with the Tomact 7 verison, making full
use
- of Nexus. (markt)
+ Align the script that deploys Maven jars for Tomcat
+ (<code>res/maven/mvn-pub.xml</code>) with the Tomcat 7 version,
+ making full use of Nexus. (markt)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
