Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Implement changes proposed for common annotations 1.2 maintenance release #2

Merged
merged 3 commits into from
Feb 26, 2013
Merged

Implement changes proposed for common annotations 1.2 maintenance release #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
234b976
Update spec version to 1.2
dmlloyd Feb 26, 2013
9d3cd12
1.2 MR 2 part 1 - Add @Priority annotation
dmlloyd Feb 26, 2013
c171c99
1.2 MR 2 part 2 - Change return type of @Resource.type()
dmlloyd Feb 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/javax/annotation/Priority.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
2 changes: 1 addition & 1 deletion src/main/java/javax/annotation/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down