aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-07-03 23:11:27 +0000
committerOlivier Lamy <olamy@apache.org>2012-07-03 23:11:27 +0000
commitdd386202d686e721823cc3aaa481bedc2b6ed818 (patch)
tree8fbffc8b25cdaaf19bb66ddf9086f3a502e9b0fe
parentd9af55d3288391ed71b435f570a739939ee56892 (diff)
downloadarchiva-dd386202d686e721823cc3aaa481bedc2b6ed818.tar.gz
archiva-dd386202d686e721823cc3aaa481bedc2b6ed818.zip
use fest assert 2.0
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1357005 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml2
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java4
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java2
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java2
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml2
-rw-r--r--archiva-modules/metadata/metadata-repository-api/pom.xml2
-rw-r--r--archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java2
-rw-r--r--archiva-modules/plugins/metadata-store-file/pom.xml2
-rw-r--r--archiva-modules/plugins/metadata-store-jcr/pom.xml2
-rw-r--r--pom.xml4
10 files changed, 12 insertions, 12 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 27d22cd51..3c78e0a34 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -328,7 +328,7 @@
<dependency>
<groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
+ <artifactId>fest-assert-core</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
index b37f735d6..ed70e0bc0 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
@@ -27,7 +27,7 @@ import org.apache.archiva.rest.api.model.Entry;
import org.apache.archiva.rest.api.model.VersionsList;
import org.apache.archiva.rest.api.services.BrowseService;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.fest.assertions.MapAssert;
+import org.fest.assertions.api.MapAssert;
import org.junit.Test;
import javax.ws.rs.core.MediaType;
@@ -36,7 +36,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.api.Assertions.assertThat;
/**
* @author Olivier Lamy
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
index 80ecdfcd6..5198d6376 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
@@ -30,7 +30,7 @@ import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
import org.apache.archiva.rest.api.services.RepositoriesService;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
-import org.fest.assertions.Assertions;
+import org.fest.assertions.api.Assertions;
import org.junit.Test;
import java.io.File;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
index 81183f432..c3a9cbc01 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
@@ -22,7 +22,7 @@ import org.apache.archiva.admin.model.beans.UiConfiguration;
import org.apache.archiva.rest.api.model.Artifact;
import org.apache.archiva.rest.api.model.SearchRequest;
import org.apache.archiva.rest.api.services.SearchService;
-import org.fest.assertions.Assertions;
+import org.fest.assertions.api.Assertions;
import org.junit.Test;
import java.util.Arrays;
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
index 88d55bc6f..830092d11 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
+ <artifactId>fest-assert-core</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml
index 5fd53a3c4..8c8ef5283 100644
--- a/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
+ <artifactId>fest-assert-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
index 559d23031..4d6198834 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
@@ -32,7 +32,7 @@ import org.apache.archiva.metadata.model.Organization;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.model.Scm;
-import org.fest.assertions.Assertions;
+import org.fest.assertions.api.Assertions;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml
index b0ff306cc..026551815 100644
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++ b/archiva-modules/plugins/metadata-store-file/pom.xml
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
+ <artifactId>fest-assert-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index eecfeeb05..5e0950e0f 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
+ <artifactId>fest-assert-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 9d94a8123..d039c0493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,8 +109,8 @@
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
- <version>1.4</version>
+ <artifactId>fest-assert-core</artifactId>
+ <version>2.0M6</version>
<scope>test</scope>
</dependency>
<dependency>