From 0321a820ce77143574f2b3fad160d5142428072c Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 18 Jan 2010 11:08:52 +0000 Subject: [PATCH 1/7] [maven-release-plugin] prepare branch archiva-1.3.x git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@900339 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1b8bba034..f0700d3e6 100644 --- a/pom.xml +++ b/pom.xml @@ -37,9 +37,9 @@ 1.4-SNAPSHOT http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/trunk - scm:svn:https://svn.apache.org/repos/asf/archiva/trunk - http://svn.apache.org/viewvc/archiva/trunk + scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.x + scm:svn:https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x + https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.x From 3411845c6b36a5e7deff82ca15a0f37dfba89050 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 18 Jan 2010 11:09:37 +0000 Subject: [PATCH 2/7] [maven-release-plugin] prepare release archiva-1.3.x git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@900342 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-configuration/pom.xml | 2 +- .../archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- .../archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- .../archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- .../archiva-web/archiva-applet/pom.xml | 2 +- .../archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- .../archiva-web/archiva-webapp/pom.xml | 2 +- .../archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc-services/pom.xml | 2 +- .../archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++---------- 42 files changed, 77 insertions(+), 77 deletions(-) diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index a74efdbaf..bc1412394 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index a5b48753e..c263046e9 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 31d4475d7..bdb4286ec 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 47832322c..8d5355c94 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 5d7053fea..67be5495c 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 995be9b2f..7c9422edf 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index c3c1d152e..7e85c935f 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 48b798bb9..14a95c10c 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-consumer-api diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 8984cc707..85badbae8 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-core-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 9dea01a0d..3c47c98dd 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-database-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index 3f9c5d677..a0c69d06f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 127474f71..bc3cc7082 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-lucene-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 1420afcab..8ae8c9c57 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-signature-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 5a24f2e3e..80f162137 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-consumers diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index d3d4fa9e8..0b91840e2 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 21b5831eb..9fc20eb40 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index c831fa689..7e14d1bbb 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index df8bef352..f9b1dc48e 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index f9e44d9ca..0fa1a4e66 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index e0bd46666..c184fa481 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 47a5af6c2..c8aaa9f23 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 1a6b7ba85..bbc16b4d6 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index cc2214218..63ffdc49a 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index b7ea95618..393649407 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index d08b711ad..317e1977a 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 264f69f28..55fc485a9 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 7c822a622..50e430804 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index 4bb54a8f6..35f2d5796 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-reporting diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 4f8b27919..58d80785d 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 5a317b861..ab2e9326c 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 214b122a5..31c42bb12 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -22,7 +22,7 @@ archiva-web org.apache.archiva - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 0affcaf62..8f0599370 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index bf8056ef7..0f3bce219 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-webapp war diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 1789dd3a7..e7506ccd3 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index b307f9b1b..3fa4e06b6 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-xmlrpc-api Archiva Web :: XML-RPC API diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index d869c76c1..3074bae94 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 159002b45..3329d1140 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-xmlrpc - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-xmlrpc-security Archiva Web :: XML-RPC Security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index f0d12c683..f43b19bdf 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-xmlrpc - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-xmlrpc-services Archiva Web :: XML-RPC Services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index d9abce24a..6198ebe65 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-xmlrpc Archiva Web :: XML-RPC diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index c4b17053d..275b2aa9c 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT archiva-web diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 84bf5eb2f..82b53f9fa 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index f0700d3e6..580bbd6c5 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT http://archiva.apache.org - scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.x - scm:svn:https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x - https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.x + scm:svn:http://svn.apache.org/repos/asf/archiva/trunk + scm:svn:https://svn.apache.org/repos/asf/archiva/trunk + http://svn.apache.org/viewvc/archiva/trunk @@ -293,160 +293,160 @@ org.apache.archiva archiva-applet - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-artifact-converter - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-artifact-reports - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-checksum - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-common - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-configuration - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-consumer-api - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-converter - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-dependency-graph - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-core-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-database - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-database-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-indexer - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-lucene-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-model - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-policies - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-proxy - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-report-manager - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-repository-layer - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-scheduled - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-security - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-signature-consumers - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-transaction - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-docs - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT zip docs org.apache.archiva archiva-webapp - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT war org.apache.archiva archiva-xml-tools - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-webdav - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-rss - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-api - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-services - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-security - 1.4-SNAPSHOT + 1.3.1-SNAPSHOT org.codehaus.plexus From f90bb19efececefa14e00450d17fe34914752b34 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 18 Jan 2010 11:20:28 +0000 Subject: [PATCH 3/7] restore versions on trunk git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@900345 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-configuration/pom.xml | 2 +- .../archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- .../archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- .../archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- .../archiva-web/archiva-applet/pom.xml | 2 +- .../archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- .../archiva-web/archiva-webapp/pom.xml | 2 +- .../archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc-services/pom.xml | 2 +- .../archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 64 +++++++++---------- 42 files changed, 74 insertions(+), 74 deletions(-) diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index bc1412394..a74efdbaf 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index c263046e9..a5b48753e 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index bdb4286ec..31d4475d7 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 8d5355c94..47832322c 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 67be5495c..5d7053fea 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 7c9422edf..995be9b2f 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 7e85c935f..c3c1d152e 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 14a95c10c..48b798bb9 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-consumer-api diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 85badbae8..8984cc707 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-core-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 3c47c98dd..9dea01a0d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-database-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index a0c69d06f..3f9c5d677 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index bc3cc7082..127474f71 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-lucene-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 8ae8c9c57..1420afcab 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-signature-consumers diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 80f162137..5a24f2e3e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-consumers diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 0b91840e2..d3d4fa9e8 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 9fc20eb40..21b5831eb 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 7e14d1bbb..c831fa689 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index f9b1dc48e..df8bef352 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 0fa1a4e66..f9e44d9ca 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index c184fa481..e0bd46666 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index c8aaa9f23..47a5af6c2 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index bbc16b4d6..1a6b7ba85 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index 63ffdc49a..cc2214218 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 393649407..b7ea95618 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 317e1977a..d08b711ad 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 55fc485a9..264f69f28 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 50e430804..7c822a622 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index 35f2d5796..4bb54a8f6 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-reporting diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 58d80785d..4f8b27919 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index ab2e9326c..5a317b861 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 31c42bb12..214b122a5 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -22,7 +22,7 @@ archiva-web org.apache.archiva - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 8f0599370..0affcaf62 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 0f3bce219..bf8056ef7 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-webapp war diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index e7506ccd3..1789dd3a7 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 3fa4e06b6..b307f9b1b 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-xmlrpc-api Archiva Web :: XML-RPC API diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index 3074bae94..d869c76c1 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 3329d1140..159002b45 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-xmlrpc - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-xmlrpc-security Archiva Web :: XML-RPC Security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index f43b19bdf..f0d12c683 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-xmlrpc - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-xmlrpc-services Archiva Web :: XML-RPC Services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index 6198ebe65..d9abce24a 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-xmlrpc Archiva Web :: XML-RPC diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 275b2aa9c..c4b17053d 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT archiva-web diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 82b53f9fa..84bf5eb2f 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index 580bbd6c5..1b8bba034 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ Archiva archiva pom - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT http://archiva.apache.org scm:svn:http://svn.apache.org/repos/asf/archiva/trunk @@ -293,160 +293,160 @@ org.apache.archiva archiva-applet - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-artifact-converter - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-artifact-reports - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-checksum - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-common - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-configuration - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-consumer-api - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-converter - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-dependency-graph - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-core-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-database - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-database-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-indexer - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-lucene-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-model - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-policies - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-proxy - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-report-manager - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-repository-layer - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-scheduled - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-security - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-signature-consumers - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-transaction - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-docs - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT zip docs org.apache.archiva archiva-webapp - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT war org.apache.archiva archiva-xml-tools - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-webdav - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-rss - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-xmlrpc-api - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-xmlrpc-services - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.apache.archiva archiva-xmlrpc-security - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT org.codehaus.plexus From b3440e6d18b851b8cc125c4c9caaa68234f11644 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Thu, 28 Jan 2010 09:42:53 +0000 Subject: [PATCH 4/7] [MRM-1320] Incorrect Archiva version specified for the "Process All Artifacts" feature in upgrade docs o update reference to version 1.2.3 to 1.3 instead git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@904015 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-docs/src/site/apt/adminguide/upgrade.apt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archiva-docs/src/site/apt/adminguide/upgrade.apt b/archiva-docs/src/site/apt/adminguide/upgrade.apt index 083ad7f4c..dd355ab8f 100644 --- a/archiva-docs/src/site/apt/adminguide/upgrade.apt +++ b/archiva-docs/src/site/apt/adminguide/upgrade.apt @@ -19,8 +19,8 @@ Upgrading Archiva Because of the changes in the search implementation starting in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.1.x to 1.2.x. Since the format of the index has changed in 1.2.x, the old index directory (which is located at <<>> by default) needs to be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated. - To do this, you can force Archiva to scan all the artifacts by ticking the 'Process All Artifacts' checkbox then clicking the 'Scan Repository Now' - button in the Repositories page. Take note though that this feature is only available starting with version 1.2.3. Otherwise, you must execute + To do this, you can force Archiva to scan all the artifacts by ticking the <<>> checkbox then clicking the <<>> + button in the Repositories page. Take note though that this feature is only available starting with version 1.3. Otherwise, you must execute <> at the base directory where the repository resides and then force execute the repository scanning so that the new index will be generated. From a70f43c67cae4efa5a154b4902ce99ab5700556a Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Thu, 28 Jan 2010 10:30:09 +0000 Subject: [PATCH 5/7] [MRM-1310] Include Audit Log report in feature tour git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@904029 13f79535-47bb-0310-9956-ffa450edef68 --- .../site/resources/images/tour/audit-log.png | Bin 0 -> 56351 bytes archiva-docs/src/site/xdoc/tour/audit-log.xml | 26 ++++++++++++++++++ archiva-docs/src/site/xdoc/tour/index.xml | 8 +++++- .../src/site/xdoc/tour/maintenance.xml | 2 +- archiva-docs/src/site/xdoc/tour/reports.xml | 2 +- 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 archiva-docs/src/site/resources/images/tour/audit-log.png create mode 100644 archiva-docs/src/site/xdoc/tour/audit-log.xml diff --git a/archiva-docs/src/site/resources/images/tour/audit-log.png b/archiva-docs/src/site/resources/images/tour/audit-log.png new file mode 100644 index 0000000000000000000000000000000000000000..000dd3802f9ddba9db256bb051e3510f28d8f179 GIT binary patch literal 56351 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 z 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 + + + Audit Log Report + Maria Odea Ching + + + + +
+
+ +

