From 9ac70a73abe68fe344b9340689ec5c2d7ac83103 Mon Sep 17 00:00:00 2001 From: Svetlin Zarev Date: Thu, 1 Jun 2017 09:35:46 +0300 Subject: [PATCH] Fix javax.annotation.Resource Starting with JSR250 maintenance release 2, the signature of Resource.type() is changed to return Class --- .../src/main/java/javax/annotation/Resource.java | 2 +- .../src/main/java/javax/annotation/Resource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geronimo-annotation_1.2_spec/src/main/java/javax/annotation/Resource.java b/geronimo-annotation_1.2_spec/src/main/java/javax/annotation/Resource.java index c43345578..67afc6464 100644 --- a/geronimo-annotation_1.2_spec/src/main/java/javax/annotation/Resource.java +++ b/geronimo-annotation_1.2_spec/src/main/java/javax/annotation/Resource.java @@ -43,7 +43,7 @@ public enum AuthenticationType { String name() default ""; - Class type() default Object.class; + Class type() default Object.class; AuthenticationType authenticationType() default AuthenticationType.CONTAINER; diff --git a/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java b/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java index 84bd1a7bd..8b5c3da0f 100644 --- a/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java +++ b/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java @@ -42,7 +42,7 @@ enum AuthenticationType { String name() default ""; - Class type() default Object.class; + Class type() default Object.class; AuthenticationType authenticationType() default AuthenticationType.CONTAINER;