You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/05/26 22:23:04 UTC
[activemq-artemis] branch main updated (6bdb511 -> a7027e5)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from 6bdb511 NO-JIRA update JDBC docs
new 8d90aa7 ARTEMIS-3314: fix 11 warnings messages about assembly paths
new a7027e5 ARTEMIS-3314: split dir creation to its own execution to fix warning
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
artemis-distribution/pom.xml | 16 ++++++++++++++-
.../src/main/assembly/bin.xml | 23 +++++++++-------------
artemis-distribution/src/main/assembly/dep.xml | 23 +++++++---------------
.../src/main/assembly/dir.xml | 22 ++++++++-------------
.../src/main/assembly/source-assembly.xml | 2 +-
5 files changed, 40 insertions(+), 46 deletions(-)
copy tests/integration-tests/src/test/resources/rest/rest-test-asm.xml => artemis-distribution/src/main/assembly/bin.xml (72%)
copy tests/integration-tests/src/test/resources/rest/rest-test-asm.xml => artemis-distribution/src/main/assembly/dir.xml (72%)
[activemq-artemis] 01/02: ARTEMIS-3314: fix 11 warnings messages
about assembly paths
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 8d90aa7bf3830312fa77566c2e55598227d0161b
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed May 26 14:49:25 2021 +0100
ARTEMIS-3314: fix 11 warnings messages about assembly paths
---
artemis-distribution/src/main/assembly/dep.xml | 6 +++---
artemis-distribution/src/main/assembly/source-assembly.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index ccb8757..fd08c8a 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -208,7 +208,7 @@
<!-- resources -->
<fileSet>
<directory>src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${file.separator}</outputDirectory>
<lineEnding>keep</lineEnding>
<excludes>
<exclude>bin/activemq</exclude>
@@ -224,7 +224,7 @@
<!-- chmod to 755 on linux executables -->
<fileSet>
<directory>src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${file.separator}</outputDirectory>
<lineEnding>keep</lineEnding>
<includes>
<include>bin/activemq</include>
@@ -254,7 +254,7 @@
<!-- Include license and notice files -->
<fileSet>
<directory>${activemq.basedir}/artemis-distribution/src/main/resources/licenses/bin</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${file.separator}</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml
index 8e27266..c0e151f 100644
--- a/artemis-distribution/src/main/assembly/source-assembly.xml
+++ b/artemis-distribution/src/main/assembly/source-assembly.xml
@@ -32,7 +32,7 @@
<!-- main project directory structure -->
<fileSet>
<directory>${activemq.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${file.separator}</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<!-- TODO These excludes were lifted from maven-resources-apache-source-release-assembly-descriptor-1.0.4. We
should use this descriptor directly in future -->
[activemq-artemis] 02/02: ARTEMIS-3314: split dir creation to its
own execution to fix warning
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit a7027e51951fa2db6b4dd5360b222d6866e7605f
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed May 26 14:50:44 2021 +0100
ARTEMIS-3314: split dir creation to its own execution to fix warning
uses a component descriptor to share dependency/layout definitions with bin archives
---
artemis-distribution/pom.xml | 16 ++++++++++++-
artemis-distribution/src/main/assembly/bin.xml | 32 ++++++++++++++++++++++++++
artemis-distribution/src/main/assembly/dep.xml | 17 ++++----------
artemis-distribution/src/main/assembly/dir.xml | 31 +++++++++++++++++++++++++
4 files changed, 82 insertions(+), 14 deletions(-)
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index bfae4b2..82bdf48 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -281,7 +281,21 @@
<id>bin</id>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/dep.xml</descriptor>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>dir</id>
+ <configuration>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>src/main/assembly/dir.xml</descriptor>
</descriptors>
<tarLongFileMode>posix</tarLongFileMode>
</configuration>
diff --git a/artemis-distribution/src/main/assembly/bin.xml b/artemis-distribution/src/main/assembly/bin.xml
new file mode 100644
index 0000000..5ddee22
--- /dev/null
+++ b/artemis-distribution/src/main/assembly/bin.xml
@@ -0,0 +1,32 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <componentDescriptors>
+ <componentDescriptor>dep.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index fd08c8a..0b24360 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -15,18 +15,9 @@
~ limitations under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
- <id>bin</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
-
+<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<dependencySets>
<dependencySet>
@@ -258,4 +249,4 @@
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
-</assembly>
+</component>
diff --git a/artemis-distribution/src/main/assembly/dir.xml b/artemis-distribution/src/main/assembly/dir.xml
new file mode 100644
index 0000000..f91f268
--- /dev/null
+++ b/artemis-distribution/src/main/assembly/dir.xml
@@ -0,0 +1,31 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <componentDescriptors>
+ <componentDescriptor>dep.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>