aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-08-04 18:20:54 +0000
committerOlivier Lamy <olamy@apache.org>2012-08-04 18:20:54 +0000
commit148e9f13411112cd0b42da381b5acbbd54dbbcc9 (patch)
tree0dfe6e4160cfe464bf3dd68f14b7ec0b398af0e9
parent997047c024dcdcbbdda315a540225d4074bad813 (diff)
downloadarchiva-148e9f13411112cd0b42da381b5acbbd54dbbcc9.tar.gz
archiva-148e9f13411112cd0b42da381b5acbbd54dbbcc9.zip
fix some dependencies and back to surefire 2.12 as it break on webapp-it-js
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1369387 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/pom.xml25
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java4
-rw-r--r--pom.xml1
3 files changed, 28 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index e0020d81e..24c10118c 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -78,6 +78,31 @@
<artifactId>archiva-repository-admin-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-inject-plexus</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
index 4954ee336..55cf09999 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
@@ -60,7 +60,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import javax.annotation.Nullable;
+
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.http.HttpServletRequest;
@@ -240,7 +240,7 @@ public class DefaultFileUploadService
filesToAdd = Iterables.filter( fileMetadatas, new Predicate<FileMetadata>()
{
- public boolean apply( @Nullable FileMetadata fileMetadata )
+ public boolean apply( FileMetadata fileMetadata )
{
return fileMetadata != null && fileMetadata.isPomFile();
}
diff --git a/pom.xml b/pom.xml
index d7b034017..702dc8bde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1771,6 +1771,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
<configuration>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<runOrder>alphabetical</runOrder>