You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/04/09 15:53:17 UTC
svn commit: r1466033 - in /lucene/dev/branches/branch_4x: ./
dev-tools/scripts/smokeTestRelease.py solr/ solr/common-build.xml
solr/webapp/ solr/webapp/build.xml
Author: rmuir
Date: Tue Apr 9 13:53:17 2013
New Revision: 1466033
URL: http://svn.apache.org/r1466033
Log:
SOLR-4677: Improve Solrs use of spec version
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/build.xml
Modified: lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py?rev=1466033&r1=1466032&r2=1466033&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py Tue Apr 9 13:53:17 2013
@@ -190,12 +190,16 @@ def checkJARMetaData(desc, jarFile, vers
s = decodeUTF8(z.read(MANIFEST_FILE_NAME))
for verify in (
+ 'Specification-Vendor: The Apache Software Foundation',
'Implementation-Vendor: The Apache Software Foundation',
# Make sure 1.6 compiler was used to build release bits:
'X-Compile-Source-JDK: 1.6',
+ # Make sure 1.8 ant was used to build release bits: (this will match 1.8+)
+ 'Ant-Version: Apache Ant 1.8',
# Make sure .class files are 1.6 format:
'X-Compile-Target-JDK: 1.6',
# Make sure this matches the version we think we are releasing:
+ 'Implementation-Version: %s' % version,
'Specification-Version: %s' % version,
# Make sure the release was compiled with 1.6:
'Created-By: 1.6'):
Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1466033&r1=1466032&r2=1466033&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Tue Apr 9 13:53:17 2013
@@ -58,16 +58,6 @@
<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
</path>
- <!-- Solr Specification Version
-
- This will be used in the Manifest file, and therefore must
- match the pattern "digit+{.digit+}*"
-
- By default, this should be set to "X.Y.M.${dateversion}"
- where X.Y.M is the last version released (on this branch).
- -->
- <property name="solr.spec.version" value="4.3.0.${dateversion}" />
-
<!-- defined here to be able to make the forbidden-api checker correctly
reference it. 'ivy.xml' is also referencing this property. -->
<property name="commons-io.version" value="2.1" />
@@ -169,7 +159,7 @@
<attribute name="excludes" default="**/pom.xml,**/*.iml"/>
<attribute name="metainf.source.dir" default="${common-solr.dir}"/>
<attribute name="implementation.title" default="org.apache.solr"/>
- <attribute name="spec.version" default="${solr.spec.version}"/>
+ <attribute name="spec.version" default="${spec.version}"/>
<attribute name="manifest.file" default="${manifest.file}"/>
<element name="nested" optional="true" implicit="true"/>
<sequential>
Modified: lucene/dev/branches/branch_4x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/build.xml?rev=1466033&r1=1466032&r2=1466033&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/build.xml Tue Apr 9 13:53:17 2013
@@ -42,7 +42,7 @@
depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr">
<build-manifest title="Apache Solr Search Server"
implementation.title="org.apache.solr"
- spec.version="${solr.spec.version}"/>
+ spec.version="${spec.version}"/>
<ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/>
<war destfile="${dist}/solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml"