Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4677: Improve Solrs use of spec version 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1466031 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2013-04-09 13:51:01 +00:00
parent 37a6474a8f
commit a6c5fe9f3a
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-tools/scripts/smokeTestRelease.py
View File

@ -182,12 +182,16 @@ def checkJARMetaData(desc, jarFile, version):
s = decodeUTF8(z.read(MANIFEST_FILE_NAME)) s = decodeUTF8(z.read(MANIFEST_FILE_NAME))
for verify in ( for verify in (
'Specification-Vendor: The Apache Software Foundation',
'Implementation-Vendor: The Apache Software Foundation', 'Implementation-Vendor: The Apache Software Foundation',
# Make sure 1.7 compiler was used to build release bits: # Make sure 1.7 compiler was used to build release bits:
'X-Compile-Source-JDK: 1.7', 'X-Compile-Source-JDK: 1.7',
# 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.7 format: # Make sure .class files are 1.7 format:
'X-Compile-Target-JDK: 1.7', 'X-Compile-Target-JDK: 1.7',
# Make sure this matches the version we think we are releasing: # Make sure this matches the version we think we are releasing:
'Implementation-Version: %s' % version,
'Specification-Version: %s' % version, 'Specification-Version: %s' % version,
# Make sure the release was compiled with 1.7: # Make sure the release was compiled with 1.7:
'Created-By: 1.7'): 'Created-By: 1.7'):

12
solr/common-build.xml
View File

@ -58,16 +58,6 @@
<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/> <fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
</path> </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="5.0.0.${dateversion}" />
<!-- defined here to be able to make the forbidden-api checker correctly <!-- defined here to be able to make the forbidden-api checker correctly
reference it. 'ivy.xml' is also referencing this property. --> reference it. 'ivy.xml' is also referencing this property. -->
<property name="commons-io.version" value="2.1" /> <property name="commons-io.version" value="2.1" />
@ -169,7 +159,7 @@
<attribute name="excludes" default="**/pom.xml,**/*.iml"/> <attribute name="excludes" default="**/pom.xml,**/*.iml"/>
<attribute name="metainf.source.dir" default="${common-solr.dir}"/> <attribute name="metainf.source.dir" default="${common-solr.dir}"/>
<attribute name="implementation.title" default="org.apache.solr"/> <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}"/> <attribute name="manifest.file" default="${manifest.file}"/>
<element name="nested" optional="true" implicit="true"/> <element name="nested" optional="true" implicit="true"/>
<sequential> <sequential>

2
solr/webapp/build.xml
View File

@ -42,7 +42,7 @@
depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr"> depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr">
<build-manifest title="Apache Solr Search Server" <build-manifest title="Apache Solr Search Server"
implementation.title="org.apache.solr" 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"/> <ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/>
<war destfile="${dist}/solr-${version}${solr.war.suffix}.war" <war destfile="${dist}/solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml" webxml="web/WEB-INF/web.xml"