fixed xml error

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@494304 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 0aad309..4105fb9 100644 (file)
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -15,7 +15,7 @@
   
   To do password less upload, you can modify either
   $MAVE_HOME/conf/settings.xml or ~/.m2/settings.xml and add this snippet
-    server>
+    <server>
       <id>apache.snapshots</id>
       <username>yourusername</username>
       <privateKey>/home/yourusername/.ssh/id_rsa</privateKey>
@@ -44,6 +44,7 @@
       <arg value="-DrepositoryId=${maven.repo.repositoryId}"/>
       <arg value="-Durl=${maven.repo.url}"/>
       <arg value="-DpomFile=${pom}.tmp"/>
+      <arg value="-Dmaven.scp.executable=${maven.scp.executable}"/>
     </exec>
     <delete file="${pom}.tmp"/>
   </target>

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 16c3cf7..1aba878 100644 (file)
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -6,3 +6,4 @@ maven.deploy.version=6.0.7-SNAPSHOT
 tomcat.lib.path=C:/development/tomcat/6.0/tc6.0.x/trunk/output/build/lib
 tomcat.bin.path=C:/development/tomcat/6.0/tc6.0.x/trunk/output/build/bin
 tomcat.pom.path=C:/development/tomcat/6.0/tc6.0.x/trunk/res/maven
+maven.scp.executable=c:/software/unix/usr/local/wbin/pscp.exe -i /home/fhanik/.ssh/id_rsa

diff --git a/res/maven/servlet-api.pom b/res/maven/servlet-api.pom
index c1a3ed9..23a2323 100644 (file)
--- a/res/maven/servlet-api.pom
+++ b/res/maven/servlet-api.pom
@@ -5,4 +5,3 @@
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>javax.servlet package</description>
 </project>
-s
\ No newline at end of file