Move source/target JDK versions to the main section of the manifest,

because these values belong to the JAR file as the whole, not to some subset of it.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918923 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/META-INF/annotations-api.jar.manifest b/res/META-INF/annotations-api.jar.manifest
index ea72268..7afab0d 100644 (file)
--- a/res/META-INF/annotations-api.jar.manifest
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -1,4 +1,6 @@
 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)
@@ -7,5 +9,3 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: javax.servlet
 Implementation-Version: 3.0.@servlet.revision@
 Implementation-Vendor: Apache Software Foundation
-X-Compile-Source-JDK: @source.jdk@
-X-Compile-Target-JDK: @target.jdk@

diff --git a/res/META-INF/el-api.jar.manifest b/res/META-INF/el-api.jar.manifest
index 880f5b1..ea169fd 100644 (file)
--- a/res/META-INF/el-api.jar.manifest
+++ b/res/META-INF/el-api.jar.manifest
@@ -1,4 +1,6 @@
 Manifest-version: 1.0
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
 
 Name: javax/el/
 Specification-Title: Expression Language
@@ -7,5 +9,3 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: javax.el
 Implementation-Version: 2.2.@el.revision@
 Implementation-Vendor: Apache Software Foundation
-X-Compile-Source-JDK: @source.jdk@
-X-Compile-Target-JDK: @target.jdk@

diff --git a/res/META-INF/jsp-api.jar.manifest b/res/META-INF/jsp-api.jar.manifest
index 413ff04..d71b0cb 100644 (file)
--- a/res/META-INF/jsp-api.jar.manifest
+++ b/res/META-INF/jsp-api.jar.manifest
@@ -1,4 +1,6 @@
 Manifest-version: 1.0
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
 
 Name: javax/servlet/jsp/
 Specification-Title: Java API for JavaServer Pages
@@ -7,5 +9,3 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: javax.servlet.jsp
 Implementation-Version: 2.2.@jsp.revision@
 Implementation-Vendor: Apache Software Foundation
-X-Compile-Source-JDK: @source.jdk@
-X-Compile-Target-JDK: @target.jdk@

diff --git a/res/META-INF/servlet-api.jar.manifest b/res/META-INF/servlet-api.jar.manifest
index 1388353..85247d1 100644 (file)
--- a/res/META-INF/servlet-api.jar.manifest
+++ b/res/META-INF/servlet-api.jar.manifest
@@ -1,4 +1,6 @@
 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
@@ -7,5 +9,3 @@ Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: javax.servlet
 Implementation-Version: 3.0.@servlet.revision@
 Implementation-Vendor: Apache Software Foundation
-X-Compile-Source-JDK: @source.jdk@
-X-Compile-Target-JDK: @target.jdk@