Author: olamy
Date: Tue Jun 14 08:58:21 2011
New Revision: 1135418
URL: http://svn.apache.org/viewvc?rev=1135418&view=rev
Log:
fix 1.5 build with reintroducing javax.annotation:jsr250-api dependency
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml?rev=1135418&r1=1135417&r2=1135418&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml Tue
Jun 14 08:58:21 2011
@@ -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>
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java?rev=1135418&r1=1135417&r2=1135418&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
Tue Jun 14 08:58:21 2011
@@ -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" )
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1135418&r1=1135417&r2=1135418&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Jun 14 08:58:21 2011
@@ -146,6 +146,11 @@
<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>
<version>1.1</version>
