Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2011-06-14 08:58:21 +00:00
parent 9b167a0934
commit 1bc0683d36
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/metadata/metadata-repository-api/pom.xml
View File

@ -34,6 +34,10 @@
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
<artifactId>metadata-model</artifactId> <artifactId>metadata-model</artifactId>

2
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
View File

@ -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 * ... 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 * 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 @Inject
@Named( value = "repositoryStorage#maven2" ) @Named( value = "repositoryStorage#maven2" )

5
pom.xml
View File

@ -145,6 +145,11 @@
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
<version>1</version> <version>1</version>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
</dependency>
<dependency> <dependency>
<groupId>javax.activation</groupId> <groupId>javax.activation</groupId>
<artifactId>activation</artifactId> <artifactId>activation</artifactId>