From 1bc0683d3610d1f2f5c6ed7d0a8d341d615bbdea Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 14 Jun 2011 08:58:21 +0000
Subject: [PATCH] fix 1.5 build with reintroducing javax.annotation:jsr250-api
 dependency

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135418 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/metadata/metadata-repository-api/pom.xml     | 4 ++++
 .../archiva/metadata/repository/DefaultMetadataResolver.java | 2 +-
 pom.xml                                                      | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml
index c5ef90a84..dbaf847ff 100644
--- a/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -34,6 +34,10 @@
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-model</artifactId>
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index 903cbf199..27940a9f0 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -73,7 +73,7 @@ public class DefaultMetadataResolver
      * ... could be a different type since we need methods to modify the storage metadata, which would also allow more
      * appropriate methods to pass in the already determined repository configuration, for example, instead of the ID
      *
-     * @plexus.requirement role-hint="maven2"
+     * plexus.requirement role-hint="maven2"
      */
     @Inject
     @Named( value = "repositoryStorage#maven2" )
diff --git a/pom.xml b/pom.xml
index 58a3647a3..9413fdd92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,11 @@
         <artifactId>javax.inject</artifactId>
         <version>1</version>
       </dependency>
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>jsr250-api</artifactId>
+        <version>1.0</version>
+      </dependency>
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
-- 
2.39.5