Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-909464,960322,1215126
Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:825850-885005,885006-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:825850-885005,885006-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:825850-885005,885006-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:825850-885005,885006-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:825850-885005,885006-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:825850-885005,885006-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:825850-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -1,2 +1,2 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1066068-1091313,1098897,1102210,1103608 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:889228-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:889228-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:825850-882383,885006-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:825850-882383,885006-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-909464*,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:1066068-1091313,1098897,1102210,1103608 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:825850-882383,885006-909464,960322 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:825850-882383,885006-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:825850-889227,889228-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:825850-889227,889228-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/pom.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/pom.xml:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml:825850-909464,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -3,4 +3,4 @@ /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:1066068-1091313,1098897,1102210,1103608 /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 +/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/skin/src/main/resources/META-INF/maven/site.vm ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -1,2 +1,2 @@ /archiva/branches/archiva-1.3.x/skin/src/main/resources/META-INF/maven/site.vm:1066068-1091313,1098897,1102210,1103608 -/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464,960322 +/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/skin/src/main/resources/css/maven-base.css ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -1,2 +1,2 @@ /archiva/branches/archiva-1.3.x/skin/src/main/resources/css/maven-base.css:1066068-1091313,1098897,1102210,1103608 -/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464,960322 +/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/skin/src/main/resources/css/print.css ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -1,2 +1,2 @@ /archiva/branches/archiva-1.3.x/skin/src/main/resources/css/print.css:1066068-1091313,1098897,1102210,1103608 -/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464,960322 +/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464,960322,1215126 Propchange: archiva/tags/archiva-1.4-M2/skin/src/main/resources/images/logos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 20:36:55 2011 @@ -1,2 +1,2 @@ /archiva/branches/archiva-1.3.x/skin/src/main/resources/images/logos:1066068-1091313,1098897,1102210,1103608 -/archiva/trunk/skin/src/main/resources/images/logos:899478-909464,960322 +/archiva/trunk/skin/src/main/resources/images/logos:899478-909464,960322,1215126
