summaryrefslogtreecommitdiffstats
path: root/archiva-modules/metadata
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-06-14 08:58:21 +0000
committerOlivier Lamy <olamy@apache.org>2011-06-14 08:58:21 +0000
commit1bc0683d3610d1f2f5c6ed7d0a8d341d615bbdea (patch)
tree6b7df0abfd7af26d289ee808330a9e14c59067bb /archiva-modules/metadata
parent9b167a09343962730cfe305e5eea5b497cf5a42e (diff)
downloadarchiva-1bc0683d3610d1f2f5c6ed7d0a8d341d615bbdea.tar.gz
archiva-1bc0683d3610d1f2f5c6ed7d0a8d341d615bbdea.zip
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
Diffstat (limited to 'archiva-modules/metadata')
-rw-r--r--archiva-modules/metadata/metadata-repository-api/pom.xml4
-rw-r--r--archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java2
2 files changed, 5 insertions, 1 deletions
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
@@ -35,6 +35,10 @@
<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>
</dependency>
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" )