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 2023/04/14 11:30:07 UTC
[tomcat] 07/08: Align with Java EE 8
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 215a3f0ba8d2d5017df17c645e229e8278cd7e7f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 14 12:10:55 2023 +0100
Align with Java EE 8
Spotted checking diffs between 9.0.x and 10.1.x
---
java/javax/annotation/Priority.java | 2 +-
java/javax/annotation/Resource.java | 2 ++
java/javax/annotation/sql/DataSourceDefinition.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/javax/annotation/Priority.java b/java/javax/annotation/Priority.java
index 6d9c84a50f..ed7527de05 100644
--- a/java/javax/annotation/Priority.java
+++ b/java/javax/annotation/Priority.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
* @since Common Annotations 1.2
*/
@Documented
-@Target(ElementType.TYPE)
+@Target({ ElementType.TYPE, ElementType.PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
public @interface Priority {
diff --git a/java/javax/annotation/Resource.java b/java/javax/annotation/Resource.java
index cb00bc848f..856fd1ecd8 100644
--- a/java/javax/annotation/Resource.java
+++ b/java/javax/annotation/Resource.java
@@ -17,6 +17,7 @@
package javax.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;
@@ -29,6 +30,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/javax/annotation/sql/DataSourceDefinition.java b/java/javax/annotation/sql/DataSourceDefinition.java
index a779b219d4..a4137e0eb6 100644
--- a/java/javax/annotation/sql/DataSourceDefinition.java
+++ b/java/javax/annotation/sql/DataSourceDefinition.java
@@ -17,6 +17,7 @@
package javax.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