Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-8290] Cleanup assembly warnings and upgrade assembly plugin 

- Convert 'attached' to 'single' goal
 - Clean up leading "/" in descriptors
This commit is contained in:
Matt Pavlovich 2021-06-04 09:30:31 -05:00
parent c0d5399635
commit 5c9df5db0c
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assembly/pom.xml
View File

@ -553,7 +553,7 @@
<id>unix-bin</id> <id>unix-bin</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>attached</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
@ -566,7 +566,7 @@
<id>windows-bin</id> <id>windows-bin</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>attached</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>

32
assembly/src/main/descriptors/common-bin.xml
View File

@ -22,7 +22,7 @@
<!-- Copy over binary files --> <!-- Copy over binary files -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/*.jar</include> <include>bin/*.jar</include>
<include>conf/*.ts</include> <include>conf/*.ts</include>
@ -37,7 +37,7 @@
<!-- lets copy the portions of the admin web app we need - as we can't exclude stuff from the WAR --> <!-- lets copy the portions of the admin web app we need - as we can't exclude stuff from the WAR -->
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/images</directory> <directory>../activemq-web-console/src/main/webapp/images</directory>
<outputDirectory>/webapps/images</outputDirectory> <outputDirectory>webapps/images</outputDirectory>
<includes> <includes>
<include>*</include> <include>*</include>
</includes> </includes>
@ -46,7 +46,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/styles</directory> <directory>../activemq-web-console/src/main/webapp/styles</directory>
<outputDirectory>/webapps/styles</outputDirectory> <outputDirectory>webapps/styles</outputDirectory>
<includes> <includes>
<include>*</include> <include>*</include>
</includes> </includes>
@ -55,7 +55,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp</directory> <directory>../activemq-web-console/src/main/webapp</directory>
<outputDirectory>/webapps/admin</outputDirectory> <outputDirectory>webapps/admin</outputDirectory>
<excludes> <excludes>
<exclude>**/activemq.xml</exclude> <exclude>**/activemq.xml</exclude>
<exclude>**/webconsole-embedded.xml</exclude> <exclude>**/webconsole-embedded.xml</exclude>
@ -65,7 +65,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/target/classes</directory> <directory>../activemq-web-console/target/classes</directory>
<outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory> <outputDirectory>webapps/admin/WEB-INF/classes</outputDirectory>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
@ -76,7 +76,7 @@
<!-- the web demo --> <!-- the web demo -->
<fileSet> <fileSet>
<directory>../activemq-web-demo/src/main/webapp</directory> <directory>../activemq-web-demo/src/main/webapp</directory>
<outputDirectory>/webapps-demo/demo</outputDirectory> <outputDirectory>webapps-demo/demo</outputDirectory>
<excludes> <excludes>
<exclude>**/activemq.xml</exclude> <exclude>**/activemq.xml</exclude>
<exclude>**/webconsole-embedded.xml</exclude> <exclude>**/webconsole-embedded.xml</exclude>
@ -86,19 +86,19 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/styles/</directory> <directory>../activemq-web-console/src/main/webapp/styles/</directory>
<outputDirectory>/webapps-demo/demo/styles/</outputDirectory> <outputDirectory>webapps-demo/demo/styles/</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/images/</directory> <directory>../activemq-web-console/src/main/webapp/images/</directory>
<outputDirectory>/webapps-demo/demo/images/</outputDirectory> <outputDirectory>webapps-demo/demo/images/</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/js/</directory> <directory>../activemq-web-console/src/main/webapp/js/</directory>
<outputDirectory>/webapps-demo/demo/js/</outputDirectory> <outputDirectory>webapps-demo/demo/js/</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</fileSet> </fileSet>
@ -108,7 +108,7 @@
<!-- Copy over jar files --> <!-- Copy over jar files -->
<dependencySet> <dependencySet>
<outputDirectory>/bin</outputDirectory> <outputDirectory>bin</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<outputFileNameMapping>activemq.jar</outputFileNameMapping> <outputFileNameMapping>activemq.jar</outputFileNameMapping>
<includes> <includes>
@ -118,7 +118,7 @@
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
@ -127,7 +127,7 @@
<fileMode>0755</fileMode> <fileMode>0755</fileMode>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
@ -159,7 +159,7 @@
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/lib/camel</outputDirectory> <outputDirectory>lib/camel</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
@ -172,7 +172,7 @@
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/lib/optional</outputDirectory> <outputDirectory>lib/optional</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
@ -234,7 +234,7 @@
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/lib/extra</outputDirectory> <outputDirectory>lib/extra</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering> <useTransitiveFiltering>true</useTransitiveFiltering>
@ -249,7 +249,7 @@
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/lib/web</outputDirectory> <outputDirectory>lib/web</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>

16
assembly/src/main/descriptors/unix-bin.xml
View File

