From de49c164ad155f90d3d776372bbc1425afb6431d Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 27 Feb 2014 13:27:53 +0000
Subject: 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
---
 qpid/java/perftests/pom.xml                        | 184 +--------------------
 .../src/main/assembly/qpid-perftests-bin.xml       |  15 +-
 qpid/java/perftests/visualisation-jfc/pom.xml      |   4 +-
 3 files changed, 17 insertions(+), 186 deletions(-)

(limited to 'qpid/java/perftests')

diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
index ce60b13703..5350f8aaa1 100644
--- a/qpid/java/perftests/pom.xml
+++ b/qpid/java/perftests/pom.xml
@@ -20,8 +20,9 @@
 
   <parent>
     <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>qpid-systests-parent</artifactId>
+    <version>0.28-SNAPSHOT</version>
+    <relativePath>../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>qpid-perftests</artifactId>
@@ -29,13 +30,6 @@
   <name>Qpid Performance Tests</name>
   <description>Performance testing configuration, code and 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>
-  </properties>
-
   <dependencies>
     <!-- client deps -->
     <dependency>
@@ -44,16 +38,6 @@
       <version>${project.version}</version>
     </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>
@@ -102,167 +86,5 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-   
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java/</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-    <testResources>
-        <testResource>
-            <directory>src/test/java</directory>
-            <excludes>
-              <exclude>**/*.java</exclude>
-            </excludes>
-        </testResource>
-        <testResource>
-            <directory>src/test/resources</directory>
-        </testResource>
-    </testResources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <!--version specified in parent pluginManagement -->
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <!--version specified in parent pluginManagement -->
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/qpid-perftests-bin.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </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>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <!--version specified in parent pluginManagement -->
-        <configuration>
-          <workingDirectory>${basedir}/..</workingDirectory>
-          <excludes>
-            <exclude>**/org/apache/qpid/systest/**/*.java</exclude>
-          </excludes>
-          <systemPropertyVariables>
-            <log4j.configuration.file>${project.basedir}${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>
-              <excludes>
-                <exclude>**/org/apache/qpid/disttest/**/*.java</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 
 </project>
diff --git a/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml b/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
index 52ac6884ae..a4f25fd415 100644
--- a/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
+++ b/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
@@ -11,12 +11,21 @@
       <directory>${project.basedir}</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
         <include>etc/</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/generated-licenses/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README</include>
+        <include>NOTICE</include>
+        <include>LICENSE</include>
+        <include>THIRDPARTY</include>
+      </includes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml
index ea0979de39..92aac980ca 100644
--- a/qpid/java/perftests/visualisation-jfc/pom.xml
+++ b/qpid/java/perftests/visualisation-jfc/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>
 
-- 
cgit v1.2.1