tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1832262 - in /tomcat/trunk: build.xml res/META-INF/annotations-api.jar.manifest webapps/docs/changelog.xml
Date Fri, 25 May 2018 18:23:05 GMT
Author: markt
Date: Fri May 25 18:23:05 2018
New Revision: 1832262

URL: http://svn.apache.org/viewvc?rev=1832262&view=rev
Log:
Correct the manifest for the annotations-api.jar. The JAR implements the Common Annotations
API 1.3 and the manifest should reflect that.
      

Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/res/META-INF/annotations-api.jar.manifest
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1832262&r1=1832261&r2=1832262&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri May 25 18:23:05 2018
@@ -50,6 +50,8 @@
   <property name="websocket.revision" value="FR" />
   <!-- MR B but this was first 1.1 release so use FR -->
   <property name="jaspic.revision" value="FR" />
+  <!-- MR 3 but this was first 1.3 release so use FR -->
+  <property name="annotation.revision" value="FR" />
 
   <!-- Release artifact base names -->
   <property name="final.name"            value="${project}-${version}" />
@@ -690,8 +692,6 @@
 
   </target>
 
-
-
   <target name="build-manifests" unless="manifests.uptodate"
           depends="build-prepare">
     <!-- Filtering tokens for JAR manifests-->
@@ -702,6 +702,7 @@
     <filter token="el.revision" value="${el.revision}"/>
     <filter token="websocket.revision" value="${websocket.revision}"/>
     <filter token="jaspic.revision" value="${jaspic.revision}"/>
+    <filter token="annotation.revision" value="${annotation.revision}"/>
 
     <mkdir dir="${tomcat.manifests}" />
     <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"

Modified: tomcat/trunk/res/META-INF/annotations-api.jar.manifest
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/annotations-api.jar.manifest?rev=1832262&r1=1832261&r2=1832262&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/annotations-api.jar.manifest (original)
+++ tomcat/trunk/res/META-INF/annotations-api.jar.manifest Fri May 25 18:23:05 2018
@@ -2,10 +2,10 @@ Manifest-version: 1.0
 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.3.@annotation.revision@
+Specification-Title: Common Annotations
+Specification-Vendor: Oracle Corporation
+Specification-Version: 1.3

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832262&r1=1832261&r2=1832262&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri May 25 18:23:05 2018
@@ -123,6 +123,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.3 and the manifest should reflect that. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message