QPID-5048: Maven enahancements to restructure POM hierarchy and improve build

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

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1572552 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 10 insertions, 147 deletions

diff --git a/qpid/java/bdbstore/jmx/pom.xml b/qpid/java/bdbstore/jmx/pom.xml
index 626f80b9ab..a16ddfcf09 100644
--- a/qpid/java/bdbstore/jmx/pom.xml
+++ b/qpid/java/bdbstore/jmx/pom.xml
@@ -20,8 +20,8 @@
 
   <parent>
     <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>qpid-java-build</artifactId>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml
index 60abfcb5cd..b2079dd4e5 100644
--- a/qpid/java/bdbstore/pom.xml
+++ b/qpid/java/bdbstore/pom.xml
@@ -20,8 +20,8 @@
 
   <parent>
     <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>qpid-java-build</artifactId>
+    <version>0.28-SNAPSHOT</version>
   </parent>
 
   <artifactId>qpid-bdbstore</artifactId>
diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml
index 01b87448e2..eb15b2d3a3 100644
--- a/qpid/java/bdbstore/systests/pom.xml
+++ b/qpid/java/bdbstore/systests/pom.xml
@@ -20,9 +20,9 @@
 
   <parent>
     <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <artifactId>qpid-systests-parent</artifactId>
+    <version>0.28-SNAPSHOT</version>
+    <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>qpid-bdbstore-systests</artifactId>
@@ -31,18 +31,12 @@
   <description>BDB message store system tests</description>
 
   <properties>
-    <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir>
-    <!-- test properties -->
-    <qpid.home>${basedir}${file.separator}${broker.home.dir}</qpid.home>
-    <qpid.home.qbtc.output>${qpid.home}${file.separator}qbtc-output</qpid.home.qbtc.output>
+    <test.log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</test.log4j.configuration.file>
+    <test.working.directory>${basedir}/../..</test.working.directory>
+    <test.resource.directory>${basedir}/../..</test.resource.directory>
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>compile</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.qpid</groupId>
@@ -51,16 +45,6 @@
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
       <scope>provided</scope>
@@ -84,125 +68,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java/</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-    <testSourceDirectory>src/main/java</testSourceDirectory>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <!--version specified in parent pluginManagement -->
-        <configuration>
-          <workingDirectory>${basedir}/../..</workingDirectory>
-          <!-- Skip the default test phase, bind to the
-               integration-test phase below instead -->
-          <skip>true</skip>
-          <systemPropertyVariables>
-            <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
-          </systemPropertyVariables>
-        </configuration>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <!--version specified in parent pluginManagement -->
-        <executions>
-          <!-- copy the systests config files into the ${qpid.home}/etc
-               directory where the tests expect them -->
-          <execution>
-            <id>copy-systests-etc-resources</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${qpid.home}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../../systests</directory>
-                  <includes>
-                    <include>etc/</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <!-- copy the ../test-profiles directory into ${qpid.home}/..
-               directory where the tests expect it -->
-          <execution>
-            <id>copy-test-profile-resources</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${qpid.home}/..</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../..</directory>
-                  <includes>
-                    <include>test-profiles/</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <!--version specified in parent pluginManagement -->
-        <executions>
-          <execution>
-            <id>extract-broker-distribution</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <outputAbsoluteArtifactFilename>false</outputAbsoluteArtifactFilename>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.qpid</groupId>
-                  <artifactId>qpid-broker</artifactId>
-                  <version>${project.version}</version>
-                  <classifier>bin</classifier>
-                  <type>tar.gz</type>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>