Author: robbie
Date: Fri May 23 13:02:12 2014
New Revision: 1597084

URL: http://svn.apache.org/r1597084
Log:
QPID-5048: assembly and dependency fixups

Modified:
    qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
    qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml

Modified: 
qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml?rev=1597084&r1=1597083&r2=1597084&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml 
(original)
+++ qpid/trunk/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml Fri 
May 23 13:02:12 2014
@@ -15,10 +15,10 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}/META-INF/</directory>
+      <directory>${basedir}/src/main/assembly/</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>README</include>
+        <include>README.txt</include>
         <include>NOTICE</include>
         <include>LICENSE</include>
       </includes>

Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml?rev=1597084&r1=1597083&r2=1597084&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/visualisation-jfc/pom.xml Fri May 23 
13:02:12 2014
@@ -34,6 +34,12 @@
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-perftests</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.qpid</groupId>
+          <artifactId>qpid-client</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -71,6 +77,13 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-common</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
    
   <build>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to