+ Archiva provides a user interface for querying audit logs. The current + implementation only covers upload/deploy actions but will include other + actions such as artifact delete, repository configuration and more in the future. +

+

+ Previous: Integrity Reports | + Audit Log Report | + Next: Maintenance +

+
+
+ + diff --git a/archiva-docs/src/site/xdoc/tour/index.xml b/archiva-docs/src/site/xdoc/tour/index.xml index 66a19f102..d08f65d68 100644 --- a/archiva-docs/src/site/xdoc/tour/index.xml +++ b/archiva-docs/src/site/xdoc/tour/index.xml @@ -91,10 +91,16 @@ table.bodyTable tr.b { 9. Integrity Reports + + +
+ 10. Audit Log Report + +
- 10. Maintenance + 11. Maintenance diff --git a/archiva-docs/src/site/xdoc/tour/maintenance.xml b/archiva-docs/src/site/xdoc/tour/maintenance.xml index a45603889..d7bf8ddcc 100644 --- a/archiva-docs/src/site/xdoc/tour/maintenance.xml +++ b/archiva-docs/src/site/xdoc/tour/maintenance.xml @@ -18,7 +18,7 @@ enable or disable these consumers.

- Previous: Integrity Reports | + Previous: Audit Log Report | Maintenance | Next: Feature Tour

diff --git a/archiva-docs/src/site/xdoc/tour/reports.xml b/archiva-docs/src/site/xdoc/tour/reports.xml index d48a0cddf..a26c8a5fd 100644 --- a/archiva-docs/src/site/xdoc/tour/reports.xml +++ b/archiva-docs/src/site/xdoc/tour/reports.xml @@ -18,7 +18,7 @@

Previous: Role-based Security | Integrity Reports | - Next: Maintenance + Next: Audit Log Report

From 1d8d52338c1ff2c7a610ebea478f1a2d5205cf48 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Wed, 3 Feb 2010 10:14:31 +0000 Subject: [PATCH 6/7] fixed failing selenium tests by: o adding check if already in the page before attempting to click the link in nav menu o adding dependency to previous test for adding repository so proper order is executed git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@905969 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/web/test/RepositoryTest.java | 1 + .../archiva/web/test/parent/AbstractArchivaTest.java | 5 ++++- .../archiva/web/test/parent/AbstractRepositoryTest.java | 9 ++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java index c22e02be7..ee49694d3 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java @@ -36,6 +36,7 @@ public class RepositoryTest assertRepositoriesPage(); } + @Test(dependsOnMethods = { "testAddManagedRepoValidValues" } ) public void testAddManagedRepoInvalidValues() { goToRepositoriesPage(); diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java index 95e2fa853..9209d6f60 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java @@ -503,7 +503,10 @@ public abstract class AbstractArchivaTest public void goToRepositoriesPage() { - clickLinkWithText( "Repositories" ); + if( !getTitle().equals( "Apache Archiva \\ Administration - Repositories" ) ) + { + clickLinkWithText( "Repositories" ); + } assertRepositoriesPage(); } diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java index 52f02ef8a..6c8e66209 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java @@ -28,7 +28,10 @@ public abstract class AbstractRepositoryTest // Repository Groups public void goToRepositoryGroupsPage() { - clickLinkWithText( "Repository Groups" ); + if( !getTitle().equals( "Apache Archiva \\ Administration - Repository Groups" ) ) + { + clickLinkWithText( "Repository Groups" ); + } assertRepositoryGroupsPage(); } @@ -288,8 +291,8 @@ public abstract class AbstractRepositoryTest } public void editManagedRepository( String fieldName, String value ) - { - //goToRepositoriesPage(); + { + goToRepositoriesPage(); clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" ); assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" ); setFieldValue(fieldName, value); From bfe9d3b48d8bbfa2ca389a9f80036e825d50938a Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Wed, 3 Feb 2010 11:11:06 +0000 Subject: [PATCH 7/7] [MRM-1316] audit log report does not restrict events to repositories that you are a manager of o filter the results and show only actions performed on repos which the user has access to o added selenium test git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@905996 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/resources/testng.properties | 7 +++ .../archiva/web/test/AuditLogsReportTest.java | 36 +++++++++++++++ .../reports/ViewAuditLogReportAction.java | 45 ++++++++++++++++++- 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties index 3940355ab..778d802e5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties @@ -77,6 +77,13 @@ PACKAGING1=jar ARTIFACTFILEPATH1=test REPOSITORYID1=internal +SNAPSHOT_GROUPID=org.apache.archiva +SNAPSHOT_ARTIFACTID=archiva-test +SNAPSHOT_VERSION=1.0-SNAPSHOT +SNAPSHOT_PACKAGING=jar +SNAPSHOT_ARTIFACTFILEPATH=test +SNAPSHOT_REPOSITORYID=snapshots + # REPOSITORIES # Manage Repositories MANAGED_IDENTIFIER=testing1 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java index daedc24a9..0f3dcc6c4 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java @@ -128,4 +128,40 @@ public class AuditLogsReportTest assertTextPresent( "internal" ); assertTextPresent( "admin" ); } + + @Test (dependsOnMethods = { "testAddArtifactValidValues", "testUserWithRepoManagerInternalRole" }, enabled = false ) + public void testViewAuditLogsViewAuditEventsForManageableRepositoriesOnly() + { + String groupId = getProperty( "SNAPSHOT_GROUPID" ); + String artifactId = getProperty( "SNAPSHOT_ARTIFACTID" ); + String version = getProperty( "SNAPSHOT_VERSION" ); + String repo = getProperty( "SNAPSHOT_REPOSITORYID" ); + String packaging = getProperty( "SNAPSHOT_PACKAGING" ); + + addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repo ); + assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + version + + "' was successfully deployed to repository '" + repo + "'" ); + + clickLinkWithText( "Logout" ); + + login( getProperty( "REPOMANAGER_INTERNAL_USERNAME" ), getUserRolePassword() ); + goToAuditLogReports(); + assertAuditLogsReportPage(); + + selectValue( "repository", "all" ); + submit(); + + assertAuditLogsReportPage(); + assertTextPresent( "Results" ); + assertTextNotPresent( "No audit logs found." ); + assertTextPresent( "test-1.0.jar" ); + assertTextPresent( "Uploaded File" ); + assertTextPresent( "internal" ); + assertTextPresent( "admin" ); + + assertTextNotPresent( artifactId + "-" + version + "." + packaging ); + + clickLinkWithText( "Logout" ); + login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) ); + } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java index 298a6d996..5c0aec712 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java @@ -149,7 +149,7 @@ public class ViewAuditLogReportAction } SimpleConstraint constraint = new MostRecentArchivaAuditLogsConstraint(); - auditLogs = (List) dao.query( constraint ); + auditLogs = filterLogs( (List) dao.query( constraint ) ); } public String execute() @@ -216,7 +216,8 @@ public class ViewAuditLogReportAction try { - auditLogs = auditLogsDao.queryAuditLogs( constraint ); + auditLogs = filterLogs( auditLogsDao.queryAuditLogs( constraint ) ); + if( auditLogs.isEmpty() ) { addActionError( "No audit logs found." ); @@ -244,6 +245,25 @@ public class ViewAuditLogReportAction return SUCCESS; } + private List filterLogs( List auditLogs ) + { + List observableRepos = getManageableRepositories(); + List filteredAuditLogs = new ArrayList(); + + if( auditLogs != null ) + { + for( ArchivaAuditLogs auditLog : auditLogs ) + { + if( observableRepos.contains( auditLog.getRepositoryId() ) ) + { + filteredAuditLogs.add( auditLog ); + } + } + } + + return filteredAuditLogs; + } + private void paginate() { if ( auditLogs.size() <= rowCount ) @@ -270,6 +290,27 @@ public class ViewAuditLogReportAction next = StringUtils.replace( next, " ", "%20" ); } + private List getManageableRepositories() + { + try + { + return userRepositories.getManagableRepositoryIds( getPrincipal() ); + } + catch ( PrincipalNotFoundException e ) + { + log.warn( e.getMessage(), e ); + } + catch ( AccessDeniedException e ) + { + log.warn( e.getMessage(), e ); + } + catch ( ArchivaSecurityException e ) + { + log.warn( e.getMessage(), e ); + } + return Collections.emptyList(); + } + private List getObservableRepositories() { try