Google Git
Sign in
gdch-oss/third_party/jakartaee/common-annotations-api/cf80fa2de9bbf0e49e2deb1e1b85903d21adbfe6^!/.
commit
cf80fa2de9bbf0e49e2deb1e1b85903d21adbfe6
[log] [tgz]
author
Cousjava <jonathan.coustick@payara.fish>
Fri Jan 10 23:13:00 2020 +0000
committer
Dmitry Kornilov <dmitry.kornilov@oracle.com>
Sat Jan 11 00:13:00 2020 +0100
tree
8a70589f1d4eca3d279a9aedbf038327075642f9
parent
eee711ae7e13fc318dd197d631389764f964df8d [diff]
Rename package from javax to jakarta (#63)

* Rename packages from javax to jakarta

Signed-off-by: Jonathan Coustick <jonathan.coustick@payara.fish>

* Set version number to 2.0

Signed-off-by: Jonathan Coustick <jonathan.coustick@payara.fish>

* Change module name to jakarta

Fixes #64

Signed-off-by: Jonathan Coustick <jonathan.coustick@payara.fish>

diff --git a/api/pom.xml b/api/pom.xml
index 008e32e..4deed65 100644
--- a/api/pom.xml
+++ b/api/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.annotation</groupId>
         <artifactId>ca-parent</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.annotation-api</artifactId>
@@ -256,7 +256,7 @@
                         <manifestEntries>
                             <!-- for JDK 9 -->
                             <Automatic-Module-Name>
-                                java.annotation
+                                jakarta.annotation
                             </Automatic-Module-Name>
                         </manifestEntries>
                     </archive>

diff --git a/api/src/main/java/javax/annotation/Generated.java b/api/src/main/java/jakarta/annotation/Generated.java
similarity index 98%
rename from api/src/main/java/javax/annotation/Generated.java
rename to api/src/main/java/jakarta/annotation/Generated.java
index e24f632..931b37f 100644
--- a/api/src/main/java/javax/annotation/Generated.java
+++ b/api/src/main/java/jakarta/annotation/Generated.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation;
+package jakarta.annotation;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;

diff --git a/api/src/main/java/javax/annotation/ManagedBean.java b/api/src/main/java/jakarta/annotation/ManagedBean.java
similarity index 98%
rename from api/src/main/java/javax/annotation/ManagedBean.java
rename to api/src/main/java/jakarta/annotation/ManagedBean.java
index 7ef3711..2c7af96 100644
--- a/api/src/main/java/javax/annotation/ManagedBean.java
+++ b/api/src/main/java/jakarta/annotation/ManagedBean.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;

diff --git a/api/src/main/java/javax/annotation/PostConstruct.java b/api/src/main/java/jakarta/annotation/PostConstruct.java
similarity index 96%
rename from api/src/main/java/javax/annotation/PostConstruct.java
rename to api/src/main/java/jakarta/annotation/PostConstruct.java
index de53c0b..6d69ac1 100644
--- a/api/src/main/java/javax/annotation/PostConstruct.java
+++ b/api/src/main/java/jakarta/annotation/PostConstruct.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
@@ -62,8 +62,8 @@
  * service except in the case where the exception is handled by an
  * interceptor.</li></ul>
  *
- * @see javax.annotation.PreDestroy
- * @see javax.annotation.Resource
+ * @see jakarta.annotation.PreDestroy
+ * @see jakarta.annotation.Resource
  * @since 1.6, Common Annotations 1.0
  */
 @Documented

diff --git a/api/src/main/java/javax/annotation/PreDestroy.java b/api/src/main/java/jakarta/annotation/PreDestroy.java
similarity index 96%
rename from api/src/main/java/javax/annotation/PreDestroy.java
rename to api/src/main/java/jakarta/annotation/PreDestroy.java
index 06100c1..b092329 100644
--- a/api/src/main/java/javax/annotation/PreDestroy.java
+++ b/api/src/main/java/jakarta/annotation/PreDestroy.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
@@ -61,8 +61,8 @@
  * the container.</li>
  * </ul>
  *
- * @see javax.annotation.PostConstruct
- * @see javax.annotation.Resource
+ * @see jakarta.annotation.PostConstruct
+ * @see jakarta.annotation.Resource
  * @since 1.6, Common Annotations 1.0
  */
 

diff --git a/api/src/main/java/javax/annotation/Priority.java b/api/src/main/java/jakarta/annotation/Priority.java
similarity index 98%
rename from api/src/main/java/javax/annotation/Priority.java
rename to api/src/main/java/jakarta/annotation/Priority.java
index ae10049..2f3b619 100644
--- a/api/src/main/java/javax/annotation/Priority.java
+++ b/api/src/main/java/jakarta/annotation/Priority.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;

diff --git a/api/src/main/java/javax/annotation/Resource.java b/api/src/main/java/jakarta/annotation/Resource.java
similarity index 99%
rename from api/src/main/java/javax/annotation/Resource.java
rename to api/src/main/java/jakarta/annotation/Resource.java
index da75267..e81ba23 100644
--- a/api/src/main/java/javax/annotation/Resource.java
+++ b/api/src/main/java/jakarta/annotation/Resource.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation;
+package jakarta.annotation;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;

diff --git a/api/src/main/java/javax/annotation/Resources.java b/api/src/main/java/jakarta/annotation/Resources.java
similarity index 94%
rename from api/src/main/java/javax/annotation/Resources.java
rename to api/src/main/java/jakarta/annotation/Resources.java
index d603b5a..e8ca0f4 100644
--- a/api/src/main/java/javax/annotation/Resources.java
+++ b/api/src/main/java/jakarta/annotation/Resources.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation;
+package jakarta.annotation;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
@@ -22,7 +22,7 @@
 /**
  * This class is used to allow multiple resources declarations.
  *
- * @see javax.annotation.Resource
+ * @see jakarta.annotation.Resource
  * @since 1.6, Common Annotations 1.0
  */
 

diff --git a/api/src/main/java/javax/annotation/package-info.java b/api/src/main/java/jakarta/annotation/package-info.java
similarity index 96%
rename from api/src/main/java/javax/annotation/package-info.java
rename to api/src/main/java/jakarta/annotation/package-info.java
index e83458c..5bddc26 100644
--- a/api/src/main/java/javax/annotation/package-info.java
+++ b/api/src/main/java/jakarta/annotation/package-info.java

@@ -17,4 +17,4 @@
 /**
  * This package defines the common annotations.
  */
-package javax.annotation;
+package jakarta.annotation;

diff --git a/api/src/main/java/javax/annotation/security/DeclareRoles.java b/api/src/main/java/jakarta/annotation/security/DeclareRoles.java
similarity index 96%
rename from api/src/main/java/javax/annotation/security/DeclareRoles.java
rename to api/src/main/java/jakarta/annotation/security/DeclareRoles.java
index 44a4ce1..8028741 100644
--- a/api/src/main/java/javax/annotation/security/DeclareRoles.java
+++ b/api/src/main/java/jakarta/annotation/security/DeclareRoles.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation.security;
+package jakarta.annotation.security;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;

diff --git a/api/src/main/java/javax/annotation/security/DenyAll.java b/api/src/main/java/jakarta/annotation/security/DenyAll.java
similarity index 88%
rename from api/src/main/java/javax/annotation/security/DenyAll.java
rename to api/src/main/java/jakarta/annotation/security/DenyAll.java
index 388a512..eee827e 100644
--- a/api/src/main/java/javax/annotation/security/DenyAll.java
+++ b/api/src/main/java/jakarta/annotation/security/DenyAll.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation.security;
+package jakarta.annotation.security;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
@@ -23,8 +23,8 @@
  * Specifies that no security roles are allowed to invoke the specified 
  * method(s).
  *
- * @see javax.annotation.security.RolesAllowed
- * @see javax.annotation.security.PermitAll
+ * @see jakarta.annotation.security.RolesAllowed
+ * @see jakarta.annotation.security.PermitAll
  * @since Common Annotations 1.0
  */
 @Documented

diff --git a/api/src/main/java/javax/annotation/security/PermitAll.java b/api/src/main/java/jakarta/annotation/security/PermitAll.java
similarity index 92%
rename from api/src/main/java/javax/annotation/security/PermitAll.java
rename to api/src/main/java/jakarta/annotation/security/PermitAll.java
index 2d94427..a59e374 100644
--- a/api/src/main/java/javax/annotation/security/PermitAll.java
+++ b/api/src/main/java/jakarta/annotation/security/PermitAll.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation.security;
+package jakarta.annotation.security;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
@@ -30,8 +30,8 @@
  * annotation overrides the <code>RolesAllowed</code> annotation for
  *  the specified method.
  *
- * @see javax.annotation.security.RolesAllowed
- * @see javax.annotation.security.DenyAll
+ * @see jakarta.annotation.security.RolesAllowed
+ * @see jakarta.annotation.security.DenyAll
  *
  * @since Common Annotations 1.0
  */

diff --git a/api/src/main/java/javax/annotation/security/RolesAllowed.java b/api/src/main/java/jakarta/annotation/security/RolesAllowed.java
similarity index 97%
rename from api/src/main/java/javax/annotation/security/RolesAllowed.java
rename to api/src/main/java/jakarta/annotation/security/RolesAllowed.java
index 30978d3..a2163e4 100644
--- a/api/src/main/java/javax/annotation/security/RolesAllowed.java
+++ b/api/src/main/java/jakarta/annotation/security/RolesAllowed.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation.security;
+package jakarta.annotation.security;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;

diff --git a/api/src/main/java/javax/annotation/security/RunAs.java b/api/src/main/java/jakarta/annotation/security/RunAs.java
similarity index 96%
rename from api/src/main/java/javax/annotation/security/RunAs.java
rename to api/src/main/java/jakarta/annotation/security/RunAs.java
index 05bacff..b94af77 100644
--- a/api/src/main/java/javax/annotation/security/RunAs.java
+++ b/api/src/main/java/jakarta/annotation/security/RunAs.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation.security;
+package jakarta.annotation.security;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;

diff --git a/api/src/main/java/javax/annotation/security/package-info.java b/api/src/main/java/jakarta/annotation/security/package-info.java
similarity index 95%
rename from api/src/main/java/javax/annotation/security/package-info.java
rename to api/src/main/java/jakarta/annotation/security/package-info.java
index acbd454..14e9c5c 100644
--- a/api/src/main/java/javax/annotation/security/package-info.java
+++ b/api/src/main/java/jakarta/annotation/security/package-info.java

@@ -17,4 +17,4 @@
 /**
  * This package contains the security common annotations.
  */
-package javax.annotation.security;
+package jakarta.annotation.security;

diff --git a/api/src/main/java/javax/annotation/sql/DataSourceDefinition.java b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java
similarity index 99%
rename from api/src/main/java/javax/annotation/sql/DataSourceDefinition.java
rename to api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java
index e6c0bf5..5f74622 100644
--- a/api/src/main/java/javax/annotation/sql/DataSourceDefinition.java
+++ b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinition.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation.sql;
+package jakarta.annotation.sql;
 
 import java.lang.annotation.*;
 import java.lang.annotation.Target;

diff --git a/api/src/main/java/javax/annotation/sql/DataSourceDefinitions.java b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java
similarity index 92%
rename from api/src/main/java/javax/annotation/sql/DataSourceDefinitions.java
rename to api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java
index a4b914b..c69aa5a 100644
--- a/api/src/main/java/javax/annotation/sql/DataSourceDefinitions.java
+++ b/api/src/main/java/jakarta/annotation/sql/DataSourceDefinitions.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.annotation.sql;
+package jakarta.annotation.sql;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
@@ -24,7 +24,7 @@
 /**
  * Declares one or more <code>DataSourceDefinition</code> annotations.
  * 
- * @see javax.annotation.sql.DataSourceDefinition
+ * @see jakarta.annotation.sql.DataSourceDefinition
  * @since Common Annotations 1.1
  */
 @Target({ElementType.TYPE})

diff --git a/pom.xml b/pom.xml
index 44077fb..311602d 100644
--- a/pom.xml
+++ b/pom.xml

@@ -29,7 +29,7 @@
     <groupId>jakarta.annotation</groupId>
     <artifactId>ca-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
 
     <inceptionYear>2004</inceptionYear>
 

diff --git a/spec/pom.xml b/spec/pom.xml
index a3e5700..7bb0772 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml

@@ -20,12 +20,12 @@
     <parent>
         <groupId>jakarta.annotation</groupId>
         <artifactId>ca-parent</artifactId>
-        <version>1.3.5-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>annotations-spec</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Annotations Specification</name>