From 234b976a3c6bfb3ad80685b840429c6e067b5eb8 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 26 Feb 2013 10:10:22 -0600
Subject: [PATCH 1/3] Update spec version to 1.2

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index db44df7..0e6ddfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,11 +10,11 @@
   </parent>
 
   <groupId>org.jboss.spec.javax.annotation</groupId>
-  <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-  <version>1.0.2.Final-SNAPSHOT</version>
+  <artifactId>jboss-annotations-api_1.2_spec</artifactId>
+  <version>1.0.0.Final-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Common Annotations 1.1 API</name>
+  <name>Common Annotations 1.2 API</name>
   <description>JSR 250: Common Annotations for the Java(TM) Platform</description>
 
   <licenses>
@@ -82,10 +82,10 @@
           <instructions>
             <Specification-Title>JSR 250: Common Annotations for the Java(TM) Platform</Specification-Title>
             <Specification-Vendor>Oracle</Specification-Vendor>
-            <Specification-Version>1.1</Specification-Version>
+            <Specification-Version>1.2</Specification-Version>
             <!-- Set the package version to match the spec version -->
             <Export-Package>
-              javax.annotation*;version=1.1
+              javax.annotation*;version=1.2
             </Export-Package>
           </instructions>
         </configuration>
@@ -109,7 +109,7 @@
             <manifestEntries>
               <Specification-Title>JSR 250: Common Annotations for the Java(TM) Platform</Specification-Title>
               <Specification-Vendor>Oracle</Specification-Vendor>
-              <Specification-Version>1.1</Specification-Version>
+              <Specification-Version>1.2</Specification-Version>
             </manifestEntries>
           </archive>
         </configuration>

From 9d3cd12bb2fa75e0dd597c42a6ccea24002f22fa Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 26 Feb 2013 09:46:41 -0600
Subject: [PATCH 2/3] 1.2 MR 2 part 1 - Add @Priority annotation

---
 src/main/java/javax/annotation/Priority.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/main/java/javax/annotation/Priority.java

diff --git a/src/main/java/javax/annotation/Priority.java b/src/main/java/javax/annotation/Priority.java
new file mode 100644
index 0000000..babdd1f
--- /dev/null
+++ b/src/main/java/javax/annotation/Priority.java
@@ -0,0 +1,15 @@
+package javax.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target(TYPE)
+@Retention(RUNTIME)
+@Documented
+public @interface Priority {
+    int value();
+}

From c171c99a4495d1fcab0b43a2f761a930666c3bbf Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 26 Feb 2013 09:47:01 -0600
Subject: [PATCH 3/3] 1.2 MR 2 part 2 - Change return type of @Resource.type()

---
 src/main/java/javax/annotation/Resource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/javax/annotation/Resource.java b/src/main/java/javax/annotation/Resource.java
index 6ac4343..b8dfdd8 100644
--- a/src/main/java/javax/annotation/Resource.java
+++ b/src/main/java/javax/annotation/Resource.java
@@ -78,7 +78,7 @@
      * For class annotations, there is no default and this must be
      * specified.
      */
-    Class type() default java.lang.Object.class;
+    Class<?> type() default java.lang.Object.class;
 
     /**
      * The two possible authentication types for a resource.