Rename "javax.annotation.*" to "jakarta.annotation.*"

markt-asf · markt-asf · commit 4ed2dc843a59 · 2020-01-13T11:00:17.000Z
diff --git a/build.xml b/build.xml
@@ -327,7 +327,7 @@
   <!-- ========= Pattern sets used to control content of JAR files ========= -->
   <!-- Pattern sets for jar files in standard distributions -->
   <patternset id="files.annotations-api">
-    <include name="javax/annotation/**" />
+    <include name="jakarta/annotation/**" />
   </patternset>
 
   <patternset id="files.servlet-api">
@@ -627,6 +627,12 @@
         <exclude name="build.properties" />
       </fileset>
     </checkstyle>
+    <!-- jakarta package checks -->
+    <checkstyle config="res/checkstyle/jakarta-checkstyle.xml">
+      <fileset dir="java/jakarta" >
+        <include name="**/*.java"/>
+      </fileset>
+    </checkstyle>
     <!-- javax package checks -->
     <checkstyle config="res/checkstyle/javax-checkstyle.xml">
       <fileset dir="java/javax" >
@@ -1879,7 +1885,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
 
   <target name="javadoc" depends="dist-source"
     description="Create the Tomcat javadoc" >
-    <javadoc packagenames="javax.annotation.*"
+    <javadoc packagenames="jakarta.annotation.*"
       sourcepath="${tomcat.dist}/src/java"
       destdir="${tomcat.dist}/webapps/docs/annotationapi"
       version="true"
diff --git a/java/jakarta/annotation/Generated.java b/java/jakarta/annotation/Generated.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/ManagedBean.java b/java/jakarta/annotation/ManagedBean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/jakarta/annotation/PostConstruct.java b/java/jakarta/annotation/PostConstruct.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/PreDestroy.java b/java/jakarta/annotation/PreDestroy.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/jakarta/annotation/Resources.java b/java/jakarta/annotation/Resources.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/security/DeclareRoles.java b/java/jakarta/annotation/security/DeclareRoles.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation.security;
+package jakarta.annotation.security;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/security/DenyAll.java b/java/jakarta/annotation/security/DenyAll.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation.security;
+package jakarta.annotation.security;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/security/PermitAll.java b/java/jakarta/annotation/security/PermitAll.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation.security;
+package jakarta.annotation.security;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/security/RolesAllowed.java b/java/jakarta/annotation/security/RolesAllowed.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation.security;
+package jakarta.annotation.security;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/security/RunAs.java b/java/jakarta/annotation/security/RunAs.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation.security;
+package jakarta.annotation.security;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/jakarta/annotation/sql/DataSourceDefinition.java b/java/jakarta/annotation/sql/DataSourceDefinition.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation.sql;
+package jakarta.annotation.sql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/jakarta/annotation/sql/DataSourceDefinitions.java b/java/jakarta/annotation/sql/DataSourceDefinitions.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation.sql;
+package jakarta.annotation.sql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -35,16 +35,17 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
 import javax.ejb.EJB;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
 import javax.xml.ws.WebServiceRef;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Globals;
 import org.apache.catalina.security.SecurityUtil;
diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -19,13 +19,14 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import javax.annotation.Resource;
-import javax.annotation.Resources;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.RunAs;
 import javax.servlet.ServletSecurityElement;
 import javax.servlet.annotation.ServletSecurity;
 
+import jakarta.annotation.Resource;
+import jakarta.annotation.Resources;
+import jakarta.annotation.security.DeclareRoles;
+import jakarta.annotation.security.RunAs;
+
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
@@ -125,7 +125,7 @@
 				            <artifactSet>
                                 <excludes>
                                     <!-- Already present in Tomcat or in the CDI bundle -->
-                                    <exclude>javax.annotation:javax.annotation-api</exclude>
+                                    <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
 									<exclude>javax.el:*</exclude>
 									<exclude>javax.enterprise:cdi-api</exclude>
 									<exclude>javax.inject:*</exclude>
diff --git a/res/META-INF/annotations-api.jar.manifest b/res/META-INF/annotations-api.jar.manifest
@@ -2,8 +2,8 @@ Manifest-version: 1.0
 X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@
 
-Name: javax/annotation/
-Implementation-Title: javax.annotation
+Name: jakarta/annotation/
+Implementation-Title: jakarta.annotation
 Implementation-Vendor: Apache Software Foundation
 Implementation-Version: 1.3.@annotation.revision@
 Specification-Title: Common Annotations
diff --git a/res/bnd/annotations-api.jar.tmp.bnd b/res/bnd/annotations-api.jar.tmp.bnd
@@ -16,6 +16,6 @@ Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
 Bundle-Version: @VERSION@
 Export-Package: \
-    javax.annotation,\
-    javax.annotation.security,\
-    javax.annotation.sql
+    jakarta.annotation,\
+    jakarta.annotation.security,\
+    jakarta.annotation.sql
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
@@ -70,7 +70,7 @@
         <property name="illegalPkgs" value="sun,junit.framework"/>
     </module>
     <module name="ImportOrder">
-        <property name="groups" value="java,javax,org.hamcrest,org.junit,org,async,jsp2,util"/>
+        <property name="groups" value="java,javax,jakarta,org.hamcrest,org.junit,org,async,jsp2,util"/>
         <property name="ordered" value="true"/>
         <property name="separated" value="true"/>
         <property name="option" value="above"/>
