You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/08/22 17:17:54 UTC
svn commit: r1619834 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/maven/pom.xml.template lucene/ lucene/common-build.xml solr/
solr/common-build.xml solr/webapp/ solr/webapp/build.xml
Author: uschindler
Date: Fri Aug 22 15:17:53 2014
New Revision: 1619834
URL: http://svn.apache.org/r1619834
Log:
Merged revision(s) 1619832 from lucene/dev/trunk:
LUCENE-5898: Clean up build files version handling, fix bug with specification version
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
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/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1619834&r1=1619833&r2=1619834&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Fri Aug 22 15:17:53 2014
@@ -41,7 +41,7 @@
<vc-anonymous-base-url>http://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x</vc-anonymous-base-url>
<vc-dev-base-url>https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x</vc-dev-base-url>
<vc-browse-base-url>http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x</vc-browse-base-url>
- <base.specification.version>4.11.0</base.specification.version>
+ <specification.version>@spec.version@</specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.7</java.compat.version>
<jetty.version>8.1.10.v20130312</jetty.version>
@@ -58,7 +58,7 @@
<tests.codec>random</tests.codec>
<tests.directory>random</tests.directory>
<tests.locale>random</tests.locale>
- <tests.luceneMatchVersion>4.11.0</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>@version.base@</tests.luceneMatchVersion>
<tests.multiplier>1</tests.multiplier>
<tests.nightly>false</tests.nightly>
<tests.postingsformat>random</tests.postingsformat>
@@ -289,8 +289,7 @@
<Extension-Name>${project.groupId}</Extension-Name>
<Implementation-Title>${project.groupId}</Implementation-Title>
<Specification-Title>${project.name}</Specification-Title>
- <!-- spec version must match "digit+{.digit+}*" -->
- <Specification-Version>${base.specification.version}.${now.version}</Specification-Version>
+ <Specification-Version>${specification.version}</Specification-Version>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
<!-- impl version can be any string -->
<Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version>
@@ -416,8 +415,7 @@
<Extension-Name>${project.groupId}</Extension-Name>
<Implementation-Title>${project.groupId}</Implementation-Title>
<Specification-Title>${project.name}</Specification-Title>
- <!-- spec version must match "digit+{.digit+}*" -->
- <Specification-Version>${base.specification.version}.${now.version}</Specification-Version>
+ <Specification-Version>${specification.version}</Specification-Version>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
<!-- impl version can be any string -->
<Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version>
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1619834&r1=1619833&r2=1619834&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Fri Aug 22 15:17:53 2014
@@ -62,6 +62,9 @@
<!-- Suffix of the version, by default SNAPSHOT: -->
<property name="version.suffix" value="${dev.version.suffix}"/>
<property name="version" value="${version.base}-${version.suffix}"/>
+
+ <!-- must be in format x.y with only digits, so we use version.base: -->
+ <property name="spec.version" value="${version.base}"/>
<fail message="If you pass -Dversion=... to set a release version, it must match "${version.base}", optionally followed by a suffix (e.g., "-SNAPSHOT").">
@@ -630,7 +633,6 @@
<macrodef name="build-manifest" description="Builds a manifest file">
<attribute name="title"/>
<attribute name="implementation.title"/>
- <attribute name="spec.version"/>
<attribute name="manifest.file" default="${manifest.file}"/>
<element name="additional-manifest-attributes" optional="true"/>
<sequential>
@@ -661,7 +663,7 @@
<attribute name="Extension-Name" value="@{implementation.title}"/>
<attribute name="Specification-Title" value="@{title}"/>
<!-- spec version must match "digit+{.digit+}*" -->
- <attribute name="Specification-Version" value="@{spec.version}"/>
+ <attribute name="Specification-Version" value="${spec.version}"/>
<attribute name="Specification-Vendor"
value="The Apache Software Foundation"/>
<attribute name="Implementation-Title" value="@{implementation.title}"/>
@@ -684,14 +686,12 @@
<attribute name="excludes" default="**/pom.xml,**/*.iml"/>
<attribute name="metainf.source.dir" default="${common.dir}"/>
<attribute name="implementation.title" default="org.apache.lucene"/>
- <attribute name="spec.version" default="${version}"/>
<attribute name="manifest.file" default="${manifest.file}"/>
<element name="filesets" optional="true"/>
<element name="jarify-additional-manifest-attributes" optional="true"/>
<sequential>
<build-manifest title="@{title}"
implementation.title="@{implementation.title}"
- spec.version="@{spec.version}"
manifest.file="@{manifest.file}">
<additional-manifest-attributes>
<jarify-additional-manifest-attributes />
@@ -1652,6 +1652,8 @@ ${ant.project.name}.test.dependencies=${
<fileset dir="${common.dir}/../dev-tools/maven"/>
<filterset begintoken="@" endtoken="@">
<filter token="version" value="${version}"/>
+ <filter token="version.base" value="${version.base}"/>
+ <filter token="spec.version" value="${spec.version}"/>
</filterset>
<filterset>
<filtersfile file="${maven.dependencies.filters.file}"/>
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=1619834&r1=1619833&r2=1619834&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Fri Aug 22 15:17:53 2014
@@ -200,7 +200,6 @@
<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="${version}"/>
<attribute name="manifest.file" default="${manifest.file}"/>
<element name="solr-jarify-filesets" optional="true"/>
<element name="solr-jarify-additional-manifest-attributes" optional="true"/>
@@ -209,7 +208,6 @@
title="@{title}" excludes="@{excludes}"
metainf.source.dir="@{metainf.source.dir}"
implementation.title="@{implementation.title}"
- spec.version="@{spec.version}"
manifest.file="@{manifest.file}">
<filesets>
<solr-jarify-filesets />
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=1619834&r1=1619833&r2=1619834&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/build.xml Fri Aug 22 15:17:53 2014
@@ -44,8 +44,7 @@
description="Creates the Solr WAR Distribution file."
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="${version}"/>
+ implementation.title="org.apache.solr"/>
<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"