From ee76ebefc53d00751fa0c2a404c083dc63f516db Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Fri, 17 Jan 2014 13:05:23 +0000
Subject: QPID-5065: modifications to get more tests running on windows (both
 ant and maven).

Also
- Fixed the jca/rar pom module name, it should be qpid-ra not qpid-rar.
- Added project details such as Website, Mailing List, SCM.

Patch submitted by Andrew MacBean <andymacbean@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1559096 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/pom.xml | 59 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 9 deletions(-)

(limited to 'qpid/java/pom.xml')

diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index 1b313b3514..a9f9a835eb 100644
--- a/qpid/java/pom.xml
+++ b/qpid/java/pom.xml
@@ -29,12 +29,10 @@
   <packaging>pom</packaging>
 
   <!-- ###### TODO ######
-    - Fix the jca/rar pom module name, it should be qpid-ra not qpid-rar.
     - Add the Excludes files, log4j config, etc test resources to a module (qpid-test-utils?) which can be
       used (extracted?) by the others to prevent them having to reference outside their directly for the files.
       - Fix what the systests/perftests do to copy the test-profiles dir to the necessary location.
       - Fix the log4j configuration property to work with all the modules, resolve the currently generated log4j exceptions during test runs.
-    - Add project details such as Website, Mailing List, SCM.
     - Fix the version numbers in all the modules.
     - Decide on a final name for this parent module, qpid-project isnt necessarily appropriate given it doesnt encompass the whole project.
     - Test deploying the modules to a local Nexus instance (by overriding the repo properties locally).
@@ -59,6 +57,9 @@
       - Remove the QBTC output file mechanics, rely on Surefire to do it?
     - JUnit test profiles instead of Exludes files?
   -->
+  <prerequisites>
+    <maven>3.0.0</maven>
+  </prerequisites>
 
   <properties>
     <!-- dependency version numbers -->
@@ -102,13 +103,12 @@
     <java.target>1.6</java.target>
 
     <!-- enforcer plugin config properties -->
-    <supported-maven-version-range>[3.0.0,)</supported-maven-version-range>
     <supported-test-profiles-regex>(java-mms.0-9-1|java-mms.0-10)</supported-test-profiles-regex>
 
     <!-- test properties -->
     <qpid.home>${basedir}</qpid.home> <!-- override for broker tests -->
-    <qpid.home.qbtc.output>${qpid.home}/target/qbtc-output</qpid.home.qbtc.output> <!-- override for broker tests -->
-    <qpid.work>${project.build.directory}/QPID_WORK</qpid.work>
+    <qpid.home.qbtc.output>${qpid.home}${file.separator}target${file.separator}qbtc-output</qpid.home.qbtc.output> <!-- override for broker tests -->
+    <qpid.work>${project.build.directory}${file.separator}QPID_WORK</qpid.work>
 
     <profile.excludes.java-mms.0-10>JavaTransientExcludes Java010Excludes</profile.excludes.java-mms.0-10>
     <broker.version.java-mms.0-10>v0_10</broker.version.java-mms.0-10>
@@ -450,7 +450,8 @@
             <broker.version>${broker.version.java-mms.0-10}</broker.version>
             <qpid.broker_default_amqp_protocol_excludes>${qpid.broker_default_amqp_protocol_excludes.java-mms.0-10}</qpid.broker_default_amqp_protocol_excludes>
             <broker.stopped>Exception</broker.stopped>
-            <broker.command>${qpid.home}/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</broker.command>
+            <broker.command>${qpid.home}${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</broker.command>
+            <broker.command.windows>${qpid.home}${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</broker.command.windows>
 
             <broker.ready>BRK-1004</broker.ready>
             <profile>${profile}</profile>
@@ -474,9 +475,6 @@
             </goals>
             <configuration>
               <rules>
-                <requireMavenVersion>
-                  <version>${supported-maven-version-range}</version>
-                </requireMavenVersion>
                 <requireProperty>
                   <property>profile</property>
                   <message>You must set a test profile!</message>
@@ -497,6 +495,49 @@
     </plugins>
   </build>
 
+  <description>
+    Apache Qpid™ makes messaging tools that speak AMQP and support many languages and platforms.
+    AMQP is an open internet protocol for reliably sending and receiving messages. It makes it possible for everyone to build a diverse, coherent messaging ecosystem.
+  </description>
+
+  <url>http://qpid.apache.org</url>
+
+  <mailingLists>
+    <mailingList>
+      <name>Apache Qpid Users</name>
+      <subscribe>users-subscribe@qpid.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@qpid.apache.org</unsubscribe>
+      <post>users@qpid.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/qpid-users/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Apache Qpid Developers</name>
+      <subscribe>dev-subscribe@qpid.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@qpid.apache.org</unsubscribe>
+      <post>dev@qpid.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/qpid-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/qpid/trunk/qpid</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/qpid/trunk/qpid</developerConnection>
+    <url>http://svn.apache.org/viewvc/qpid/</url>
+  </scm>
+
+  <distributionManagement>
+    <repository>
+      <id>qpid.releases.https</id>
+      <name>Qpid Release Distribution Repository</name>
+      <url>https://repository.apache.org/content/repositories/releases/org/apache/qpid</url>
+    </repository>
+    <snapshotRepository>
+      <id>qpid.snapshots.https</id>
+      <name>Qpid Development Snapshot Repository</name>
+      <url>https://repository.apache.org/content/repositories/snapshots/org/apache/qpid</url>
+    </snapshotRepository>
+  </distributionManagement>
+
   <reporting>
     <plugins>
       <plugin>
-- 
cgit v1.2.1