From 559e9702d5a7c26dddee708e267f2f685d4de89e Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Thu, 24 Apr 2008 01:54:20 +0000
Subject: QPID-832 merge M2.x

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@651133 13f79535-47bb-0310-9956-ffa450edef68
---
 java/pom.xml | 122 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 68 insertions(+), 54 deletions(-)

(limited to 'java/pom.xml')

diff --git a/java/pom.xml b/java/pom.xml
index a4e4de5057..084358a6e8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -48,6 +48,12 @@ under the License.
             <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
         </snapshotRepository>
 
+       <repository>
+           <id>apache.incubating</id>
+           <name>Apache Incubating Repository</name>
+           <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+
         <!--
         <snapshotRepository>
             <uniqueVersion>true</uniqueVersion>
@@ -147,19 +153,20 @@ under the License.
     </properties>
 
     <modules>
-        <module>plugins</module>
         <module>common</module>
         <module>broker</module>
         <module>client</module>
+        <module>plugins</module>
         <module>systests</module>
         <module>perftests</module>
         <module>integrationtests</module>
         <module>management/eclipse-plugin</module>
         <module>client/example</module>
         <module>client-java14</module>
+        <module>junit-toolkit</module>
+        <module>junit-toolkit-maven-plugin</module>
     </modules>
 
-
     <build>
         <resources>
 
@@ -395,37 +402,14 @@ under the License.
                     </executions>
                 </plugin>
 
+                <!--
                 <plugin>
-                    <groupId>uk.co.thebadgerset</groupId>
+                    <groupId>org.apache.qpid</groupId>
                     <artifactId>junit-toolkit-maven-plugin</artifactId>
-                    <version>0.6-SNAPSHOT</version>
+                    <version>0.7.1-SNAPSHOT</version>
                 </plugin>
-
-            <!-- Disabled as plugin crashes on the systest module. 
-             Also, the resulting NOTICE file doesn't include all license info due to missing data in dependant poms.
-
-            <plugin>
-               <artifactId>maven-remote-resources-plugin</artifactId>
-               <version>1.0-alpha-5</version>
-               <executions>
-                   <execution>
-                       <goals>
-                           <goal>process</goal>
-                       </goals>
-                       <configuration>
-                           <resourceBundles>
-                               <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
-                               <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
-                           </resourceBundles>
-                           <properties>
-                               <addLicense>true</addLicense>
-                               <projectName>Apache Qpid</projectName>
-                           </properties>
-                       </configuration>
-                   </execution>
-               </executions>
-           </plugin-->
-        </plugins>
+                -->
+            </plugins>
         </pluginManagement>
 
         <defaultGoal>install</defaultGoal>
@@ -502,18 +486,23 @@ under the License.
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
-                <version>1.0.0</version>
+                <version>1.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-filter-ssl</artifactId>
-                <version>1.0.0</version>
+                <version>1.0.1</version>
             </dependency>
        <!--     
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.3.2.1</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-java5</artifactId>
-                <version>1.1.5</version>
+                <version>1.0.1</version>
             </dependency>
        -->  
             <dependency>
@@ -537,12 +526,14 @@ under the License.
                 <scope>test</scope>
             </dependency>
 
+            <!--
             <dependency>
-                <groupId>uk.co.thebadgerset</groupId>
+                <groupId>org.apache.qpid</groupId>
                 <artifactId>junit-toolkit</artifactId>
-                <version>0.6-SNAPSHOT</version>
+                <version>0.7.1-SNAPSHOT</version>
                 <scope>compile</scope>
             </dependency>
+            -->
 
             <!-- Qpid Version Dependencies -->
             <dependency>
@@ -580,6 +571,16 @@ under the License.
                 <artifactId>qpid-mgmt-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.qpid</groupId>
+                <artifactId>junit-toolkit</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.qpid</groupId>
+                <artifactId>junit-toolkit-maven-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -676,25 +677,28 @@ under the License.
              </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>
+
+        <!--
+        <repository>
+            <id>junittoolkit.snapshots</id>
+            <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        -->
+
+    </repositories>
 
     <pluginRepositories>
         <pluginRepository>
@@ -715,6 +719,16 @@ under the License.
             </snapshots>
         </pluginRepository>
 
+        <!--
+        <pluginRepository>
+            <id>junittoolkit.plugin.snapshots</id>
+            <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        -->
+
     </pluginRepositories>
 
     <profiles>
-- 
cgit v1.2.1