You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/07/04 05:02:57 UTC
[activemq] branch main updated: [AMQ-8290] Cleanup assembly
warnings and upgrade assembly plugin
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 5c9df5d [AMQ-8290] Cleanup assembly warnings and upgrade assembly plugin
new 8f0903f Merge pull request #668 from mattrpav/AMQ-8290
5c9df5d is described below
commit 5c9df5db0c4f4682ff489f437eea7ec7da98ba92
Author: Matt Pavlovich <ma...@hyte.io>
AuthorDate: Fri Jun 4 09:30:31 2021 -0500
[AMQ-8290] Cleanup assembly warnings and upgrade assembly plugin
- Convert 'attached' to 'single' goal
- Clean up leading "/" in descriptors
---
assembly/pom.xml | 4 ++--
assembly/src/main/descriptors/common-bin.xml | 32 +++++++++++++--------------
assembly/src/main/descriptors/unix-bin.xml | 16 +++++++-------
assembly/src/main/descriptors/windows-bin.xml | 12 +++++-----
pom.xml | 2 +-
5 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 232c9e6..c580b17 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -553,7 +553,7 @@
<id>unix-bin</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
@@ -566,7 +566,7 @@
<id>windows-bin</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 3e55b6b..7f847c9 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -22,7 +22,7 @@
<!-- Copy over binary files -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/*.jar</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 -->
<fileSet>
<directory>../activemq-web-console/src/main/webapp/images</directory>
- <outputDirectory>/webapps/images</outputDirectory>
+ <outputDirectory>webapps/images</outputDirectory>
<includes>
<include>*</include>
</includes>
@@ -46,7 +46,7 @@
</fileSet>
<fileSet>
<directory>../activemq-web-console/src/main/webapp/styles</directory>
- <outputDirectory>/webapps/styles</outputDirectory>
+ <outputDirectory>webapps/styles</outputDirectory>
<includes>
<include>*</include>
</includes>
@@ -55,7 +55,7 @@
</fileSet>
<fileSet>
<directory>../activemq-web-console/src/main/webapp</directory>
- <outputDirectory>/webapps/admin</outputDirectory>
+ <outputDirectory>webapps/admin</outputDirectory>
<excludes>
<exclude>**/activemq.xml</exclude>
<exclude>**/webconsole-embedded.xml</exclude>
@@ -65,7 +65,7 @@
</fileSet>
<fileSet>
<directory>../activemq-web-console/target/classes</directory>
- <outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
+ <outputDirectory>webapps/admin/WEB-INF/classes</outputDirectory>
<includes>
<include>**/*.class</include>
</includes>
@@ -76,7 +76,7 @@
<!-- the web demo -->
<fileSet>
<directory>../activemq-web-demo/src/main/webapp</directory>
- <outputDirectory>/webapps-demo/demo</outputDirectory>
+ <outputDirectory>webapps-demo/demo</outputDirectory>
<excludes>
<exclude>**/activemq.xml</exclude>
<exclude>**/webconsole-embedded.xml</exclude>
@@ -86,19 +86,19 @@
</fileSet>
<fileSet>
<directory>../activemq-web-console/src/main/webapp/styles/</directory>
- <outputDirectory>/webapps-demo/demo/styles/</outputDirectory>
+ <outputDirectory>webapps-demo/demo/styles/</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>../activemq-web-console/src/main/webapp/images/</directory>
- <outputDirectory>/webapps-demo/demo/images/</outputDirectory>
+ <outputDirectory>webapps-demo/demo/images/</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>../activemq-web-console/src/main/webapp/js/</directory>
- <outputDirectory>/webapps-demo/demo/js/</outputDirectory>
+ <outputDirectory>webapps-demo/demo/js/</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
@@ -108,7 +108,7 @@
<!-- Copy over jar files -->
<dependencySet>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<unpack>false</unpack>
<outputFileNameMapping>activemq.jar</outputFileNameMapping>
<includes>
@@ -118,7 +118,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -127,7 +127,7 @@
<fileMode>0755</fileMode>
</dependencySet>
<dependencySet>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -159,7 +159,7 @@
<directoryMode>0755</directoryMode>
</dependencySet>
<dependencySet>
- <outputDirectory>/lib/camel</outputDirectory>
+ <outputDirectory>lib/camel</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -172,7 +172,7 @@
<directoryMode>0755</directoryMode>
</dependencySet>
<dependencySet>
- <outputDirectory>/lib/optional</outputDirectory>
+ <outputDirectory>lib/optional</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -234,7 +234,7 @@
<directoryMode>0755</directoryMode>
</dependencySet>
<dependencySet>
- <outputDirectory>/lib/extra</outputDirectory>
+ <outputDirectory>lib/extra</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
@@ -249,7 +249,7 @@
<directoryMode>0755</directoryMode>
</dependencySet>
<dependencySet>
- <outputDirectory>/lib/web</outputDirectory>
+ <outputDirectory>lib/web</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 27ea0e5..6d7ccbc 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -27,7 +27,7 @@
<!-- Copy over everything that needs to get unix line endings -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>conf/*.ts</exclude>
@@ -46,7 +46,7 @@
<!-- Copy over the files that need to be filtered -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>examples/**/pom.xml</include>
</includes>
@@ -58,7 +58,7 @@
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/macosx/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 -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/linux-*/wrapper</include>
<include>bin/linux-*/libwrapper.so</include>
@@ -84,7 +84,7 @@
<!-- include patched JAR files -->
<fileSet>
<directory>src/patch</directory>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>*</include>
</includes>
@@ -95,7 +95,7 @@
<!-- Copy over the files that need unix line endings and also chmod to 755 -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/activemq</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 -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/env</include>
</includes>
@@ -123,7 +123,7 @@
<!-- Copy over example scripts that need unix line endings and also chmod to 755 -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>examples/**/*.sh</include>
<include>examples/**/*.rb</include>
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index 3cd6e7b..4c11713 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -26,7 +26,7 @@
<!-- Copy over everything that needs to get dos line endings -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>conf/*.ts</exclude>
@@ -41,7 +41,7 @@
<!-- Copy over the files that need to be filtered -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>examples/**/pom.xml</include>
</includes>
@@ -51,7 +51,7 @@
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/*.bat</include>
<include>bin/win32/*.bat</include>
@@ -64,7 +64,7 @@
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/activemq</include>
<include>bin/activemq-admin</include>
@@ -75,7 +75,7 @@
<!-- Copy over files that should not get the line endings converted -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>bin/win32/*.exe</include>
<include>bin/win32/*.dll</include>
@@ -86,7 +86,7 @@
<!-- include patched JAR files -->
<fileSet>
<directory>src/patch</directory>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>*</include>
</includes>
diff --git a/pom.xml b/pom.xml
index ed08370..c27b2a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<maven-bundle-plugin-version>5.1.2</maven-bundle-plugin-version>
<maven-surefire-plugin-version>2.22.2</maven-surefire-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-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<maven-war-plugin-version>3.2.2</maven-war-plugin-version>