You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/05/16 12:19:16 UTC
[tomcat] 02/03: Align with Jakarta Annotations API 2.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 51e5cb22f2ba2b2b2e695c71bf189b40db8ae860
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 16 13:01:07 2022 +0100
Align with Jakarta Annotations API 2.1
---
java/jakarta/annotation/Priority.java | 3 ---
java/jakarta/annotation/Resource.java | 2 ++
java/jakarta/annotation/sql/DataSourceDefinition.java | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java
index 74dce8bb70..53c7904080 100644
--- a/java/jakarta/annotation/Priority.java
+++ b/java/jakarta/annotation/Priority.java
@@ -17,16 +17,13 @@
package jakarta.annotation;
import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
/**
* @since Common Annotations 1.2
*/
@Documented
-@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface Priority {
diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java
index 746da43e92..6677224f82 100644
--- a/java/jakarta/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -17,6 +17,7 @@
package jakarta.annotation;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -26,6 +27,7 @@ import java.lang.annotation.Target;
*/
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Resources.class)
public @interface Resource {
/**
diff --git a/java/jakarta/annotation/sql/DataSourceDefinition.java b/java/jakarta/annotation/sql/DataSourceDefinition.java
index cfbf7f69d0..9e5c46d0f3 100644
--- a/java/jakarta/annotation/sql/DataSourceDefinition.java
+++ b/java/jakarta/annotation/sql/DataSourceDefinition.java
@@ -17,6 +17,7 @@
package jakarta.annotation.sql;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -26,6 +27,7 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(DataSourceDefinitions.class)
public @interface DataSourceDefinition {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org