geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1796920 - in /geronimo/specs/trunk: geronimo-annotation_1.3_spec/pom.xml geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java pom.xml
Date Tue, 30 May 2017 19:47:40 GMT
Author: struberg
Date: Tue May 30 19:47:40 2017
New Revision: 1796920

URL: http://svn.apache.org/viewvc?rev=1796920&view=rev
Log:
GERONIMO-6568 add PARAMETER to @Priority

Modified:
    geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml
    geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java
    geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java
    geronimo/specs/trunk/pom.xml

Modified: geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml?rev=1796920&r1=1796919&r2=1796920&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml Tue May 30 19:47:40 2017
@@ -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>

Modified: geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java?rev=1796920&r1=1796919&r2=1796920&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java
(original)
+++ geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Priority.java
Tue May 30 19:47:40 2017
@@ -37,7 +37,7 @@ import java.lang.annotation.Target;
  *
  * @since 1.2
  */
-@Target({ElementType.TYPE})
+@Target({ElementType.TYPE, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface Priority {

Modified: geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java?rev=1796920&r1=1796919&r2=1796920&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java
(original)
+++ geronimo/specs/trunk/geronimo-annotation_1.3_spec/src/main/java/javax/annotation/Resource.java
Tue May 30 19:47:40 2017
@@ -28,7 +28,6 @@ import java.lang.annotation.Target;
 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 @@ import java.lang.annotation.Documented;
 @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Resource {
-    public enum AuthenticationType {
+    enum AuthenticationType {
         CONTAINER,
         APPLICATION
     }

Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=1796920&r1=1796919&r2=1796920&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Tue May 30 19:47:40 2017
@@ -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>



Mime
View raw message