diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-02-27 13:27:53 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-02-27 13:27:53 +0000 |
| commit | de49c164ad155f90d3d776372bbc1425afb6431d (patch) | |
| tree | 7b93b06fd77c14a9993a244aab7140219d7ec33c /qpid/java/broker | |
| parent | 793c824fa24cb0c90b205326d4199d6558944eda (diff) | |
| download | qpid-python-de49c164ad155f90d3d776372bbc1425afb6431d.tar.gz | |
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
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/pom.xml | 4 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/assembly/qpid-broker-bin.xml | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index 9761819542..da0a52abe6 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/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-broker</artifactId> diff --git a/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml b/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml index c7a190bbf2..02b2d6a9cd 100644 --- a/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml +++ b/qpid/java/broker/src/main/assembly/qpid-broker-bin.xml @@ -11,15 +11,24 @@ <directory>${project.basedir}</directory> <outputDirectory>/</outputDirectory> <includes> - <include>README*</include> - <include>LICENSE*</include> - <include>NOTICE*</include> <include>etc/</include> </includes> <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> </fileSet> <fileSet> + <directory>${project.build.directory}/generated-licenses/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>LICENSE</include> + <include>THIRDPARTY</include> + <include>NOTICE</include> + <include>README</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> <directory>${project.basedir}</directory> <outputDirectory>/</outputDirectory> <includes> |