From de49c164ad155f90d3d776372bbc1425afb6431d Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 27 Feb 2014 13:27:53 +0000
Subject: QPID-5048: Maven enahancements to restructure POM hierarchy and
 improve build

Patch supplied by Andrew MacBean <andymacbean@gmail.com>.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1572552 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/client/pom.xml                               |  4 ++--
 qpid/java/client/src/main/assembly/qpid-client-bin.xml | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'qpid/java/client')

diff --git a/qpid/java/client/pom.xml b/qpid/java/client/pom.xml
index f5623ff53c..2f722e0bc6 100644
--- a/qpid/java/client/pom.xml
+++ b/qpid/java/client/pom.xml
@@ -20,8 +20,8 @@
 
   <parent>
     <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>qpid-java-build</artifactId>
+    <version>0.28-SNAPSHOT</version>
   </parent>
 
   <artifactId>qpid-client</artifactId>
diff --git a/qpid/java/client/src/main/assembly/qpid-client-bin.xml b/qpid/java/client/src/main/assembly/qpid-client-bin.xml
index cc48890fa0..dd7375bfcd 100644
--- a/qpid/java/client/src/main/assembly/qpid-client-bin.xml
+++ b/qpid/java/client/src/main/assembly/qpid-client-bin.xml
@@ -8,13 +8,16 @@
   <baseDirectory>qpid-client/${project.version}</baseDirectory>
   <fileSets>
     <fileSet>
-      <directory>${project.basedir}</directory>
+      <directory>${project.build.directory}/generated-licenses/</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
+        <include>README</include>
+        <include>NOTICE</include>
+        <include>LICENSE</include>
+        <include>THIRDPARTY</include>
       </includes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
     </fileSet>
   </fileSets>
   <dependencySets>
-- 
cgit v1.2.1