This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0d97e10e9d Align with 11.0.x
0d97e10e9d is described below
commit 0d97e10e9d521a12922a00ca1cbcaccadfb6ed2b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 22 19:19:33 2024 +0100
Align with 11.0.x
---
java/jakarta/annotation/Generated.java | 4 ++--
java/jakarta/annotation/Resource.java | 2 +-
java/jakarta/annotation/security/DenyAll.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/jakarta/annotation/Generated.java
b/java/jakarta/annotation/Generated.java
index 4997cdf44b..19cbed8bc6 100644
--- a/java/jakarta/annotation/Generated.java
+++ b/java/jakarta/annotation/Generated.java
@@ -28,8 +28,8 @@ import java.lang.annotation.Target;
* @since Common Annotations 1.0
*/
@Documented
-@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
ElementType.FIELD, ElementType.LOCAL_VARIABLE,
- ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER,
ElementType.TYPE })
+@Target({ ElementType.PACKAGE, ElementType.TYPE, ElementType.ANNOTATION_TYPE,
ElementType.METHOD,
+ ElementType.CONSTRUCTOR, ElementType.FIELD,
ElementType.LOCAL_VARIABLE, ElementType.PARAMETER })
@Retention(RetentionPolicy.SOURCE)
public @interface Generated {
/**
diff --git a/java/jakarta/annotation/Resource.java
b/java/jakarta/annotation/Resource.java
index a86d4cf7df..692d13418e 100644
--- a/java/jakarta/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
*
* @since Common Annotations 1.0
*/
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
+@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Repeatable(Resources.class)
public @interface Resource {
diff --git a/java/jakarta/annotation/security/DenyAll.java
b/java/jakarta/annotation/security/DenyAll.java
index 347d5e6161..9944210ce7 100644
--- a/java/jakarta/annotation/security/DenyAll.java
+++ b/java/jakarta/annotation/security/DenyAll.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* @since Common Annotations 1.0
*/
@Documented
-@Target({ ElementType.METHOD, ElementType.TYPE })
+@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface DenyAll {
// No attributes
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
