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/18 11:35:40 UTC

svn commit: r1220362 - in /tomcat/tc6.0.x/trunk/res/maven: README.txt mvn-pub.xml

Author: jfclere
Date: Sun Dec 18 10:35:39 2011
New Revision: 1220362

URL: http://svn.apache.org/viewvc?rev=1220362&view=rev
Log:
Arrange docs.

Modified:
    tomcat/tc6.0.x/trunk/res/maven/README.txt   (contents, props changed)
    tomcat/tc6.0.x/trunk/res/maven/mvn-pub.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=1220362&r1=1220361&r2=1220362&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/README.txt (original)
+++ tomcat/tc6.0.x/trunk/res/maven/README.txt Sun Dec 18 10:35:39 2011
@@ -1,3 +1,21 @@
+================================================================================
+  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$
 To release do the following:
 1 - copy mvn.properties.default to mvn.propertie and adjust it.
 2 - ant -f mvn-pub.xml deploy-release

Propchange: tomcat/tc6.0.x/trunk/res/maven/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id

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=1220362&r1=1220361&r2=1220362&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml Sun Dec 18 10:35:39 2011
@@ -35,14 +35,11 @@
   tomcat.pom.path - the path to the POM files
   All these can be defined by mvn.properties (and defaults are in mvn.properties.default)
   
-  To do password less upload, you can modify either
-  $MAVE_HOME/conf/settings.xml or ~/.m2/settings.xml and add this snippet
-    <server>
-      <id>apache.snapshots</id>
-      <username>yourusername</username>
-      <privateKey>/home/yourusername/.ssh/id_rsa</privateKey>
-      <passphrase></passphrase>
-    </server>
+  To do password less upload, you'll also need to set
+  maven.username        - YOUR APACHE LDAP USERNAME (ASF ID normally).
+  maven.password        - YOUR APACHE LDAP PASSWORD
+  maven.scp.username    - Your ASF ID
+  maven.scp.privateKey  - Path to your exported ssh key
     
   To get a private key to work on Windows, I followed these steps
   1. on a linux box execute 'ssh-keygen -t rsa'



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