diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-02-06 15:20:34 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-02-06 15:20:34 +0000 |
| commit | 2762f18d32aa2aadc66dfccf94bea823df75336e (patch) | |
| tree | 17d0b4bef7975c41435f4ed2fcdcabf833957382 | |
| parent | 0e959638373f85c341780df7d30db45761287355 (diff) | |
| download | qpid-python-2762f18d32aa2aadc66dfccf94bea823df75336e.tar.gz | |
QPID-5048: Maven POM refactoring - names, descriptions, dependencies & versions
Patch supplied by Andrew MacBean <andymacbean@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1565303 13f79535-47bb-0310-9956-ffa450edef68
35 files changed, 767 insertions, 863 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/pom.xml b/qpid/java/amqp-1-0-client-jms/pom.xml index ffcfd223ae..2b73700eed 100644 --- a/qpid/java/amqp-1-0-client-jms/pom.xml +++ b/qpid/java/amqp-1-0-client-jms/pom.xml @@ -16,34 +16,35 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-amqp-1-0-client-jms</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 1.0 Client JMS</name> + <description>AMQP 1.0 compliant JMS module</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-client</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/qpid/java/amqp-1-0-client-websocket/pom.xml b/qpid/java/amqp-1-0-client-websocket/pom.xml index 3862fb0fc5..78da6d3b9e 100644 --- a/qpid/java/amqp-1-0-client-websocket/pom.xml +++ b/qpid/java/amqp-1-0-client-websocket/pom.xml @@ -16,145 +16,41 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-amqp-1-0-client-websocket</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 1.0 Client WebSocket</name> + <description>AMQP 1.0 compliant WebSocket module</description> <dependencies> - <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-client</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> + </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-websocket</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-websocket</artifactId> + </dependency> </dependencies> <build> diff --git a/qpid/java/amqp-1-0-client/pom.xml b/qpid/java/amqp-1-0-client/pom.xml index 1d6a444d6d..2bee6b43d1 100644 --- a/qpid/java/amqp-1-0-client/pom.xml +++ b/qpid/java/amqp-1-0-client/pom.xml @@ -16,21 +16,24 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-amqp-1-0-client</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 1.0 Client</name> + <description>AMQP 1.0 compliant client module</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/qpid/java/amqp-1-0-common/pom.xml b/qpid/java/amqp-1-0-common/pom.xml index d771d58ab1..7b01caa5b0 100644 --- a/qpid/java/amqp-1-0-common/pom.xml +++ b/qpid/java/amqp-1-0-common/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-amqp-1-0-common</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 1.0 Common</name> + <description>AMQP 1.0 compliant common module</description> <build> </build> diff --git a/qpid/java/bdbstore/jmx/pom.xml b/qpid/java/bdbstore/jmx/pom.xml index 82ece2c66f..626f80b9ab 100644 --- a/qpid/java/bdbstore/jmx/pom.xml +++ b/qpid/java/bdbstore/jmx/pom.xml @@ -16,49 +16,48 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-bdbstore-jmx</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid BDB Message Store JMX</name> + <description>BDB message store JMX implementation</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-management-jmx</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-bdbstore</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>com.sleepycat</groupId> <artifactId>je</artifactId> - <version>5.0.84</version> <scope>provided</scope> </dependency> @@ -66,14 +65,14 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml index ec71547038..60abfcb5cd 100644 --- a/qpid/java/bdbstore/pom.xml +++ b/qpid/java/bdbstore/pom.xml @@ -16,41 +16,41 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-bdbstore</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid BDB Message Store</name> + <description>BDB message store implementation using Oracle Berkeley DB Java Edition</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>com.sleepycat</groupId> <artifactId>je</artifactId> - <version>5.0.97</version> <scope>provided</scope> </dependency> @@ -58,14 +58,14 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -73,21 +73,20 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-10-protocol</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index e095765ea1..01b87448e2 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -16,15 +16,19 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-bdbstore-systests</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid BDB Store System Tests</name> + <description>BDB message store system tests</description> <properties> <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir> @@ -37,57 +41,46 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit-version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-bdbstore</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-bdbstore-jmx</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.sleepycat</groupId> <artifactId>je</artifactId> - <version>5.0.84</version> - <scope>compile</scope> </dependency> </dependencies> diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml index 7254de0251..4621a8df75 100644 --- a/qpid/java/broker-core/pom.xml +++ b/qpid/java/broker-core/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-core</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Java Broker Core</name> + <description>Broker core functionality and initial configuration</description> <properties> <generated-logmessages-dir>${basedir}/src/main/java</generated-logmessages-dir> @@ -33,50 +37,38 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-management-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <version>2.7.0</version> - <scope>compile</scope> <exclusions> <exclusion> <groupId>xml-apis</groupId> @@ -88,15 +80,11 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils-core</artifactId> - <version>1.8.3</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> - <version>1.8.1</version> - <scope>compile</scope> <exclusions> <exclusion> <groupId>commons-beanutils</groupId> @@ -108,50 +96,36 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.6</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> - <version>1.8</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.9.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.bcel</groupId> <artifactId>bcel</artifactId> - <version>5.2</version> - <scope>compile</scope> <exclusions> <exclusion> <!-- Qpid doesn't require BCEL InstructionFinder, so does not need jakarta-regexp. --> @@ -165,7 +139,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> @@ -261,12 +235,12 @@ <dependency> <groupId>velocity</groupId> <artifactId>velocity</artifactId> - <version>1.4</version> + <version>${velocity-version}</version> </dependency> <dependency> <groupId>velocity</groupId> <artifactId>velocity-dep</artifactId> - <version>1.4</version> + <version>${velocity-version}</version> </dependency> </dependencies> </plugin> diff --git a/qpid/java/broker-plugins/access-control/pom.xml b/qpid/java/broker-plugins/access-control/pom.xml index c63618380c..0c92129325 100644 --- a/qpid/java/broker-plugins/access-control/pom.xml +++ b/qpid/java/broker-plugins/access-control/pom.xml @@ -16,15 +16,19 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-access-control</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Access Control Broker Plug-in</name> + <description>Access Control broker plug-in</description> <properties> <generated-logmessages-dir>${project.build.directory}/generated-sources/generated-logmessages</generated-logmessages-dir> @@ -34,29 +38,27 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml index 6bfce64240..c2ef3bff33 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml @@ -16,50 +16,50 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-amqp-0-10-protocol</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 0-10 Protocol Plug-in</name> + <description>AMQP 0-10 protocol broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml index 0d8c8be3dd..3bbd624e65 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml @@ -16,43 +16,45 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 0-8 Protocol Broker Plug-in</name> + <description>AMQP 0-8, 0-9 and 0-9-1 protocol broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml index 97db18011d..c3b28c5ee4 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml @@ -16,36 +16,37 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-amqp-1-0-protocol</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 1-0 Protocol Broker Plug-in</name> + <description>AMQP 1-0 protocol broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml index 1403caee0a..38ff043377 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml @@ -16,50 +16,50 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 0-10 to 1-0 Message Conversion Broker Plug-in</name> + <description>AMQP message conversion (0-10 to 1-0) broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-10-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-1-0-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml index deccb6cf22..016f777212 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml @@ -16,43 +16,44 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 0-8 to 0-10 Message Conversion Broker Plug-in</name> + <description>AMQP message conversion (0-8, 0-9 and 0-9-1 to 0-10) broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-10-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml index ec725e7e57..a01760f139 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml @@ -16,50 +16,50 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 0-8 to 1-0 Message Conversion Broker Plug-in</name> + <description>AMQP message conversion (0-8, 0-9 and 0-9-1 to 1-0) broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-amqp-1-0-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-1-0-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/derby-store/pom.xml b/qpid/java/broker-plugins/derby-store/pom.xml index 9b55875aa8..58088d7a75 100644 --- a/qpid/java/broker-plugins/derby-store/pom.xml +++ b/qpid/java/broker-plugins/derby-store/pom.xml @@ -16,50 +16,49 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-derby-store</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Derby Message Store</name> + <description>Apache Derby DB message store broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.8.2.2</version> - <scope>compile</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml index 52631a44e3..af468af3af 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml +++ b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml @@ -16,29 +16,31 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-jdbc-provider-bone</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid JDBC Message Store Connection Pooling Plug-in</name> + <description>JDBC Message Store Connection Pooling broker plug-in using BoneCP</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.jolbox</groupId> <artifactId>bonecp</artifactId> - <version>0.7.1.RELEASE</version> - <scope>compile</scope> <exclusions> <exclusion> <!-- exclude and specify a fixed version below --> @@ -51,7 +53,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>14.0.1</version> <scope>runtime</scope> </dependency> diff --git a/qpid/java/broker-plugins/jdbc-store/pom.xml b/qpid/java/broker-plugins/jdbc-store/pom.xml index ca861a42f3..a2541ec913 100644 --- a/qpid/java/broker-plugins/jdbc-store/pom.xml +++ b/qpid/java/broker-plugins/jdbc-store/pom.xml @@ -16,43 +16,45 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-jdbc-store</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid JDBC Message Store Broker Plug-in</name> + <description>JDBC message store broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -60,7 +62,6 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.8.2.2</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml index 57b2dd863b..d614bbf0b1 100644 --- a/qpid/java/broker-plugins/management-http/pom.xml +++ b/qpid/java/broker-plugins/management-http/pom.xml @@ -16,151 +16,51 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-management-http</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid HTTP Management Broker Plug-in</name> + <description>HTTP Management broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-websocket</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -174,7 +74,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml index 8a06fcf185..78b7f327ec 100644 --- a/qpid/java/broker-plugins/management-jmx/pom.xml +++ b/qpid/java/broker-plugins/management-jmx/pom.xml @@ -16,43 +16,44 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-management-jmx</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid JMX Management Broker Plug-in</name> + <description>JMX management broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-management-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/memory-store/pom.xml b/qpid/java/broker-plugins/memory-store/pom.xml index 6bfd2a8d49..bdf503cd89 100644 --- a/qpid/java/broker-plugins/memory-store/pom.xml +++ b/qpid/java/broker-plugins/memory-store/pom.xml @@ -16,21 +16,25 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-memory-store</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Memory Message Store Broker Plug-in</name> + <description>Memory message store broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/qpid/java/broker-plugins/websocket/pom.xml b/qpid/java/broker-plugins/websocket/pom.xml index fb55be05c8..f7d9c45638 100644 --- a/qpid/java/broker-plugins/websocket/pom.xml +++ b/qpid/java/broker-plugins/websocket/pom.xml @@ -15,142 +15,45 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>qpid-project</artifactId> <groupId>org.apache.qpid</groupId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker-plugins-websocket</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid WebSocket Broker Plug-in</name> + <description>WebSocket broker plug-in</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>8.1.14.v20131031</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - </exclusions> </dependency> - </dependencies> + + </dependencies> <build> </build> diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index 6eb51a4b2e..9761819542 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/pom.xml @@ -16,132 +16,130 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-broker</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Java Broker</name> + <description>Broker configuration and executable</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-access-control</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-10-protocol</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-1-0-protocol</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-derby-store</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-jdbc-provider-bone</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-jdbc-store</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-management-http</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-management-jmx</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-memory-store</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> @@ -149,7 +147,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-bdbstore</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> <optional>true</optional> </dependency> @@ -157,7 +155,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-bdbstore-jmx</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> <optional>true</optional> </dependency> @@ -166,7 +164,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/client/pom.xml b/qpid/java/client/pom.xml index 3d9508eb16..f5623ff53c 100644 --- a/qpid/java/client/pom.xml +++ b/qpid/java/client/pom.xml @@ -16,42 +16,42 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-client</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid AMQP 0.x JMS Client</name> + <description>JMS client supporting AMQP 0-8, 0-9, 0-9-1 and 0-10.</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml index d931c799a3..7ea7f5907a 100644 --- a/qpid/java/common/pom.xml +++ b/qpid/java/common/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-common</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Common</name> + <description>Common functionality</description> <properties> <!-- used during the antrun-plugin execution --> @@ -37,15 +41,13 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> @@ -91,17 +93,17 @@ <dependency> <groupId>velocity</groupId> <artifactId>velocity</artifactId> - <version>1.4</version> + <version>${velocity-version}</version> </dependency> <dependency> <groupId>velocity</groupId> <artifactId>velocity-dep</artifactId> - <version>1.4</version> + <version>${velocity-version}</version> </dependency> <dependency> <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> - <version>2.5.3</version> + <version>${jython-version}</version> </dependency> </dependencies> </plugin> diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml index c7a8de61fe..ecff05f95a 100644 --- a/qpid/java/jca/pom.xml +++ b/qpid/java/jca/pom.xml @@ -16,69 +16,65 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-jca</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid JCA</name> + <description>J2EE Connector Architecture code</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <version>2.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-ejb_3.0_spec</artifactId> - <version>1.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.framework</groupId> <artifactId>geronimo-kernel</artifactId> - <version>2.2.1</version> <scope>provided</scope> <exclusions> <exclusion> @@ -116,7 +112,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/jca/rar/pom.xml b/qpid/java/jca/rar/pom.xml index fca35dba14..1f1aa5e6e0 100644 --- a/qpid/java/jca/rar/pom.xml +++ b/qpid/java/jca/rar/pom.xml @@ -16,22 +16,26 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-ra</artifactId> + <version>0.28-SNAPSHOT</version> <packaging>rar</packaging> + <name>Qpid Resource Adaptor</name> + <description>Resource Adaptor</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -44,7 +48,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-jca</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> </dependencies> @@ -63,30 +67,4 @@ </plugins> </build> -<!-- <profiles> - <profile> - <id>deploy</id> - <build> - <defaultGoal>deploy</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - <configuration> - <attach>false</attach> - </configuration> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> --> </project> diff --git a/qpid/java/management/common/pom.xml b/qpid/java/management/common/pom.xml index ad5d103165..e08338ff8e 100644 --- a/qpid/java/management/common/pom.xml +++ b/qpid/java/management/common/pom.xml @@ -16,15 +16,19 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-management-common</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Management Common</name> + <description>Common management code</description> <dependencies> </dependencies> diff --git a/qpid/java/management/example/pom.xml b/qpid/java/management/example/pom.xml index bdddc3d2dc..d70d16c647 100644 --- a/qpid/java/management/example/pom.xml +++ b/qpid/java/management/example/pom.xml @@ -16,22 +16,25 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-management-examples</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Management Examples</name> + <description>Example management code</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-management-common</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml index 2a1dbd4350..ce60b13703 100644 --- a/qpid/java/perftests/pom.xml +++ b/qpid/java/perftests/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-perftests</artifactId> + <version>0.28-SNAPSHOT</version> + <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> @@ -37,28 +41,22 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> @@ -66,35 +64,26 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils-core</artifactId> - <version>1.8.3</version> - <scope>compile</scope> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.8.2.2</version> <scope>runtime</scope> </dependency> @@ -102,14 +91,14 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index d677491a03..ea0979de39 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -16,35 +16,35 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-perftests-visualisation-jfc</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Performance Tests Visualisation JFC</name> + <description>Performance testing visualisation using JFreeChart</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-perftests</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.8.2.2</version> <scope>runtime</scope> </dependency> @@ -52,14 +52,14 @@ <dependency> <groupId>net.sourceforge.csvjdbc</groupId> <artifactId>csvjdbc</artifactId> - <version>1.0.8</version> + <version>${csvjdbc-version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.13</version> + <version>${jfreechart-version}</version> <scope>provided</scope> </dependency> @@ -67,7 +67,7 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -109,4 +109,17 @@ </plugins> </build> + <repositories> + <repository> + <id>csvjdbc.releases</id> + <url>http://csvjdbc.sourceforge.net/maven2</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> </project> diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index 54395ed4fe..3eb4cfb8c0 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -16,47 +16,56 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>12</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> - <!-- ###### TODO ###### - - 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. - - 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). - - Ensure we dont deploy modules we aren't already doing so, it will make changing them later less of a pain for everyone. - - Figure out dependency setup for optional bdbstore tests. - - Add the other test profiles, e.g. derby and other protocols. - - Generate HTML reports of the test results - - Decide on how to handle the surefire report target re-running the tests (there is a report-only task that doesnt, provided as a workaround) - - Add LICENCE, NOTICE, README files to the binary assemblies. - - Complete setting properties for all the dependency version numbers from the modules. - - Use dependancy management sections to control the version numbers? - - Align the XML in the pom files consistently, fix whitepsace errors. - - === Once the Ant build is removed === - - Move all the resources to be in the /src/foo/resources folders. - - Make qpidversion.properties in common be a filtered resource instead of generated. - - Get rid of the antrun-plugin execution in common, directly invoke the required java elements. - - Do the above in the generate-sources-common profile instead of current default config. - - Get rid of the antrun-plugin execution in broker-core, directly invoke the required java elements. - - Fix the tests not to be dependant on the working dir being the java dir. - - Fix the tests not to be dependant on the test config/output dirs being children of qpid.home. - - Remove the QBTC output file mechanics, rely on Surefire to do it? - - JUnit test profiles instead of Exludes files? - --> + <name>Qpid</name> + <url>http://qpid.apache.org</url> + <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> + + <issueManagement> + <system>JIRA</system> + <url>https://issues.apache.org/jira/browse/QPID</url> + </issueManagement> + + <ciManagement> + <system>Jenkins</system> + <url>https://builds.apache.org/view/M-R/view/Qpid/</url> + </ciManagement> + + <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/java</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/qpid/trunk/qpid/java</developerConnection> + <url>http://svn.apache.org/viewvc/qpid/trunk/qpid/java</url> + </scm> + <prerequisites> <maven>3.0.0</maven> </prerequisites> @@ -64,12 +73,39 @@ <properties> <!-- dependency version numbers --> <dojo-version>1.9.1</dojo-version> + <log4j-version>1.2.16</log4j-version> + <slf4j-version>1.6.4</slf4j-version> + <jetty-version>8.1.14.v20131031</jetty-version> + <jackson-version>1.9.1</jackson-version> + <bdb-version>5.0.97</bdb-version> + <gson-version>2.0</gson-version> + <guava-version>14.0.1</guava-version> + <bonecp-version>0.7.1.RELEASE</bonecp-version> + <commons-beanutils-version>1.8.3</commons-beanutils-version> + <commons-cli-version>1.2</commons-cli-version> + <commons-codec-version>1.6</commons-codec-version> + <commons-collections-version>3.2.1</commons-collections-version> + <commons-configuration-version>1.8</commons-configuration-version> + <commons-digester-version>1.8.1</commons-digester-version> + <commons-lang-version>2.6</commons-lang-version> + <commons-logging-version>1.1.1</commons-logging-version> + <geronimo-jms-version>1.0</geronimo-jms-version> + <geronimo-gta-version>1.1.1</geronimo-gta-version> + <geronimo-servlet-version>1.0</geronimo-servlet-version> + <geronimo-j2ee-connector-version>2.0.0</geronimo-j2ee-connector-version> + <geronimo-ejb-version>1.0.1</geronimo-ejb-version> + <geronimo-kernel-version>2.2.1</geronimo-kernel-version> + <xalan-version>2.7.0</xalan-version> + <bcel-version>5.2</bcel-version> + <velocity-version>1.4</velocity-version> + <derby-version>10.8.2.2</derby-version> + <jython-version>2.5.3</jython-version> + <csvjdbc-version>1.0.8</csvjdbc-version> + <jfreechart-version>1.0.13</jfreechart-version> <!-- test dependency version numbers --> <junit-version>3.8.1</junit-version> <mockito-version>1.9.0</mockito-version> - <log4j-version>1.2.16</log4j-version> - <slf4j-version>1.6.4</slf4j-version> <!-- plugin version numbers --> <maven-antrun-plugin-version>1.7</maven-antrun-plugin-version> @@ -105,7 +141,7 @@ <java.target>1.6</java.target> <!-- enforcer plugin config properties --> - <supported-test-profiles-regex>(java-mms.0-9-1|java-mms.0-10)</supported-test-profiles-regex> + <supported-test-profiles-regex>(java-mms.0-9-1|java-mms.0-10|java-bdb.0-10)</supported-test-profiles-regex> <!-- test properties --> <qpid.home>${basedir}</qpid.home> <!-- override for broker tests --> @@ -120,30 +156,13 @@ <profile.excludes>${profile.excludes.java-mms.0-10}</profile.excludes> </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${mockito-version}</version> - <scope>test</scope> - </dependency> - - </dependencies> - <modules> + <module>amqp-1-0-common</module> <module>amqp-1-0-client</module> <module>amqp-1-0-client-jms</module> <module>amqp-1-0-client-websocket</module> - <module>amqp-1-0-common</module> - <module>broker</module> <module>broker-core</module> + <module>broker</module> <module>broker-plugins/access-control</module> <module>broker-plugins/amqp-0-8-protocol</module> <module>broker-plugins/amqp-0-10-protocol</module> @@ -177,32 +196,263 @@ <module>bdbstore/systests</module> </modules> - <repositories> - <!-- For the BDB JE dependency of the optional bdbstore plugin modules--> - <repository> - <id>oracle.releases</id> - <url>http://download.oracle.com/maven</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <!-- For the CSVJDBC dependency of the optional perftests-visualistion-jfc module--> - <repository> - <id>csvjdbc.releases</id> - <url>http://csvjdbc.sourceforge.net/maven2</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-websocket</artifactId> + <version>${jetty-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>${jackson-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>${jackson-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.dojotoolkit</groupId> + <artifactId>dojo</artifactId> + <version>${dojo-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.sleepycat</groupId> + <artifactId>je</artifactId> + <version>${bdb-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + <version>${commons-beanutils-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>${commons-digester-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons-cli-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons-collections-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>${commons-configuration-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>${geronimo-jms-version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <version>${geronimo-gta-version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> + <version>${geronimo-servlet-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> + <version>${geronimo-j2ee-connector-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ejb_3.0_spec</artifactId> + <version>${geronimo-ejb-version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.framework</groupId> + <artifactId>geronimo-kernel</artifactId> + <version>${geronimo-kernel-version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>${xalan-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.bcel</groupId> + <artifactId>bcel</artifactId> + <version>${bcel-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + <version>${velocity-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity-dep</artifactId> + <version>${velocity-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.jolbox</groupId> + <artifactId>bonecp</artifactId> + <version>${bonecp-version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson-version}</version> + <scope>compile</scope> + </dependency> + + </dependencies> + </dependencyManagement> <build> <pluginManagement> @@ -497,41 +747,6 @@ </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> - - <issueManagement> - <system>JIRA</system> - <url>https://issues.apache.org/jira/browse/QPID</url> - </issueManagement> - - <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> - <reporting> <plugins> <plugin> @@ -548,6 +763,21 @@ </plugins> </reporting> + <repositories> + <!-- For the BDB JE dependency of the optional bdbstore plugin modules--> + <repository> + <id>oracle.releases</id> + <url>http://download.oracle.com/maven</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <profiles> <profile> <!-- Everything in this profile should already be set above by default in case someone sets an explicit non-test @@ -605,6 +835,35 @@ </plugins> </build> </profile> + + <profile> + <id>java-bdb.0-10</id> + <activation> + <property> + <name>profile</name> + <value>java-bdb.0-10</value> + </property> + </activation> + <properties> + <profile>java-bdb.0-10</profile> + <profile.excludes>JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes</profile.excludes> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <broker.version>v0_10</broker.version> + <qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</qpid.broker_default_amqp_protocol_excludes> + <broker.persistent>true</broker.persistent> + <messagestore.class.name>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</messagestore.class.name> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> diff --git a/qpid/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml index a0acfec072..6e11616f4a 100644 --- a/qpid/java/qpid-test-utils/pom.xml +++ b/qpid/java/qpid-test-utils/pom.xml @@ -16,48 +16,44 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-test-utils</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Test Utilities</name> + <description>Testing utilities</description> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit-version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml index 98086bbe9e..a556841240 100644 --- a/qpid/java/systests/pom.xml +++ b/qpid/java/systests/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-systests</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid System Tests</name> + <description>System testing configuration, code and tests</description> <properties> <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir> @@ -51,36 +55,29 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-test-utils</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <!-- client deps --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> @@ -88,21 +85,17 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-jca</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <version>2.0.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> <scope>runtime</scope> </dependency> @@ -110,125 +103,117 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-core</artifactId> - <version>0.26-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-access-control</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-0-10-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-1-0-protocol</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-derby-store</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-jdbc-provider-bone</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-jdbc-store</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-management-http</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-management-jmx</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-memory-store</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> - <!-- optional broker plugin modules <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-bdbstore</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> + <scope>test</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-bdbstore-jmx</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> + <scope>test</scope> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>com.sleepycat</groupId> + <artifactId>je</artifactId> + <scope>test</scope> <optional>true</optional> - </dependency> --> + </dependency> + </dependencies> <build> diff --git a/qpid/java/tools/pom.xml b/qpid/java/tools/pom.xml index 0afaa1d274..9da9ca0443 100644 --- a/qpid/java/tools/pom.xml +++ b/qpid/java/tools/pom.xml @@ -16,42 +16,39 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-project</artifactId> - <version>0.26-SNAPSHOT</version> + <artifactId>qpid-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>qpid-tools</artifactId> + <version>0.28-SNAPSHOT</version> + <name>Qpid Tools</name> + <description>Tools</description> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <version>0.26-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> </dependencies> |