Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8A7C910AC3 for ; Wed, 11 Feb 2015 11:34:23 +0000 (UTC) Received: (qmail 30351 invoked by uid 500); 11 Feb 2015 11:34:23 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 30306 invoked by uid 500); 11 Feb 2015 11:34:23 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 30291 invoked by uid 99); 11 Feb 2015 11:34:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2015 11:34:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3AD02E03C8; Wed, 11 Feb 2015 11:34:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: olamy@apache.org To: commits@archiva.apache.org Date: Wed, 11 Feb 2015 11:34:23 -0000 Message-Id: <6780452824404e31959a47627a34530a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Feb 11 22:32:54 2015 +1100 Committer: Olivier Lamy 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 metadatas = - toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) ); + Map 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 @@ slf4j-simple - + + + org.slf4j + jul-to-slf4j + test + org.apache.maven.wagon wagon-http