From dev-return-191058-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org  Fri May 25 20:23:08 2018
Return-Path: <dev-return-191058-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id EBACF180627
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 25 May 2018 20:23:07 +0200 (CEST)
Received: (qmail 78835 invoked by uid 500); 25 May 2018 18:23:06 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 78825 invoked by uid 99); 25 May 2018 18:23:06 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2018 18:23:06 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1D9A23A00C6
	for <dev@tomcat.apache.org>; Fri, 25 May 2018 18:23:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20180525182306.1D9A23A00C6@svn01-us-west.apache.org>

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