Correct the manifest for the annotations-api.jar. The JAR implements the Common Annotations API 1.2 and the manifest should
reflect that.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1832272 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 8d566be..7ed2068 100644
--- a/build.xml
+++ b/build.xml
@@ -48,6 +48,8 @@
<property name="jsp.revision" value="FR" />
<property name="el.revision" value="FR" />
<property name="websocket.revision" value="FR" />
+ <!-- MR 2 but this was first 1.2 release so use FR -->
+ <property name="annotation.revision" value="FR" />
<!-- Release artifact base names -->
<property name="final.name" value="${project}-${version}" />
@@ -689,8 +691,6 @@
</target>
-
-
<target name="build-manifests" unless="manifests.uptodate"
depends="build-prepare">
<!-- Filtering tokens for JAR manifests-->
@@ -700,6 +700,7 @@
<filter token="jsp.revision" value="${jsp.revision}"/>
<filter token="el.revision" value="${el.revision}"/>
<filter token="websocket.revision" value="${websocket.revision}"/>
+ <filter token="annotation.revision" value="${annotation.revision}"/>
<mkdir dir="${tomcat.manifests}" />
<copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
@@ -711,7 +712,7 @@
</target>
<target name="package" depends="compile,build-manifests" >
- <!-- Common Annotations 1.0 JAR File -->
+ <!-- Common Annotations 1.2 JAR File -->
<jarIt jarfile="${annotations-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.annotations-api"
@@ -2636,7 +2637,7 @@
<mkdir dir="${tomcat.src.jars}" />
- <!-- Common Annotations 1.0 JAR File -->
+ <!-- Common Annotations 1.2 JAR File -->
<jarIt jarfile="${annotations-api-src.jar}"
filesDir="java"
filesId="files.annotations-api"
diff --git a/res/META-INF/annotations-api.jar.manifest b/res/META-INF/annotations-api.jar.manifest
index 7afab0d..46dc6b2 100644
--- a/res/META-INF/annotations-api.jar.manifest
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -2,10 +2,10 @@
X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
-Name: javax/servlet/
-Specification-Title: Java API for Servlets (Annotations)
-Specification-Version: 3.0
-Specification-Vendor: Sun Microsystems, Inc.
-Implementation-Title: javax.servlet
-Implementation-Version: 3.0.@servlet.revision@
+Name: javax/annotation/
+Implementation-Title: javax.annotation
Implementation-Vendor: Apache Software Foundation
+Implementation-Version: 1.2.@annotation.revision@
+Specification-Title: Common Annotations
+Specification-Vendor: Oracle Corporation
+Specification-Version: 1.2
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a33a8d0..16c519c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,6 +103,10 @@
ensure that log messages are not lost when a web application is
reloaded. (markt)
</fix>
+ <fix>
+ Correct the manifest for the annotations-api.jar. The JAR implements the
+ Common Annotations API 1.2 and the manifest should reflect that. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
