From dc625beeb189ff1a098800173375aa69e0a344d9 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Sun, 4 Jul 2010 11:16:31 +0000 Subject: [PATCH] [MRM-980] ability to merge repositories submitted by Patti Arachchige Eshan Sudharaka o added artifacts to test-repository to be used for repo merge git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@960320 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/archiva/1.2.1/archiva-1.2.1.jar | Bin 0 -> 2124 bytes .../archiva/archiva/1.2.1/maven-metadata.xml | 9 + .../archiva/archiva/1.2.2/archiva-1.2.2.jar | Bin 0 -> 2124 bytes .../archiva/archiva/1.2.2/archiva-1.2.2.pom | 1199 +++++++++++++++++ .../archiva/archiva/1.2.2/maven-metadata.xml | 9 + .../apache/archiva/archiva/maven-metadata.xml | 14 + .../Maven2RepositoryMetadataResolverTest.java | 2 +- .../merge/repomerge/ArtifactsMergerTest.java | 8 +- .../archiva/archiva/1.2.1/maven-metadata.xml | 2 +- .../apache/archiva/archiva/maven-metadata.xml | 7 +- 10 files changed, 1241 insertions(+), 9 deletions(-) create mode 100644 archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar create mode 100644 archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/maven-metadata.xml create mode 100644 archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.jar create mode 100644 archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.pom create mode 100644 archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/maven-metadata.xml create mode 100644 archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/maven-metadata.xml diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..3176aff718a17ae644d9f75bdc38d3cedef6512a GIT binary patch literal 2124 zcmWIWW@h1H0D+0ASvFt>l;8x?zOEsTx}JV+`TRsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5DbO#B02L+eR)mkee!!0z~I7qZc_;k=`pp2JsvDbk|o~|oZRRtPFV%JZ}neZ~L zitS_Dvpq3;Vi;iVVgS1f=oC0$1+q#~i%Za){`}aKUw(`X4BSi%416#pjs*pJ$vKI| z#kqmL-iI9oYHzRiP1>?`>(}UL|IiCEwjnHnN1Ou|2Jz3^_BLpH&ZJ3sto766L~MRA z{|S7gvQ}ha^^D_tW>)@A`~Lg+XYNRu#|Io4v&~kmh>R%T(CFKz+n3vRXeQTG%k&dw z{MI}>Pp{CI?Apim^sLH@Q$ONLObt`*Uvb_Q-01a5a;C9=)|m%C-1>UU4W+hraJO(t zW}S7f*O=G3+|}a4Ew!+R3#Q&vc*J-%L~M%ZN?G4W^Y#RF?s9EX_ngel*PVR)sNOe; zJJ~BsL+U${?&cS~*}Y=1Q39sUpx8DVPJ7d4XtA0ndwi(5s`zQw)lY|4^LaU ziDjvI@MywJhzgjBlk;=+QY#X33vyERP$C&qw;mC?K}P5%7L{bCB_<;$m>ytSPrY-( zCJUHgG?^I~Oi4DY0O-()+??Lv*z9Hlk=pm`1#YhHjQwq(BK&Qe<8CplWB0tI@^h_x zorLU<-Kd`*7+o50WA^ts#l`13y{1e{Pq?=Fv(F6o|0!#`49;b8G6lNcdX>}FMOW{(Ka{Co6TUmma5$sAL*Coo^+aJQ~8BumbQ8P3KdP3fvZv%#!Z@WQpVA@cq-$j1f7H8 z$5yV`_QzvpuA4jC^qCI?AGi1}^Pg2T@mTsQPB}OCX?x$xv>tr-HFJ0My*+|4eU~_9 z9gc4oD^6Ls`NuI{fj1uNUJi{O4hDS37?WSDW_DY9zV*T7Rl2rXSGAX!MqgC@&Sbmb z=Mpz>X|>Sntq3I4EdaMfh;H%?(_Hhs&`==V=ZV?_{ z5uV;PK0a%DdPQTJokep9N~EZP{EM3`}x%|Pz}fdIo>M-UD7 z8A2QOvKpiq1eP?a14+0xq>>w90`^iBtQ~CeejpQ?{a|i|Sc+cCLbQM^eFW12FLRNt z!&XiptcwAb*>DHLN)4FBm^ohoW-HjOotT<2q931AK;;MofP(xu5vHLgCWP4>4A{yQ znCVLzg@Gjvnl~|AifT5rltH!v6q4wvA7RA>7ILgW + + + org.apache.archiva + archiva + 1.2.1 + + + diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.jar b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..3176aff718a17ae644d9f75bdc38d3cedef6512a GIT binary patch literal 2124 zcmWIWW@h1H0D+0ASvFt>l;8x?zOEsTx}JV+`TRsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5DbO#B02L+eR)mkee!!0z~I7qZc_;k=`pp2JsvDbk|o~|oZRRtPFV%JZ}neZ~L zitS_Dvpq3;Vi;iVVgS1f=oC0$1+q#~i%Za){`}aKUw(`X4BSi%416#pjs*pJ$vKI| z#kqmL-iI9oYHzRiP1>?`>(}UL|IiCEwjnHnN1Ou|2Jz3^_BLpH&ZJ3sto766L~MRA z{|S7gvQ}ha^^D_tW>)@A`~Lg+XYNRu#|Io4v&~kmh>R%T(CFKz+n3vRXeQTG%k&dw z{MI}>Pp{CI?Apim^sLH@Q$ONLObt`*Uvb_Q-01a5a;C9=)|m%C-1>UU4W+hraJO(t zW}S7f*O=G3+|}a4Ew!+R3#Q&vc*J-%L~M%ZN?G4W^Y#RF?s9EX_ngel*PVR)sNOe; zJJ~BsL+U${?&cS~*}Y=1Q39sUpx8DVPJ7d4XtA0ndwi(5s`zQw)lY|4^LaU ziDjvI@MywJhzgjBlk;=+QY#X33vyERP$C&qw;mC?K}P5%7L{bCB_<;$m>ytSPrY-( zCJUHgG?^I~Oi4DY0O-()+??Lv*z9Hlk=pm`1#YhHjQwq(BK&Qe<8CplWB0tI@^h_x zorLU<-Kd`*7+o50WA^ts#l`13y{1e{Pq?=Fv(F6o|0!#`49;b8G6lNcdX>}FMOW{(Ka{Co6TUmma5$sAL*Coo^+aJQ~8BumbQ8P3KdP3fvZv%#!Z@WQpVA@cq-$j1f7H8 z$5yV`_QzvpuA4jC^qCI?AGi1}^Pg2T@mTsQPB}OCX?x$xv>tr-HFJ0My*+|4eU~_9 z9gc4oD^6Ls`NuI{fj1uNUJi{O4hDS37?WSDW_DY9zV*T7Rl2rXSGAX!MqgC@&Sbmb z=Mpz>X|>Sntq3I4EdaMfh;H%?(_Hhs&`==V=ZV?_{ z5uV;PK0a%DdPQTJokep9N~EZP{EM3`}x%|Pz}fdIo>M-UD7 z8A2QOvKpiq1eP?a14+0xq>>w90`^iBtQ~CeejpQ?{a|i|Sc+cCLbQM^eFW12FLRNt z!&XiptcwAb*>DHLN)4FBm^ohoW-HjOotT<2q931AK;;MofP(xu5vHLgCWP4>4A{yQ znCVLzg@Gjvnl~|AifT5rltH!v6q4wvA7RA>7ILgW + + + + + 4.0.0 + + 2.0.6 + + + + org.apache.archiva + archiva-parent + 3 + ../parent/pom.xml + + Archiva + archiva + pom + 1.2.1 + http://archiva.apache.org + + scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 + scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 + http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.1 + + + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + + process + + + + org.apache:apache-jar-resource-bundle:1.3 + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0-alpha-4 + + + + enforce + + + + + + org.codehaus.plexus:plexus-container-default + org.codehaus.plexus:plexus-log4j-logging + commons-logging:commons-logging + velocity:velocity-dep + classworlds:classworlds + javax.transaction:jta + javax.sql:jdbc-stdext + ant:ant-optional + xom:xom + org.codehaus.plexus:plexus-xwork-integration + + + + + + + + + org.codehaus.plexus + plexus-component-metadata + 1.0-beta-3.0.5 + + + generate + + generate-metadata + + + + + + + + + org.codehaus.modello + modello-maven-plugin + 1.0 + + true + + + + org.codehaus.modello + modello-plugin-plexus-registry + 1.0-alpha-21 + + + org.codehaus.modello + modello-plugin-jpox + 1.0-alpha-21 + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-3 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.0-beta-2 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.3 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.0-alpha-4 + + + org.apache.maven.plugins + maven-install-plugin + 2.2 + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + org.apache.maven.plugins + maven-release-plugin + 2.0-beta-7 + + https://svn.apache.org/repos/asf/archiva/tags + false + deploy + clean install + -Prelease + + + + org.apache.maven.plugins + maven-resources-plugin + 2.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.2 + + true + + + + maven-idea-plugin + + 1.5 + + + + + + + archiva-cli + archiva-docs + archiva-jetty + archiva-modules + + + + junit + junit + 3.8.1 + test + + + easymock + easymock + 1.2_Java1.3 + test + + + easymock + easymockclassextension + 1.2 + test + + + + + + httpunit + httpunit + 1.6.2 + test + + + org.apache.jackrabbit + jackrabbit-webdav + 1.5.0 + + + commons-logging + commons-logging + + + + + xerces + xercesImpl + 2.8.1 + + + org.sonatype.nexus + nexus-indexer + 2.0.0 + + + org.codehaus.plexus + plexus-container-default + + + classworlds + classworlds + + + commons-logging + commons-logging + + + velocity + velocity-dep + + + org.apache.maven + maven-plugin-registry + + + org.apache.maven + maven-settings + + + + + javax.activation + activation + 1.1 + + + org.apache.archiva + archiva-applet + 1.2.1 + + + org.apache.archiva + archiva-artifact-converter + 1.2.1 + + + org.apache.archiva + archiva-artifact-reports + 1.2.1 + + + org.apache.archiva + archiva-checksum + 1.2.1 + + + org.apache.archiva + archiva-common + 1.2.1 + + + org.apache.archiva + archiva-configuration + 1.2.1 + + + org.apache.archiva + archiva-consumer-api + 1.2.1 + + + org.apache.archiva + archiva-converter + 1.2.1 + + + org.apache.archiva + archiva-dependency-graph + 1.2.1 + + + org.apache.archiva + archiva-core + 1.2-SNAPSHOT + + + org.apache.archiva + archiva-core-consumers + 1.2.1 + + + org.apache.archiva + archiva-database + 1.2.1 + + + org.apache.archiva + archiva-database-consumers + 1.2.1 + + + org.apache.archiva + archiva-indexer + 1.2.1 + + + org.apache.archiva + archiva-lucene-consumers + 1.2.1 + + + org.apache.archiva + archiva-model + 1.2.1 + + + org.apache.archiva + archiva-policies + 1.2.1 + + + org.apache.archiva + archiva-proxy + 1.2.1 + + + org.apache.archiva + archiva-report-manager + 1.2.1 + + + org.apache.archiva + archiva-repository-layer + 1.2.1 + + + org.apache.archiva + archiva-scheduled + 1.2.1 + + + org.apache.archiva + archiva-security + 1.2.1 + + + org.apache.archiva + archiva-signature-consumers + 1.2.1 + + + org.apache.archiva + archiva-transaction + 1.2.1 + + + org.apache.archiva + archiva-docs + 1.2.1 + zip + docs + + + org.apache.archiva + archiva-webapp + 1.2.1 + war + + + org.apache.archiva + archiva-xml-tools + 1.2.1 + + + org.apache.archiva + archiva-webdav + 1.2.1 + + + org.apache.archiva + archiva-rss + 1.2.1 + + + org.apache.archiva + archiva-xmlrpc-api + 1.2.1 + + + org.apache.archiva + archiva-xmlrpc-services + 1.2.1 + + + org.apache.archiva + archiva-xmlrpc-security + 1.2.1 + + + org.codehaus.plexus + plexus-spring + 1.2 + + + org.codehaus.plexus + plexus-container-default + + + + + stax + stax + 1.2.0 + + + commons-codec + commons-codec + 1.3 + + + commons-collections + commons-collections + 3.2 + + + commons-fileupload + commons-fileupload + 1.2 + + + commons-io + commons-io + 1.4 + + + commons-lang + commons-lang + 2.2 + + + org.apache.derby + derby + 10.1.3.1 + + + org.apache.derby + derbytools + 10.1.3.1 + + + dom4j + dom4j + 1.6.1 + + + hsqldb + hsqldb + 1.8.0.7 + test + + + jaxen + jaxen + 1.1 + + + xom + xom + + + + + javax.jdo + jdo2-api + 2.0 + + + jpox + jpox + 1.1.9 + + + javax.transaction + jta + + + + + javax.servlet + jsp-api + 2.0 + provided + + + javax.servlet + jstl + 1.1.2 + + + log4j + log4j + 1.2.14 + + + org.apache.lucene + lucene-core + 2.4.0 + + + org.apache.lucene + lucene-queries + 2.4.0 + + + javax.mail + mail + 1.4 + + + org.apache.xmlrpc + xmlrpc-server + 3.1 + + + org.apache.maven + maven-artifact-manager + ${maven.version} + + + org.codehaus.plexus + plexus-container-default + + + + + org.apache.maven + maven-model + ${maven.version} + + + org.apache.maven + maven-repository-metadata + ${maven.version} + + + org.codehaus.plexus + plexus-component-api + 1.0-alpha-22 + + + org.codehaus.plexus + plexus-digest + 1.1 + + + org.codehaus.plexus + plexus-expression-evaluator + 1.0-rc1 + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus + plexus-i18n + 1.0-beta-6 + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus + plexus-jdo2 + 1.0-alpha-8 + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus + plexus-quartz + 1.0-alpha-3 + + + commons-logging + commons-logging + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus + plexus-slf4j-logging + 1.1-alpha-1 + + + org.slf4j + slf4j-simple + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus + plexus-taskqueue + 1.0-alpha-8 + + + org.codehaus.plexus + plexus-utils + 1.4.5 + + + org.codehaus.plexus.cache + plexus-cache-api + 1.0-alpha-2 + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus.cache + plexus-cache-ehcache + 1.0-alpha-2 + + + org.codehaus.plexus + plexus-container-default + + + + + + + + org.codehaus.redback + redback-rbac-memory + ${redback.version} + test + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-users-memory + ${redback.version} + test + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-keys-memory + ${redback.version} + test + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-rbac-model + ${redback.version} + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-authorization-rbac + ${redback.version} + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-rbac-role-manager + ${redback.version} + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-system + ${redback.version} + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-common-integrations + ${redback.version} + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-struts2-content + ${redback.version} + war + + + classworlds + classworlds + + + commons-logging + commons-logging + + + + + org.codehaus.redback + redback-struts2-integration + ${redback.version} + + + classworlds + classworlds + + + velocity + velocity-dep + + + commons-logging + commons-logging + + + + + + + + org.codehaus.plexus.registry + plexus-registry-api + 1.0-alpha-2 + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus.registry + plexus-registry-commons + 1.0-alpha-2 + + + ant + ant-optional + + + jdom + jdom + + + commons-logging + commons-logging-api + + + commons-logging + commons-logging + + + + + javax.servlet + servlet-api + 2.4 + + + opensymphony + sitemesh + 2.2.1 + + + org.slf4j + jcl104-over-slf4j + 1.5.0 + runtime + + + org.slf4j + slf4j-api + 1.5.0 + + + org.slf4j + slf4j-simple + 1.5.0 + test + + + org.slf4j + slf4j-log4j12 + 1.5.0 + runtime + + + taglibs + standard + 1.1.2 + + + org.apache.maven.wagon + wagon-file + ${wagon.version} + + + org.apache.maven.wagon + wagon-http-lightweight + ${wagon.version} + + + nekohtml + xercesMinimal + + + + + org.apache.maven.wagon + wagon-provider-api + ${wagon.version} + + + org.apache.struts + struts2-core + 2.0.11.2 + + + commons-logging + commons-logging + + + + + org.apache.struts + struts2-spring-plugin + 2.0.11.2 + + + commons-logging + commons-logging + + + + + xmlunit + xmlunit + 1.0 + + + joda-time + joda-time + 1.5.2 + + + org.mortbay.jetty + jetty + ${jetty.version} + + + + + com.atlassian.xmlrpc + atlassian-xmlrpc-binder-annotations + ${binder.version} + + + com.atlassian.xmlrpc + atlassian-xmlrpc-binder-server-spring + ${binder.version} + + + commons-logging + commons-logging + + + + + com.atlassian.xmlrpc + atlassian-xmlrpc-binder + ${binder.version} + + + com.atlassian.xmlrpc + atlassian-xmlrpc-binder-testing + ${binder.version} + test + + + + + org.springframework + spring-context + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-web + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-beans + ${spring.version} + + + commons-logging + commons-logging + + + + + + org.apache.maven + maven-artifact + ${maven.version} + + + org.apache.maven + maven-project + ${maven.version} + + + org.codehaus.plexus + plexus-container-default + + + + + jdom + jdom + 1.0 + + + org.apache.maven.shared + maven-model-converter + 2.1 + + + org.codehaus.plexus + plexus-container-default + + + + + net.sf.ehcache + ehcache + 1.3.0 + + + commons-logging + commons-logging + + + + + + + 2.0.8 + 1.0-beta-5 + 1.2.1 + 6.1.6 + 0.9 + 2.5.6 + + + + release + + + + maven-assembly-plugin + false + + + src/main/assembly/src.xml + + gnu + apache-archiva-${project.version}-src + + + + make-assembly + package + + single + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + ${gpg.passphrase} + + + + + sign + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + ${deploy.altRepository} + true + + + + org.apache.maven.plugins + maven-source-plugin + 2.0.4 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.4 + + + attach-javadocs + + jar + + + + + + + + + + + + true + + + false + + sonatype.public + Sonatype Public Repo + http://repository.sonatype.org/content/repositories/sonatype-apache-releases + + + + false + + + true + + codehaus.org.snapshots + Codehaus Snapshots Repository + http://snapshots.repository.codehaus.org + + + diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/maven-metadata.xml b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/maven-metadata.xml new file mode 100644 index 000000000..a2fa9ba67 --- /dev/null +++ b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/maven-metadata.xml @@ -0,0 +1,9 @@ + + + + org.apache.archiva + archiva + 1.2.2 + + + diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/maven-metadata.xml b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/maven-metadata.xml new file mode 100644 index 000000000..3a27b033e --- /dev/null +++ b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/maven-metadata.xml @@ -0,0 +1,14 @@ + + + + org.apache.archiva + archiva + + 1.2.2 + 1.2.2 + + 1.2.1 + 1.2.2 + + + diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java index 1084bc0f7..5a0babea0 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java @@ -433,7 +433,7 @@ public class Maven2RepositoryMetadataResolverTest assertEquals( Arrays.asList( "4", "5-SNAPSHOT" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache", "apache" ) ); - assertEquals( Arrays.asList( "1.2.1" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache.archiva", + assertEquals( Arrays.asList( "1.2.1", "1.2.2" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache.archiva", "archiva" ) ); assertEquals( Arrays.asList( "1.2.1" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache.archiva", "archiva-base" ) ); diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/repomerge/ArtifactsMergerTest.java b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/repomerge/ArtifactsMergerTest.java index 4f39b0ea2..657bdef19 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/repomerge/ArtifactsMergerTest.java +++ b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/repomerge/ArtifactsMergerTest.java @@ -120,13 +120,13 @@ public class ArtifactsMergerTest verify( repositoryFactory ).getManagedRepositoryContent( SOURCE_REPOSITORY_ID ); verify( repositoryFactory ).getManagedRepositoryContent( TARGET_REPOSITORY_ID ); verify( sourceArtifacts ).getSourceArtifactList(); - verify( metadataResolver ).getArtifacts( TARGET_REPOSITORY_ID, "org.apache.archiva", "archiva", "1.2.1" ); + verify( metadataResolver ).getArtifacts( TARGET_REPOSITORY_ID, "org.apache.archiva", "archiva", "1.2.2" ); } public Collection getArtifacts() { ArchivaArtifact a1 = - new ArchivaArtifact( "org.apache.archiva", "archiva", "1.2.1", "", "jar", SOURCE_REPOSITORY_ID ); + new ArchivaArtifact( "org.apache.archiva", "archiva", "1.2.2", "", "jar", SOURCE_REPOSITORY_ID ); ArchivaArtifact a2 = new ArchivaArtifact( "org.apache.archiva", "archiva", "1.5", "", "jar", SOURCE_REPOSITORY_ID ); ArrayList list = new ArrayList(); @@ -140,7 +140,7 @@ public class ArtifactsMergerTest ArtifactMetadata m1 = new ArtifactMetadata(); m1.setNamespace( "org.apache.archiva" ); m1.setProject( "archiva" ); - m1.setVersion( "1.2.1" ); + m1.setVersion( "1.2.2" ); ArrayList list = new ArrayList(); list.add( m1 ); return list; @@ -148,7 +148,7 @@ public class ArtifactsMergerTest public void setRepositoryConfigurations() { - File sourceRepoFile = new File( getBasedir(), "src/test/resources/test-repository" ); + File sourceRepoFile = new File( getBasedir(), "target/test-repository" ); File targetRepoFile = new File( getBasedir(), "src/test/resources/target-repo" ); // sourceRepoFile.mkdirs(); // targetRepoFile.mkdirs(); diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/maven-metadata.xml b/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/maven-metadata.xml index 574abc2aa..9f7f134e9 100755 --- a/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/maven-metadata.xml +++ b/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/maven-metadata.xml @@ -5,6 +5,6 @@ archiva 1.2.1 - 20100702064543 + 20100702152308 diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/maven-metadata.xml b/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/maven-metadata.xml index 96384b60c..5c10e1faf 100755 --- a/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/maven-metadata.xml +++ b/archiva-modules/plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/maven-metadata.xml @@ -4,11 +4,12 @@ org.apache.archiva archiva - 1.2.1 - 1.2.1 + 1.2.2 + 1.2.2 1.2.1 + 1.2.2 - 20100702064543 + 20100704111236 -- 2.39.5