diff --git a/res/checkstyle/jakarta-checkstyle.xml b/res/checkstyle/jakarta-checkstyle.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+  <!-- When adding checks, keep to the order checks are listed under         -->
+  <!-- 'Standard Checks' in the Checkstyle documentation:                    -->
+  <!-- http://checkstyle.sourceforge.net/config_coding.html                  -->
+
+  <!-- Cache what has passed checkstyle -->
+  <property name="cacheFile"
+            value="${tomcat.output}/res/checkstyle/cachefile-jakarta-checkstyle.xml"/>
+
+  <!-- Specific checks for javax.* packages -->
+
+  <module name="TreeWalker">
+    <module name="ImportControl">
+      <property name="file" value="${basedir}/res/checkstyle/jakarta-import-control.xml"/>
+    </module>
+  </module>
+</module>
diff --git a/res/checkstyle/jakarta-import-control.xml b/res/checkstyle/jakarta-import-control.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE import-control PUBLIC
+    "-//Puppy Crawl//DTD Import Control 1.1//EN"
+    "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
+
+<import-control pkg="jakarta">
+  <allow pkg="java"/>
+  <subpackage name="annotation">
+    <allow pkg="jakarta.annotation"/>
+  </subpackage>
+  <subpackage name="ejb">
+    <allow pkg="javax.ejb"/>
+  </subpackage>
+  <subpackage name="el">
+    <allow pkg="javax.el"/>
+  </subpackage>
+  <subpackage name="mail">
+    <allow pkg="javax.mail"/>
+  </subpackage>
+  <subpackage name="persistence">
+    <allow pkg="javax.persistence"/>
+  </subpackage>
+  <subpackage name="security">
+    <subpackage name="auth">
+      <subpackage name="message">
+        <allow pkg="javax.crypto" />
+        <allow class="javax.security.auth.Subject"/>
+        <allow pkg="javax.security.auth.callback"/>
+        <allow pkg="javax.security.auth.login"/>
+        <allow pkg="javax.security.auth.x500"/>
+        <disallow pkg="javax.security.auth.message.callback" local-only="true"/>
+        <disallow pkg="javax.security.auth.message.config" local-only="true"/>
+        <disallow pkg="javax.security.auth.message.module" local-only="true"/>
+        <subpackage name="config">
+        <allow class="javax.security.auth.AuthPermission"/>
+          <allow pkg="javax.security.auth.message"/>
+        </subpackage>
+        <subpackage name="module">
+          <allow pkg="javax.security.auth.message"/>
+        </subpackage>
+      </subpackage>
+    </subpackage>
+  </subpackage>
+  <subpackage name="servlet">
+    <allow pkg="javax.servlet"/>
+    <disallow pkg="javax.servlet.jsp" local-only="true"/>
+    <subpackage name="jsp">
+      <allow pkg="javax.el"/>
+      <allow pkg="javax.servlet.jsp"/>
+    </subpackage>
+  </subpackage>
+  <subpackage name="transaction">
+    <allow pkg="javax.transaction"/>
+  </subpackage>
+  <subpackage name="websocket">
+    <allow pkg="javax.websocket"/>
+  </subpackage>
+  <subpackage name="xml.ws">
+    <allow pkg="javax.xwl.ws"/>
+  </subpackage>
+</import-control>
diff --git a/res/checkstyle/javax-import-control.xml b/res/checkstyle/javax-import-control.xml
@@ -22,7 +22,7 @@
 <import-control pkg="javax">
   <allow pkg="java"/>
   <subpackage name="annotation">
-    <allow pkg="javax.annotation"/>
+    <allow pkg="jakarta.annotation"/>
   </subpackage>
   <subpackage name="ejb">
     <allow pkg="javax.ejb"/>
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
@@ -36,7 +36,7 @@
   <allow pkg="org.xml.sax"/>
   <allow pkg="org.ietf.jgss"/>
   <subpackage name="catalina">
-    <allow pkg="javax.annotation"/>
+    <allow pkg="jakarta.annotation"/>
     <allow pkg="javax.ejb"/>
     <allow pkg="javax.persistence"/>
     <allow pkg="javax.servlet"/>
@@ -50,7 +50,7 @@
     <subpackage name="ant">
       <allow pkg="org.apache.tools.ant"/>
       <allow class="org.apache.tomcat.util.Base64"/>
-      <disallow pkg="javax.annotation"/>
+      <disallow pkg="jakarta.annotation"/>
       <disallow pkg="javax.ejb"/>
       <disallow pkg="javax.persistence"/>
       <disallow pkg="javax.servlet"/>
@@ -59,7 +59,7 @@
       <disallow pkg="org.apache.naming"/>
     </subpackage>
     <subpackage name="ha">
-      <disallow pkg="javax.annotation"/>
+      <disallow pkg="jakarta.annotation"/>
       <disallow pkg="javax.ejb"/>
       <disallow pkg="javax.persistence"/>
       <disallow pkg="org.apache.coyote"/>
@@ -72,7 +72,7 @@
       <allow pkg="org.apache.catalina.tribes"/>
     </subpackage>
     <subpackage name="tribes">
-      <disallow pkg="javax.annotation"/>
+      <disallow pkg="jakarta.annotation"/>
       <disallow pkg="javax.ejb"/>
       <disallow pkg="javax.persistence"/>
       <disallow pkg="javax.servlet"/>
diff --git a/test/org/apache/catalina/startup/TesterServletWithAnnotations.java b/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
diff --git a/test/org/apache/catalina/startup/TesterServletWithLifeCycleMethods.java b/test/org/apache/catalina/startup/TesterServletWithLifeCycleMethods.java
diff --git a/test/webapp/annotations.jsp b/test/webapp/annotations.jsp
