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

SOLR-5159: Manifest includes non-parsed maven variables 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1514813 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2013-08-16 17:39:31 +00:00
parent 55142ef165
commit 6f6981a94e
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dev-tools/maven/pom.xml.template
View File

@ -600,23 +600,10 @@
<version>2.4</version> <version>2.4</version>
<configuration> <configuration>
<archive> <archive>
<!-- This section should be *exactly* the same under --> <manifest>
<!-- maven-jar-plugin and maven-war-plugin. --> <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
<!-- If you make changes here, make the same changes --> <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
<!-- in the other location as well. --> </manifest>
<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>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
@ -681,7 +668,7 @@
<configuration> <configuration>
<archive> <archive>
<!-- This section should be *exactly* the same under --> <!-- 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 --> <!-- If you make changes here, make the same changes -->
<!-- in the other location as well. --> <!-- in the other location as well. -->
<manifestEntries> <manifestEntries>
@ -694,6 +681,7 @@
<!-- impl version can be any string --> <!-- impl version can be any string -->
<Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version> <Implementation-Version>${project.version} ${svn.revision} - ${user.name} - ${now.timestamp}</Implementation-Version>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor> <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-Source-JDK>${java.compat.version}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK> <X-Compile-Target-JDK>${java.compat.version}</X-Compile-Target-JDK>
</manifestEntries> </manifestEntries>
@ -806,6 +794,23 @@
<configuration> <configuration>
<instructions> <instructions>
<Export-Package>*;-split-package:=merge-first</Export-Package> <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> </instructions>
</configuration> </configuration>
<executions> <executions>

5
lucene/CHANGES.txt
View File

@ -226,6 +226,11 @@ Changes in backwards compatibility policy
Analyzer. Closeable interface was removed because the class was changed to Analyzer. Closeable interface was removed because the class was changed to
be stateless. (Uwe Schindler, Robert Muir, Shay Banon) 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 ======================= ======================= Lucene 4.4.0 =======================
Changes in backwards compatibility policy Changes in backwards compatibility policy