You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2011/04/12 09:16:40 UTC
svn commit: r1091315 [4/4] - in /archiva/trunk: ./ archiva-docs/
archiva-docs/src/site/apt/ archiva-modules/archiva-base/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modu...
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:699795-705848
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:699795-705848
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:699795-705848
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:699795-705848
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:699795-705848
/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:825850-889227,889228-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:699795-705848
/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:699795-705848
/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:699795-705848
/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:699795-705848
/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:825850-889227,889228-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:699795-705848
/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/pom.xml:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/pom.xml:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/pom.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/pom.xml:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml:825850-909464
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-909464,960322
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Apr 12 07:16:34 2011
@@ -539,7 +539,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -1273,6 +1273,25 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>snapshots-build</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>redback.snapshots</id>
+ <name>Codehaus Redback Snapshots Repository</name>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
</profiles>
<!-- TODO: we need to push this into the parent, and also upgrade to the latest ASF parent POM -->
<distributionManagement>
Propchange: archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1 +1,2 @@
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/META-INF/maven/site.vm:1066068-1091313
/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464,960322
Propchange: archiva/trunk/skin/src/main/resources/css/maven-base.css
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1 +1,2 @@
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/css/maven-base.css:1066068-1091313
/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464,960322
Propchange: archiva/trunk/skin/src/main/resources/css/print.css
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1 +1,2 @@
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/css/print.css:1066068-1091313
/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464,960322
Propchange: archiva/trunk/skin/src/main/resources/images/logos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1 +1,2 @@
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/images/logos:1066068-1091313
/archiva/trunk/skin/src/main/resources/images/logos:899478-909464,960322