mirror of https://github.com/apache/activemq.git
fix for AMQ-1151 to include the activemq-xmpp jar in the binary distro - along with including the shell scripts in the zip
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@503688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ee9f05ea52
commit
d9ca5c07fd
|
@ -73,6 +73,10 @@
|
|||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-jaas</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-xmpp</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-web-demo</artifactId>
|
||||
|
|
|
@ -125,6 +125,7 @@
|
|||
<includes>
|
||||
<include>${pom.groupId}:activemq-rar</include>
|
||||
<include>${pom.groupId}:activemq-optional</include>
|
||||
<include>${pom.groupId}:activemq-xmpp</include>
|
||||
<include>${pom.groupId}:activecluster</include>
|
||||
<include>commons-beanutils:commons-beanutils</include>
|
||||
<include>commons-collections:commons-collections</include>
|
||||
|
|
|
@ -46,6 +46,33 @@
|
|||
<lineEnding>dos</lineEnding>
|
||||
</fileSet>
|
||||
|
||||
<!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
|
||||
<fileSet>
|
||||
<directory>src/release</directory>
|
||||
<outputDirectory></outputDirectory>
|
||||
<includes>
|
||||
<include>bin/linux/wrapper</include>
|
||||
<include>bin/linux/libwrapper.so</include>
|
||||
<include>bin/macosx/wrapper</include>
|
||||
<include>bin/macosx/libwrapper.jnilib</include>
|
||||
</includes>
|
||||
<fileMode>0755</fileMode>
|
||||
</fileSet>
|
||||
|
||||
<!-- Copy over the files that need unix line endings and also chmod to 755 -->
|
||||
<fileSet>
|
||||
<directory>src/release</directory>
|
||||
<outputDirectory></outputDirectory>
|
||||
<includes>
|
||||
<include>bin/activemq</include>
|
||||
<include>bin/activemq-admin</include>
|
||||
<include>bin/macosx/activemq</include>
|
||||
<include>bin/linux/activemq</include>
|
||||
</includes>
|
||||
<fileMode>0755</fileMode>
|
||||
<lineEnding>unix</lineEnding>
|
||||
</fileSet>
|
||||
|
||||
<!-- Copy over files that should not get the line endings converted -->
|
||||
<fileSet>
|
||||
<directory>src/release</directory>
|
||||
|
@ -102,6 +129,7 @@
|
|||
<includes>
|
||||
<include>${pom.groupId}:activemq-rar</include>
|
||||
<include>${pom.groupId}:activemq-optional</include>
|
||||
<include>${pom.groupId}:activemq-xmpp</include>
|
||||
<include>${pom.groupId}:activecluster</include>
|
||||
<include>commons-beanutils:commons-beanutils</include>
|
||||
<include>commons-collections:commons-collections</include>
|
||||
|
|
7
pom.xml
7
pom.xml
|
@ -175,6 +175,11 @@
|
|||
<artifactId>activemq-web</artifactId>
|
||||
<version>${activemq-version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.activemq</groupId>
|
||||
<artifactId>activemq-xmpp</artifactId>
|
||||
<version>${activemq-version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.activemq</groupId>
|
||||
<artifactId>activemq-web-demo</artifactId>
|
||||
|
@ -185,7 +190,7 @@
|
|||
<groupId>org.apache.activemq</groupId>
|
||||
<artifactId>activemq-gbean-management</artifactId>
|
||||
<version>${activemq-version}</version>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.activemq</groupId>
|
||||
<artifactId>activemq-console</artifactId>
|
||||
|
|
Loading…
Reference in New Issue