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 2013/08/16 19:39:32 UTC
svn commit: r1514813 - in /lucene/dev/trunk:
dev-tools/maven/pom.xml.template lucene/CHANGES.txt
Author: sarowe
Date: Fri Aug 16 17:39:31 2013
New Revision: 1514813
URL: http://svn.apache.org/r1514813
Log:
SOLR-5159: Manifest includes non-parsed maven variables
Modified:
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/lucene/CHANGES.txt
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1514813&r1=1514812&r2=1514813&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Fri Aug 16 17:39:31 2013
@@ -600,23 +600,10 @@
<version>2.4</version>
<configuration>
<archive>
- <!-- This section should be *exactly* the same under -->
- <!-- maven-jar-plugin and maven-war-plugin. -->
- <!-- If you make changes here, make the same changes -->
- <!-- in the other location as well. -->
- <manifestEntries>
- <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-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>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <X-Compile-Source-JDK>${java.compat.version}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK>
- </manifestEntries>
+ <manifest>
+ <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+ </manifest>
</archive>
</configuration>
</plugin>
@@ -681,7 +668,7 @@
<configuration>
<archive>
<!-- This section should be *exactly* the same under -->
- <!-- maven-jar-plugin and maven-war-plugin. -->
+ <!-- maven-bundle-plugin and maven-war-plugin. -->
<!-- If you make changes here, make the same changes -->
<!-- in the other location as well. -->
<manifestEntries>
@@ -694,6 +681,7 @@
<!-- impl version can be any string -->
<Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
<X-Compile-Source-JDK>${java.compat.version}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK>
</manifestEntries>
@@ -806,6 +794,23 @@
<configuration>
<instructions>
<Export-Package>*;-split-package:=merge-first</Export-Package>
+
+ <!-- This section should be *exactly* the same under -->
+ <!-- maven-bundle-plugin and maven-war-plugin. -->
+ <!-- If you make changes here, make the same changes -->
+ <!-- in the other location as well. -->
+ <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-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>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
+ <X-Compile-Source-JDK>${java.compat.version}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK>
</instructions>
</configuration>
<executions>
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1514813&r1=1514812&r2=1514813&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Fri Aug 16 17:39:31 2013
@@ -225,6 +225,11 @@ Changes in backwards compatibility polic
* LUCENE-5170: Changed method signatures of Analyzer.ReuseStrategy to take
Analyzer. Closeable interface was removed because the class was changed to
be stateless. (Uwe Schindler, Robert Muir, Shay Banon)
+
+Build
+
+* SOLR-5159: Manifest includes non-parsed maven variables.
+ (Artem Karenko via Steve Rowe)
======================= Lucene 4.4.0 =======================