Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:825850-883981,883982-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:825850-883981,883982-887039*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:825850-885005 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:825850-887039 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-885005 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-887039 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:825850-883981,883982-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:825850-883981,883982-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:825850-883981,883982-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:825850-883981,883982-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:825850-885005 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:825850-887039 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:825850-882383,883982-885005 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:825850-882383,883982-887039 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-885005 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-887039 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources:686983-687034 /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-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:686983-687034 +/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-887039 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:825850-882383,885006-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:825850-882383,885006-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:825850-882383,885006-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:825850-882383,885006-887039 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:686983-687034 /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-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:686983-687034 /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-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:686983-687034 /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-885005* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-887039* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 03:00:22 2009 @@ -2,4 +2,4 @@ /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-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-885005 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-887039 Modified: archiva/branches/MRM-1025/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/pom.xml?rev=887043&r1=887042&r2=887043&view=diff ============================================================================== --- archiva/branches/MRM-1025/pom.xml (original) +++ archiva/branches/MRM-1025/pom.xml Fri Dec 4 03:00:22 2009 @@ -1221,28 +1221,4 @@ </build> </profile> </profiles> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>sonatype.public</id> - <name>Sonatype Public Repo</name> - <url>http://repository.sonatype.org/content/repositories/sonatype-apache-releases</url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>codehaus.org.snapshots</id> - <name>Codehaus Snapshots Repository</name> - <url>http://snapshots.repository.codehaus.org</url> - </repository> - </repositories> </project>
