From commits-return-63557-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Fri Jun 4 18:56:37 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 5272C18066B for ; Fri, 4 Jun 2021 20:56:37 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id 8E4323EC5B for ; Fri, 4 Jun 2021 18:56:36 +0000 (UTC) Received: (qmail 53525 invoked by uid 500); 4 Jun 2021 18:56:36 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 53491 invoked by uid 99); 4 Jun 2021 18:56:36 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2021 18:56:36 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 1C33A81A87; Fri, 4 Jun 2021 18:56:36 +0000 (UTC) Date: Fri, 04 Jun 2021 18:56:36 +0000 To: "commits@activemq.apache.org" Subject: [activemq-artemis] 01/05: ARTEMIS-3328: fix assembly descriptors and stop downgrading assembly plugin MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: jbertram@apache.org In-Reply-To: <162283299567.28042.8846733585536508186@gitbox.apache.org> References: <162283299567.28042.8846733585536508186@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: activemq-artemis X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Rev: 5bf32282591c0e12d9fdbc5b87284cd4dd03675a X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20210604185636.1C33A81A87@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git commit 5bf32282591c0e12d9fdbc5b87284cd4dd03675a Author: Robbie Gemmell AuthorDate: Thu Jun 3 11:40:57 2021 +0100 ARTEMIS-3328: fix assembly descriptors and stop downgrading assembly plugin - Remove assembly plugin downgrade from 7733a76649403193e0e0e7e1a6279095fdbf426c in ARTEMIS-3296. - Ensure bin descriptor marks key artemis setup/startup script executable file permissions, it wasnt before as while aiming to it only defined inclusions for old files that no longer exist. - Add mode fields to every area to make clear what they will be using, make formats consistent with doc. - Update source release assembly to similarly mark key scripts with executable file permissions. --- artemis-distribution/src/main/assembly/dep.xml | 62 +++++++++++++++++----- .../src/main/assembly/source-assembly.xml | 27 +++++++++- pom.xml | 9 ---- 3 files changed, 73 insertions(+), 25 deletions(-) diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml index 0b24360..018266d 100644 --- a/artemis-distribution/src/main/assembly/dep.xml +++ b/artemis-distribution/src/main/assembly/dep.xml @@ -21,8 +21,8 @@ - 755 - 644 + 0755 + 0644 lib ${artifact.artifactId}.${artifact.extension} false @@ -34,8 +34,8 @@ - 755 - 644 + 0755 + 0644 @@ -106,8 +106,8 @@ false - 755 - 644 + 0755 + 0644 org.apache.activemq:artemis-jms-client-all @@ -128,6 +128,8 @@ false + 0755 + 0644 @@ -139,6 +141,8 @@ web true false + 0755 + 0644 @@ -147,6 +151,8 @@ web/api true false + 0755 + 0644 @@ -158,6 +164,8 @@ false console.war false + 0755 + 0644 @@ -167,6 +175,8 @@ false activemq-branding.war false + 0755 + 0644 @@ -176,6 +186,8 @@ false artemis-plugin.war false + 0755 + 0644 @@ -185,16 +197,22 @@ ${activemq.basedir}/artemis-server/src/main/resources/schema/ schema keep + 0755 + 0644 ${activemq.basedir}/artemis-jms-server/src/main/resources/schema/ schema keep + 0755 + 0644 ${activemq.basedir}/artemis-dto/target/schema/org.apache.activemq/dto/ schema keep + 0755 + 0644 @@ -202,25 +220,21 @@ ${file.separator} keep - bin/activemq - bin/run.sh - bin/stop.sh + bin/artemis **/target/** **/**/*.iml **/**/*.dat **/licenses/** - docker/** + 0755 + 0644 - src/main/resources ${file.separator} keep - bin/activemq - bin/run.sh - bin/stop.sh + bin/artemis 0755 0755 @@ -235,18 +249,38 @@ **/**/*.iml **/**/*.dat **/**/*.md + **/**/*.sh + 0755 + 0644 + + + ${activemq.basedir}/examples + examples + keep + + **/**/*.sh + + + **/target/** + + 0755 + 0755 ${project.build.directory}/markdown-pages/examples examples keep + 0755 + 0644 ${activemq.basedir}/artemis-distribution/src/main/resources/licenses/bin ${file.separator} true + 0755 + 0644 diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml index c0e151f..46805d4 100644 --- a/artemis-distribution/src/main/assembly/source-assembly.xml +++ b/artemis-distribution/src/main/assembly/source-assembly.xml @@ -34,12 +34,18 @@ ${activemq.basedir} ${file.separator} true - + 0755 + 0644 tests/extra-tests/ tests/performance-jmh/ + artemis-distribution/src/main/resources/bin/artemis + artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis + artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service + scripts/*.sh + **/**/*.sh + data/ @@ -130,5 +136,22 @@ + + ${activemq.basedir} + ${file.separator} + true + 0755 + 0755 + + artemis-distribution/src/main/resources/bin/artemis + artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis + artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service + scripts/*.sh + **/**/*.sh + + + **/target/** + + diff --git a/pom.xml b/pom.xml index 5bd914a..a48af17 100644 --- a/pom.xml +++ b/pom.xml @@ -97,10 +97,6 @@ 9.4.40.v20210413 3.6.13.Final 2.6.0 - - 3.1.1 3.0.0-M3 5.1.2 3.9.0 @@ -1484,11 +1480,6 @@ org.apache.maven.plugins - maven-assembly-plugin - ${maven.assembly.plugin.version} - - - org.apache.maven.plugins maven-rar-plugin 2.3