You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/02/27 14:27:54 UTC
svn commit: r1572552 [1/2] - in /qpid/trunk/qpid: java/
java/amqp-1-0-client-jms/ java/amqp-1-0-client-jms/src/main/assembly/
java/amqp-1-0-client-websocket/ java/amqp-1-0-client/ java/amqp-1-0-common/
java/bdbstore/ java/bdbstore/jmx/ java/bdbstore/sy...
Author: robbie
Date: Thu Feb 27 13:27:53 2014
New Revision: 1572552
URL: http://svn.apache.org/r1572552
Log:
QPID-5048: Maven enahancements to restructure POM hierarchy and improve build
Patch supplied by Andrew MacBean <an...@gmail.com>.
Added:
qpid/trunk/qpid/java/qpid-systests-parent/
qpid/trunk/qpid/java/qpid-systests-parent/pom.xml
- copied, changed from r1572498, qpid/trunk/qpid/java/bdbstore/systests/pom.xml
qpid/trunk/qpid/qpid-parent/
qpid/trunk/qpid/qpid-parent/pom.xml
- copied, changed from r1572498, qpid/trunk/qpid/java/pom.xml
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml
qpid/trunk/qpid/java/amqp-1-0-client/pom.xml
qpid/trunk/qpid/java/amqp-1-0-common/pom.xml
qpid/trunk/qpid/java/bdbstore/jmx/pom.xml
qpid/trunk/qpid/java/bdbstore/pom.xml
qpid/trunk/qpid/java/bdbstore/systests/pom.xml
qpid/trunk/qpid/java/broker-core/pom.xml
qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml
qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml
qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml
qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml
qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml
qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml
qpid/trunk/qpid/java/broker/pom.xml
qpid/trunk/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml
qpid/trunk/qpid/java/client/pom.xml
qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml
qpid/trunk/qpid/java/common/pom.xml
qpid/trunk/qpid/java/jca/pom.xml
qpid/trunk/qpid/java/jca/rar/pom.xml
qpid/trunk/qpid/java/management/common/pom.xml
qpid/trunk/qpid/java/management/example/pom.xml
qpid/trunk/qpid/java/perftests/pom.xml
qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml
qpid/trunk/qpid/java/pom.xml
qpid/trunk/qpid/java/qpid-test-utils/pom.xml
qpid/trunk/qpid/java/resources/NOTICE
qpid/trunk/qpid/java/systests/pom.xml
qpid/trunk/qpid/java/tools/pom.xml
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-amqp-1-0-client-jms</artifactId>
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml Thu Feb 27 13:27:53 2014
@@ -8,13 +8,16 @@
<baseDirectory>qpid-amqp-1-0-client-jms/${project.version}</baseDirectory>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
+ <directory>${project.build.directory}/generated-licenses/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>THIRDPARTY</include>
</includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
</fileSet>
</fileSets>
<dependencySets>
Modified: qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-amqp-1-0-client-websocket</artifactId>
Modified: qpid/trunk/qpid/java/amqp-1-0-client/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client/pom.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-amqp-1-0-client</artifactId>
Modified: qpid/trunk/qpid/java/amqp-1-0-common/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-common/pom.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-common/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-amqp-1-0-common</artifactId>
Modified: qpid/trunk/qpid/java/bdbstore/jmx/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/jmx/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/bdbstore/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/bdbstore/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/systests/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/systests/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-core/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-core/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-broker-core</artifactId>
@@ -67,17 +67,6 @@
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</dependency>
@@ -124,8 +113,8 @@
</dependency>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
<exclusions>
<exclusion>
<!-- Qpid doesn't require BCEL InstructionFinder, so does not need jakarta-regexp. -->
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/pom.xml Thu Feb 27 13:27:53 2014
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>qpid-parent</artifactId>
+ <artifactId>qpid-java-build</artifactId>
<groupId>org.apache.qpid</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.28-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>qpid-broker-plugins-management-amqp</artifactId>
<version>0.28-SNAPSHOT</version>
- <name>AMQP Management Protocol Plug-in</name>
- <description>AMQP Management broker plug-in</description>
+ <name>Qpid AMQP Management Protocol Broker Plug-in</name>
+ <description>Qpid AMQP Management broker plug-in</description>
<dependencies>
<dependency>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/pom.xml (original)
+++ qpid/trunk/qpid/java/broker/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-broker</artifactId>
Modified: qpid/trunk/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml (original)
+++ qpid/trunk/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml Thu Feb 27 13:27:53 2014
@@ -11,15 +11,24 @@
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
<include>etc/</include>
</includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
+ <directory>${project.build.directory}/generated-licenses/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>THIRDPARTY</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
Modified: qpid/trunk/qpid/java/client/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/pom.xml (original)
+++ qpid/trunk/qpid/java/client/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-client</artifactId>
Modified: qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml (original)
+++ qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml Thu Feb 27 13:27:53 2014
@@ -8,13 +8,16 @@
<baseDirectory>qpid-client/${project.version}</baseDirectory>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
+ <directory>${project.build.directory}/generated-licenses/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>THIRDPARTY</include>
</includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
</fileSet>
</fileSets>
<dependencySets>
Modified: qpid/trunk/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/pom.xml (original)
+++ qpid/trunk/qpid/java/common/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-common</artifactId>
Modified: qpid/trunk/qpid/java/jca/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/pom.xml (original)
+++ qpid/trunk/qpid/java/jca/pom.xml Thu Feb 27 13:27:53 2014
@@ -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-jca</artifactId>
Modified: qpid/trunk/qpid/java/jca/rar/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/rar/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/rar/pom.xml (original)
+++ qpid/trunk/qpid/java/jca/rar/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/management/common/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/pom.xml (original)
+++ qpid/trunk/qpid/java/management/common/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/management/example/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/example/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/example/pom.xml (original)
+++ qpid/trunk/qpid/java/management/example/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
@@ -45,16 +39,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>
@@ -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>
Modified: qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml (original)
+++ qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml Thu Feb 27 13:27:53 2014
@@ -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>
Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml?rev=1572552&r1=1572551&r2=1572552&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml Thu Feb 27 13:27:53 2014
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org