@ -27,7 +27,7 @@
<!-- Copy over everything that needs to get unix line endings --> <!-- Copy over everything that needs to get unix line endings -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<excludes> <excludes>
<exclude>bin/**</exclude> <exclude>bin/**</exclude>
<exclude>conf/*.ts</exclude> <exclude>conf/*.ts</exclude>
@ -46,7 +46,7 @@
<!-- Copy over the files that need to be filtered --> <!-- Copy over the files that need to be filtered -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>examples/**/pom.xml</include> <include>examples/**/pom.xml</include>
</includes> </includes>
@ -58,7 +58,7 @@
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/macosx/wrapper.conf</include> <include>bin/macosx/wrapper.conf</include>
<include>bin/linux-*/wrapper.conf</include> <include>bin/linux-*/wrapper.conf</include>
@ -71,7 +71,7 @@
<!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 --> <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/linux-*/wrapper</include> <include>bin/linux-*/wrapper</include>
<include>bin/linux-*/libwrapper.so</include> <include>bin/linux-*/libwrapper.so</include>
@ -84,7 +84,7 @@
<!-- include patched JAR files --> <!-- include patched JAR files -->
<fileSet> <fileSet>
<directory>src/patch</directory> <directory>src/patch</directory>
<outputDirectory>/lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<includes> <includes>
<include>*</include> <include>*</include>
</includes> </includes>
@ -95,7 +95,7 @@
<!-- Copy over the files that need unix line endings and also chmod to 755 --> <!-- Copy over the files that need unix line endings and also chmod to 755 -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/activemq</include> <include>bin/activemq</include>
<include>bin/activemq-diag</include> <include>bin/activemq-diag</include>
@ -110,7 +110,7 @@
<!-- Copy over the unix-script configuration file that need unix line endings and also chmod to 644 --> <!-- Copy over the unix-script configuration file that need unix line endings and also chmod to 644 -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/env</include> <include>bin/env</include>
</includes> </includes>
@ -123,7 +123,7 @@
<!-- Copy over example scripts that need unix line endings and also chmod to 755 --> <!-- Copy over example scripts that need unix line endings and also chmod to 755 -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>examples/**/*.sh</include> <include>examples/**/*.sh</include>
<include>examples/**/*.rb</include> <include>examples/**/*.rb</include>

12
assembly/src/main/descriptors/windows-bin.xml
View File

@ -26,7 +26,7 @@
<!-- Copy over everything that needs to get dos line endings --> <!-- Copy over everything that needs to get dos line endings -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<excludes> <excludes>
<exclude>bin/**</exclude> <exclude>bin/**</exclude>
<exclude>conf/*.ts</exclude> <exclude>conf/*.ts</exclude>
@ -41,7 +41,7 @@
<!-- Copy over the files that need to be filtered --> <!-- Copy over the files that need to be filtered -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>examples/**/pom.xml</include> <include>examples/**/pom.xml</include>
</includes> </includes>
@ -51,7 +51,7 @@
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/*.bat</include> <include>bin/*.bat</include>
<include>bin/win32/*.bat</include> <include>bin/win32/*.bat</include>
@ -64,7 +64,7 @@
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/activemq</include> <include>bin/activemq</include>
<include>bin/activemq-admin</include> <include>bin/activemq-admin</include>
@ -75,7 +75,7 @@
<!-- Copy over files that should not get the line endings converted --> <!-- Copy over files that should not get the line endings converted -->
<fileSet> <fileSet>
<directory>src/release</directory> <directory>src/release</directory>
<outputDirectory>/</outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>bin/win32/*.exe</include> <include>bin/win32/*.exe</include>
<include>bin/win32/*.dll</include> <include>bin/win32/*.dll</include>
@ -86,7 +86,7 @@
<!-- include patched JAR files --> <!-- include patched JAR files -->
<fileSet> <fileSet>
<directory>src/patch</directory> <directory>src/patch</directory>
<outputDirectory>/lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<includes> <includes>
<include>*</include> <include>*</include>
</includes> </includes>

2
pom.xml
View File

@ -125,7 +125,7 @@
<maven-bundle-plugin-version>5.1.2</maven-bundle-plugin-version> <maven-bundle-plugin-version>5.1.2</maven-bundle-plugin-version>
<maven-surefire-plugin-version>2.22.2</maven-surefire-plugin-version> <maven-surefire-plugin-version>2.22.2</maven-surefire-plugin-version>
<maven-antrun-plugin-version>1.8</maven-antrun-plugin-version> <maven-antrun-plugin-version>1.8</maven-antrun-plugin-version>
<maven-assembly-plugin-version>2.6</maven-assembly-plugin-version> <maven-assembly-plugin-version>3.3.0</maven-assembly-plugin-version>
<maven-release-plugin-version>2.4.1</maven-release-plugin-version> <maven-release-plugin-version>2.4.1</maven-release-plugin-version>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version> <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<maven-war-plugin-version>3.2.2</maven-war-plugin-version> <maven-war-plugin-version>3.2.2</maven-war-plugin-version>