summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/broker/pom.xml13
-rw-r--r--java/client/pom.xml13
-rw-r--r--java/distribution/pom.xml8
-rw-r--r--java/distribution/src/main/assembly/tests.xml56
-rw-r--r--java/systests/pom.xml12
5 files changed, 102 insertions, 0 deletions
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index 92a3d69060..48883b7912 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -128,6 +128,19 @@
</systemProperties>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/java/client/pom.xml b/java/client/pom.xml
index e45aad733d..47ac2cb583 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -120,6 +120,19 @@
</systemProperties>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/java/distribution/pom.xml b/java/distribution/pom.xml
index ca91c222ee..df879c9c95 100644
--- a/java/distribution/pom.xml
+++ b/java/distribution/pom.xml
@@ -66,6 +66,13 @@
<artifactId>org.apache.qpid.management.ui</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>qpid-systests</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -131,6 +138,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
<descriptor>src/main/assembly/management-eclipse-plugin.xml</descriptor>
<descriptor>src/main/assembly/management-eclipse-plugin-unix.xml</descriptor>
+ <descriptor>src/main/assembly/tests.xml</descriptor>
</descriptors>
<finalName>qpid-${pom.version}</finalName>
</configuration>
diff --git a/java/distribution/src/main/assembly/tests.xml b/java/distribution/src/main/assembly/tests.xml
new file mode 100644
index 0000000000..0ea9676841
--- /dev/null
+++ b/java/distribution/src/main/assembly/tests.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<assembly>
+ <id>java-tests</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../broker/target</directory>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <includes>
+ <include>*-tests.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../client/target</directory>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <includes>
+ <include>*-tests.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.apache.qpid:qpid-systests</include>
+ </includes>
+ <scope>test</scope>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index c73e5f2c44..8f6413148f 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -85,6 +85,18 @@
</systemProperties>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>