GERONIMO-6568 add PARAMETER to @Priority
git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk@1796920 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-annotation_1.3_spec/pom.xml b/geronimo-annotation_1.3_spec/pom.xml
index d8fdf56..bfa8455 100644
--- a/geronimo-annotation_1.3_spec/pom.xml
+++ b/geronimo-annotation_1.3_spec/pom.xml
@@ -31,11 +31,11 @@
</parent>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
<packaging>bundle</packaging>
- <name>Apache Geronimo Annotation Spec 1.2</name>
+ <name>Apache Geronimo Annotation Spec 1.3</name>
<version>1.1-SNAPSHOT</version>
- <description>Annotation spec 1.2 API</description>
+ <description>Common Annotations spec 1.3 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -50,9 +50,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-annotation_1.2_spec/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-annotation_1.2_spec/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-annotation_1.2_spec/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-annotation_1.3_spec/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-annotation_1.3_spec/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-annotation_1.3_spec/</url>
</scm>
<build>
@@ -64,10 +64,10 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
- <Specification-Title>JSR-250 Common Annotations 1.2</Specification-Title>
+ <Specification-Title>JSR-250 Common Annotations 1.3</Specification-Title>
<Specification-Vendor>Oracle, Inc.</Specification-Vendor>
- <Specification-Version>1.2</Specification-Version>
- <Export-Package>javax.annotation*;version=1.2</Export-Package>
+ <Specification-Version>1.3</Specification-Version>
+ <Export-Package>javax.annotation*;version=1.3</Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java b/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java
index 280adca..f3352ec 100644
--- a/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java
+++ b/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java
@@ -37,7 +37,7 @@
*
* @since 1.2
*/
-@Target({ElementType.TYPE})
+@Target({ElementType.TYPE, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface Priority {
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 c433455..84bd1a7 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
@@ -28,7 +28,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Documented;
/**
* @version $Rev$ $Date$
@@ -36,7 +35,7 @@
@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Resource {
- public enum AuthenticationType {
+ enum AuthenticationType {
CONTAINER,
APPLICATION
}
diff --git a/pom.xml b/pom.xml
index bd55a58..ee3c6c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
<module>geronimo-annotation_1.0_spec</module>
<module>geronimo-annotation_1.1_spec</module>
<module>geronimo-annotation_1.2_spec</module>
+ <module>geronimo-annotation_1.3_spec</module>
<module>geronimo-atinject_1.0_spec</module>
<module>geronimo-availability_0.4_spec</module>
<module>geronimo-availability_1.0_spec</module>
