You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/03/22 07:25:10 UTC
svn commit: r1788064 - in /qpid/qpid-jms-amqp-0-x/trunk: ./ client/ client/src/test/java/org/apache/qpid/test/utils/ client/src/test/resources/ qpid-jms-amqp-0-x-test-utils/ qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/ qpid-jm...

Author: kwall
Date: Wed Mar 22 07:25:10 2017
New Revision: 1788064

URL: http://svn.apache.org/viewvc?rev=1788064&view=rev
Log:
QPID-7718: Remove qpid-jms-amqp-0-x-test-utils module moving test utils into client itself

Added:
    qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/
    qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java
      - copied, changed from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
    qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
      - copied, changed from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
    qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TCPTunneler.java
      - copied, changed from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java
    qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
      - copied, changed from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
    qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java
      - copied, changed from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
    qpid/qpid-jms-amqp-0-x/trunk/client/src/test/resources/logback.xml
      - copied, changed from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/resources/logback.xml
Removed:
    qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/pom.xml
    qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
    qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
    qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java
    qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
    qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
    qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/resources/logback.xml
Modified:
    qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml
    qpid/qpid-jms-amqp-0-x/trunk/pom.xml

Modified: qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml?rev=1788064&r1=1788063&r2=1788064&view=diff
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml (original)
+++ qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml Wed Mar 22 07:25:10 2017
@@ -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>

Copied: qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java (from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java)
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java?p2=qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java&p1=qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java&r1=1788063&r2=1788064&rev=1788064&view=diff
==============================================================================
    (empty)

Copied: qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java (from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java)
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java?p2=qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java&p1=qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java&r1=1788063&r2=1788064&rev=1788064&view=diff
==============================================================================
    (empty)

Copied: qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TCPTunneler.java (from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java)
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TCPTunneler.java?p2=qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TCPTunneler.java&p1=qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TCPTunneler.java&r1=1788063&r2=1788064&rev=1788064&view=diff
==============================================================================
    (empty)

Copied: qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java (from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java)
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java?p2=qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java&p1=qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java&r1=1788063&r2=1788064&rev=1788064&view=diff
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java (original)
+++ qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java Wed Mar 22 07:25:10 2017
@@ -219,7 +219,7 @@ public class TestFileUtils
             }
 
             OutputStream out = new FileOutputStream(dst);
-            
+
             try
             {
                 // Transfer bytes from in to out

Copied: qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java (from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java)
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java?p2=qpid/qpid-jms-amqp-0-x/trunk/client/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java&p1=qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java&r1=1788063&r2=1788064&rev=1788064&view=diff
==============================================================================
    (empty)

Copied: qpid/qpid-jms-amqp-0-x/trunk/client/src/test/resources/logback.xml (from r1788063, qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/resources/logback.xml)
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/src/test/resources/logback.xml?p2=qpid/qpid-jms-amqp-0-x/trunk/client/src/test/resources/logback.xml&p1=qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/resources/logback.xml&r1=1788063&r2=1788064&rev=1788064&view=diff
==============================================================================
    (empty)

Modified: qpid/qpid-jms-amqp-0-x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/pom.xml?rev=1788064&r1=1788063&r2=1788064&view=diff
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/pom.xml (original)
+++ qpid/qpid-jms-amqp-0-x/trunk/pom.xml Wed Mar 22 07:25:10 2017
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org