QPID-7718: Remove qpid-jms-amqp-0-x-test-utils module moving test utils into client itself
diff --git a/client/pom.xml b/client/pom.xml
index 6d557ce..2447faa 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -40,38 +40,38 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-amqp-0-x-test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
<scope>test</scope>
</dependency>
+ <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>
<build>
diff --git a/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java b/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java
similarity index 100%
rename from qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
rename to client/src/test/java/org/apache/qpid/test/utils/PortHelper.java
diff --git a/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/client/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
similarity index 100%
rename from qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
rename to client/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
diff --git a/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java b/client/src/test/java/org/apache/qpid/test/utils/TCPTunneler.java
similarity index 100%
rename from qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java
rename to client/src/test/java/org/apache/qpid/test/utils/TCPTunneler.java
diff --git a/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java b/client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
similarity index 99%
rename from qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
rename to client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
index 0023103..0be4119 100644
--- a/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
+++ b/client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
@@ -219,7 +219,7 @@
}
OutputStream out = new FileOutputStream(dst);
-
+
try
{
// Transfer bytes from in to out
diff --git a/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java b/client/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java
similarity index 100%
rename from qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
rename to client/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java
diff --git a/qpid-jms-amqp-0-x-test-utils/src/main/resources/logback.xml b/client/src/test/resources/logback.xml
similarity index 100%
rename from qpid-jms-amqp-0-x-test-utils/src/main/resources/logback.xml
rename to client/src/test/resources/logback.xml
diff --git a/pom.xml b/pom.xml
index bbf610e..d9f1d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,32 +116,41 @@
<module>client</module>
<module>client/example</module>
<module>doc</module>
- <module>qpid-jms-amqp-0-x-test-utils</module>
</modules>
- <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>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
diff --git a/qpid-jms-amqp-0-x-test-utils/pom.xml b/qpid-jms-amqp-0-x-test-utils/pom.xml
deleted file mode 100644
index 54431d8..0000000
--- a/qpid-jms-amqp-0-x-test-utils/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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.
--->
-<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-jms-amqp-0-x-parent</artifactId>
- <version>6.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>qpid-jms-amqp-0-x-test-utils</artifactId>
- <name>Apache Qpid JMS AMQP 0-x Test Utilities</name>
- <description>Testing utilities</description>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
