Author: rupertlssmith
Date: Wed Oct 24 09:42:24 2007
New Revision: 587925
URL: http://svn.apache.org/viewvc?rev=587925&view=rev
Log:
Merged revisions
573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583549-
583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585911,585913-586343,586345-586373,586375-586488,586490-587922
via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r587922 | rupertlssmith | 2007-10-24 17:32:14 +0100 (Wed, 24 Oct 2007) | 1
line
Resolved junit-toolkit SNAPSHOT dependencies onto version 0.6.1 which is in
the central repository.
........
Modified:
incubator/qpid/branches/M2/ (props changed)
incubator/qpid/branches/M2/java/integrationtests/pom.xml
incubator/qpid/branches/M2/java/perftests/distribution/pom.xml
incubator/qpid/branches/M2/java/pom.xml
Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct 24 09:42:24 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-586489
+/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-587922
Modified: incubator/qpid/branches/M2/java/integrationtests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/integrationtests/pom.xml?rev=587925&r1=587924&r2=587925&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/integrationtests/pom.xml (original)
+++ incubator/qpid/branches/M2/java/integrationtests/pom.xml Wed Oct 24
09:42:24 2007
@@ -59,7 +59,6 @@
<dependency>
<groupId>uk.co.thebadgerset</groupId>
<artifactId>junit-toolkit</artifactId>
- <version>0.6-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/qpid/branches/M2/java/perftests/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/perftests/distribution/pom.xml?rev=587925&r1=587924&r2=587925&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/perftests/distribution/pom.xml (original)
+++ incubator/qpid/branches/M2/java/perftests/distribution/pom.xml Wed Oct 24
09:42:24 2007
@@ -56,13 +56,11 @@
<dependency>
<groupId>uk.co.thebadgerset</groupId>
<artifactId>junit-toolkit</artifactId>
- <version>0.6-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>uk.co.thebadgerset</groupId>
<artifactId>junit-toolkit-maven-plugin</artifactId>
- <version>0.6-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/qpid/branches/M2/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/pom.xml?rev=587925&r1=587924&r2=587925&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/pom.xml (original)
+++ incubator/qpid/branches/M2/java/pom.xml Wed Oct 24 09:42:24 2007
@@ -399,7 +399,7 @@
<plugin>
<groupId>uk.co.thebadgerset</groupId>
<artifactId>junit-toolkit-maven-plugin</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6.1</version>
</plugin>
@@ -547,7 +547,7 @@
<dependency>
<groupId>uk.co.thebadgerset</groupId>
<artifactId>junit-toolkit</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6.1</version>
<scope>compile</scope>
</dependency>
@@ -686,25 +686,17 @@
</snapshots>
</repository>
-->
- <repository>
- <id>junit-toolkit.snapshots</id>
- <name>JUnit Toolkit SNAPSHOT Repository</name>
-
<url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
-</repositories>
+ <repository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
<pluginRepositories>
<pluginRepository>
