You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/02/11 12:34:23 UTC
[1/2] archiva git commit: add missing dependency
Repository: archiva
Updated Branches:
refs/heads/master 1feb9a99f -> 28dae86be
add missing dependency
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4374c550
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4374c550
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4374c550
Branch: refs/heads/master
Commit: 4374c550e4a082fbc290826abca0b1244f6eee43
Parents: 1feb9a9
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed Feb 11 22:32:54 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Feb 11 22:32:54 2015 +1100
----------------------------------------------------------------------
.../rest/services/BrowseServiceTest.java | 30 +++++++++++++-------
.../archiva-web/archiva-web-common/pom.xml | 7 ++++-
2 files changed, 25 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/4374c550/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
----------------------------------------------------------------------
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 8c5ac14..848d4b7 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
@@ -89,26 +89,34 @@ public class BrowseServiceTest
public void metadatagetthenaddthendelete()
throws Exception
{
- scanRepo( TEST_REPO_ID );
+ try
+ {
+ scanRepo( TEST_REPO_ID );
- BrowseService browseService = getBrowseService( authorizationHeader, false );
+ BrowseService browseService = getBrowseService( authorizationHeader, false );
- Map<String, String> metadatas =
- toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) );
+ Map<String, String> metadatas =
+ toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) );
- assertThat( metadatas ).isNotNull().isEmpty();
+ assertThat( metadatas ).isNotNull().isEmpty();
- browseService.addMetadata( "commons-cli", "commons-cli", "1.0", "wine", "bordeaux", TEST_REPO_ID );
+ browseService.addMetadata( "commons-cli", "commons-cli", "1.0", "wine", "bordeaux", TEST_REPO_ID );
- metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) );
+ metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) );
- assertThat( metadatas ).isNotNull().isNotEmpty().contains( MapEntry.entry( "wine", "bordeaux" ) );
+ assertThat( metadatas ).isNotNull().isNotEmpty().contains( MapEntry.entry( "wine", "bordeaux" ) );
- browseService.deleteMetadata( "commons-cli", "commons-cli", "1.0", "wine", TEST_REPO_ID );
+ browseService.deleteMetadata( "commons-cli", "commons-cli", "1.0", "wine", TEST_REPO_ID );
- metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) );
+ metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) );
- assertThat( metadatas ).isNotNull().isEmpty();
+ assertThat( metadatas ).isNotNull().isEmpty();
+ }
+ catch ( ArchivaRestServiceException e )
+ {
+ log.error( e.getMessage(), e );
+ throw e;
+ }
}
@Test
http://git-wip-us.apache.org/repos/asf/archiva/blob/4374c550/archiva-modules/archiva-web/archiva-web-common/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index f392d94..b91634c 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -266,7 +266,12 @@
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
[2/2] archiva git commit: format
Posted by ol...@apache.org.
format
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/28dae86b
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/28dae86b
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/28dae86b
Branch: refs/heads/master
Commit: 28dae86beaf01bc0646a65e2fe31738d7c5727cd
Parents: 4374c55
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed Feb 11 22:34:16 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Feb 11 22:34:16 2015 +1100
----------------------------------------------------------------------
.../DownloadArtifactFromQueryTest.java | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/28dae86b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
index c108af3..cedd46a 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
@@ -52,8 +52,7 @@ public class DownloadArtifactFromQueryTest
previousAppServerBase = System.getProperty( "appserver.base" );
System.setProperty( "appserver.base",
new File( System.getProperty( "java.io.tmpdir" ) ).getCanonicalPath() + "/target/"
- + DownloadArtifactFromQueryTest.class.getName()
- );
+ + DownloadArtifactFromQueryTest.class.getName() );
}
@AfterClass
@@ -139,11 +138,8 @@ public class DownloadArtifactFromQueryTest
String location = String.class.cast( response.getMetadata().get( "Location" ).get( 0 ) );
- /// http://localhost:57168/repository/1400639145722/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
-
Assert.assertEquals( "http://localhost:" + port + "/repository/" + id
- + "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar", location
- );
+ + "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar", location );
}
finally
{
@@ -172,8 +168,7 @@ public class DownloadArtifactFromQueryTest
/// http://localhost:57168/repository/1400639145722/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
Assert.assertEquals( "http://localhost:" + port + "/repository/" + id
- + "/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar", location
- );
+ + "/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar", location );
}
@@ -193,8 +188,8 @@ public class DownloadArtifactFromQueryTest
try
{
Response response =
- getSearchService().redirectToArtifactFile( null, "org.apache.archiva.beer", "archiva-wine", "LATEST", null,
- null );
+ getSearchService().redirectToArtifactFile( null, "org.apache.archiva.beer", "archiva-wine", "LATEST",
+ null, null );
Assert.assertEquals( Response.Status.NO_CONTENT.getStatusCode(), response.getStatus() );