svn commit: r1296634 - /lucene/dev/branches/branch_3x/lucene/common-build.xml

[sa...@apache.org]

Author: sarowe
Date: Sat Mar  3 15:10:48 2012
New Revision: 1296634

URL: http://svn.apache.org/viewvc?rev=1296634&view=rev
Log:
LUCENE-3825: generate-maven-artifacts: when deploying, pull remote server authentication from ~/.m2/settings.xml instead of through system properties

Modified:
    lucene/dev/branches/branch_3x/lucene/common-build.xml

Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1296634&r1=1296633&r2=1296634&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Sat Mar  3 15:10:48 2012
@@ -342,9 +342,7 @@
       <artifact:pom id="maven.project" file="@{pom.xml}"/>
       <artifact:deploy file="@{jar.file}">
         <artifact-attachments/>
-      	<remoteRepository url="${m2.repository.url}">
-          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}" password="${m2.repository.password}"/>
-        </remoteRepository>
+      	<remoteRepository id="${m2.repository.id}" url="${m2.repository.url}"/>
         <pom refid="maven.project"/>
       </artifact:deploy>
     </sequential>
@@ -365,9 +363,7 @@
       <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
       <artifact:pom id="maven.project" file="${maven.build.dir}/pom.xml" />
       <artifact:deploy file="@{jar.file}">
-        <remoteRepository url="${m2.repository.url}">
-          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}" password="${m2.repository.password}"/>
-        </remoteRepository>
+        <remoteRepository id="${m2.repository.id}" url="${m2.repository.url}"/>
         <pom refid="maven.project"/>
       </artifact:deploy>
     </sequential>
@@ -457,7 +453,6 @@
     </uptodate>
   </target>
   <target name="jar-lucene-core" unless="lucene-core.uptodate" depends="check-lucene-core-uptodate">
-    <echo>Got here #3</echo>
     <ant dir="${common.dir}/core" target="jar-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>