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 2014/02/21 23:47:52 UTC
svn commit: r1570738 - in /lucene/dev/trunk: lucene/CHANGES.txt
lucene/common-build.xml solr/common-build.xml
solr/contrib/map-reduce/build.xml
Author: sarowe
Date: Fri Feb 21 22:47:52 2014
New Revision: 1570738
URL: http://svn.apache.org/r1570738
Log:
LUCENE-5465: Solr Contrib map-reduce breaks Manifest of all other JAR files by adding a broken Main-Class attribute
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/solr/common-build.xml
lucene/dev/trunk/solr/contrib/map-reduce/build.xml
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1570738&r1=1570737&r2=1570738&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Fri Feb 21 22:47:52 2014
@@ -228,6 +228,10 @@ Build
* LUCENE-5411: Upgrade to released JFlex 1.5.0; stop requiring
a locally built JFlex snapshot jar. (Steve Rowe)
+* LUCENE-5465: Solr Contrib "map-reduce" breaks Manifest of all other
+ JAR files by adding a broken Main-Class attribute.
+ (Uwe Schindler, Steve Rowe)
+
Bug fixes
* LUCENE-5285: Improved highlighting of multi-valued fields with
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1570738&r1=1570737&r2=1570738&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Feb 21 22:47:52 2014
@@ -56,7 +56,7 @@
<property name="dev.version" value="${dev.version.base}-${dev.version.suffix}"/>
<property name="version" value="${dev.version}"/>
<property name="spec.version" value="${version}"/>
-
+
<property name="year" value="2000-${current.year}"/>
<!-- Lucene modules unfortunately don't have the "lucene-" prefix, so we add it if no prefix is given in $name: -->
@@ -576,6 +576,7 @@
<attribute name="implementation.title"/>
<attribute name="spec.version"/>
<attribute name="manifest.file" default="${manifest.file}"/>
+ <element name="additional-manifest-attributes" optional="true"/>
<sequential>
<!-- If possible, include the svnversion -->
<exec dir="." executable="${svnversion.exe}" outputproperty="svnversion" failifexecutionfails="false"/>
@@ -615,7 +616,7 @@
value="The Apache Software Foundation"/>
<attribute name="X-Compile-Source-JDK" value="${javac.source}"/>
<attribute name="X-Compile-Target-JDK" value="${javac.target}"/>
- <attribute name="Main-Class" value="${main.class}"/>
+ <additional-manifest-attributes />
</manifest>
</sequential>
</macrodef>
@@ -629,19 +630,24 @@
<attribute name="implementation.title" default="org.apache.lucene"/>
<attribute name="spec.version" default="${spec.version}"/>
<attribute name="manifest.file" default="${manifest.file}"/>
- <element name="nested" optional="true" implicit="true"/>
+ <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}"/>
+ manifest.file="@{manifest.file}">
+ <additional-manifest-attributes>
+ <jarify-additional-manifest-attributes />
+ </additional-manifest-attributes>
+ </build-manifest>
<jar destfile="@{destfile}"
basedir="@{basedir}"
manifest="@{manifest.file}"
excludes="@{excludes}">
<metainf dir="@{metainf.source.dir}" includes="LICENSE.txt,NOTICE.txt"/>
- <nested />
+ <filesets />
</jar>
</sequential>
</macrodef>
@@ -1400,7 +1406,9 @@ ${tests-output}/junit4-*.suites - pe
<sequential>
<mkdir dir="${build.dir}" />
<jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
- <fileset dir="${resources.dir}" erroronmissingdir="no"/>
+ <filesets>
+ <fileset dir="${resources.dir}" erroronmissingdir="no"/>
+ </filesets>
</jarify>
</sequential>
</target>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1570738&r1=1570737&r2=1570738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Fri Feb 21 22:47:52 2014
@@ -202,7 +202,8 @@
<attribute name="implementation.title" default="org.apache.solr"/>
<attribute name="spec.version" default="${spec.version}"/>
<attribute name="manifest.file" default="${manifest.file}"/>
- <element name="nested" optional="true" implicit="true"/>
+ <element name="solr-jarify-filesets" optional="true"/>
+ <element name="solr-jarify-additional-manifest-attributes" optional="true"/>
<sequential>
<jarify basedir="@{basedir}" destfile="@{destfile}"
title="@{title}" excludes="@{excludes}"
@@ -210,7 +211,12 @@
implementation.title="@{implementation.title}"
spec.version="@{spec.version}"
manifest.file="@{manifest.file}">
- <nested/>
+ <filesets>
+ <solr-jarify-filesets />
+ </filesets>
+ <jarify-additional-manifest-attributes>
+ <solr-jarify-additional-manifest-attributes />
+ </jarify-additional-manifest-attributes>
</jarify>
</sequential>
</macrodef>
@@ -331,7 +337,9 @@
<sequential>
<mkdir dir="${build.dir}"/>
<solr-jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
- <fileset dir="${resources.dir}" erroronmissingdir="no"/>
+ <solr-jarify-filesets>
+ <fileset dir="${resources.dir}" erroronmissingdir="no"/>
+ </solr-jarify-filesets>
</solr-jarify>
</sequential>
</target>
Modified: lucene/dev/trunk/solr/contrib/map-reduce/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/map-reduce/build.xml?rev=1570738&r1=1570737&r2=1570738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/map-reduce/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/map-reduce/build.xml Fri Feb 21 22:47:52 2014
@@ -27,9 +27,7 @@
<import file="../contrib-build.xml"/>
- <property name="main.class" value="org.apache.solr.hadoop.MapReduceIndexerTool" />
-
- <solr-contrib-uptodate name="extraction"
+ <solr-contrib-uptodate name="extraction"
property="solr-extraction.uptodate"
classpath.property="solr-cell.jar"/>
@@ -143,6 +141,16 @@
</target>
<target name="compile-core" depends="resolve-extraction-libs, resolve-morphlines-core-libs, resolve-morphlines-cell-libs, compile-solr-extraction, compile-morphlines-core, compile-morphlines-cell, solr-contrib-build.compile-core"/>
+
+ <property name="main.class" value="org.apache.solr.hadoop.MapReduceIndexerTool" />
+ <target name="jar-core" depends="compile-core">
+ <solr-jarify>
+ <solr-jarify-additional-manifest-attributes>
+ <attribute name="Main-Class" value="${main.class}"/>
+ </solr-jarify-additional-manifest-attributes>
+ </solr-jarify>
+ </target>
+
<target name="dist" depends="common-solr.dist"/>
</project>