You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/03/13 03:30:51 UTC
svn commit: r1081032 - in /lucene/dev/branches/lucene_solr_3_1: ./ lucene/
solr/ solr/build.xml solr/common-build.xml
Author: sarowe
Date: Sun Mar 13 02:30:51 2011
New Revision: 1081032
URL: http://svn.apache.org/viewvc?rev=1081032&view=rev
Log:
Drop separate maven_version, no longer required since maven version and ant build version are the same
Modified:
lucene/dev/branches/lucene_solr_3_1/ (props changed)
lucene/dev/branches/lucene_solr_3_1/lucene/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/build.xml
lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1081032&r1=1081031&r2=1081032&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Sun Mar 13 02:30:51 2011
@@ -969,7 +969,7 @@
<sign-maven-artifacts artifact.id="solr-solrj" gpg.passphrase="${gpg.passphrase}"/>
<!-- These are special since there are no jars, just poms -->
- <sign-artifact input.file="${maven.dist.prefix}/solr-parent/${maven_version}/solr-parent-${maven_version}.pom" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
</target>
<target name="prepare-release" depends="clean, generate-maven-artifacts, package"
Modified: lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml?rev=1081032&r1=1081031&r2=1081032&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml Sun Mar 13 02:30:51 2011
@@ -442,34 +442,31 @@
<macrodef name="sign-maven-artifacts" description="Signs maven artifacts">
<attribute name="artifact.id"/>
<attribute name="prefix.dir" default="${maven.dist.prefix}"/>
- <attribute name="maven.version" default="${maven_version}"/>
<attribute name="gpg.passphrase"/>
<sequential>
- <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.jar" gpg.passphrase="@{gpg.passphrase}"/>
- <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}-javadoc.jar" gpg.passphrase="@{gpg.passphrase}"/>
- <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}-sources.jar" gpg.passphrase="@{gpg.passphrase}"/>
- <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.pom" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/${version}/@{artifact.id}-${version}.jar" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/${version}/@{artifact.id}-${version}-javadoc.jar" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/${version}/@{artifact.id}-${version}-sources.jar" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/${version}/@{artifact.id}-${version}.pom" gpg.passphrase="@{gpg.passphrase}"/>
</sequential>
</macrodef>
<macrodef name="sign-maven-war-artifacts" description="Signs the Solr .war artifact">
<attribute name="artifact.id"/>
<attribute name="prefix.dir" default="${maven.dist.prefix}"/>
- <attribute name="maven.version" default="${version}"/>
<attribute name="gpg.passphrase"/>
<sequential>
- <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.war" gpg.passphrase="@{gpg.passphrase}"/>
- <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.pom" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/${version}/@{artifact.id}-${version}.war" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/${version}/@{artifact.id}-${version}.pom" gpg.passphrase="@{gpg.passphrase}"/>
</sequential>
</macrodef>
<macrodef name="sign-maven-dependency-artifacts" description="Signs maven artifacts">
<attribute name="artifact.id"/>
<attribute name="prefix.dir" default="${maven.dist.prefix}"/>
- <attribute name="maven.version" default="${maven_version}"/>
<attribute name="gpg.passphrase"/>
<sequential>
- <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.jar" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/${version}/@{artifact.id}-${version}.jar" gpg.passphrase="@{gpg.passphrase}"/>
</sequential>
</macrodef>