From commits-return-265-apmail-training-commits-archive=training.apache.org@training.apache.org Wed Sep 9 13:19:38 2020 Return-Path: X-Original-To: apmail-training-commits-archive@locus.apache.org Delivered-To: apmail-training-commits-archive@locus.apache.org Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with ESMTP id DF5AF1A1A1 for ; Wed, 9 Sep 2020 13:19:37 +0000 (UTC) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 93672121A20 for ; Wed, 9 Sep 2020 13:19:37 +0000 (UTC) Received: (qmail 32223 invoked by uid 500); 9 Sep 2020 13:19:37 -0000 Delivered-To: apmail-training-commits-archive@training.apache.org Received: (qmail 32198 invoked by uid 500); 9 Sep 2020 13:19:37 -0000 Mailing-List: contact commits-help@training.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@training.apache.org Delivered-To: mailing list commits@training.apache.org Received: (qmail 32189 invoked by uid 99); 9 Sep 2020 13:19:37 -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; Wed, 09 Sep 2020 13:19:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id DC8258087C; Wed, 9 Sep 2020 13:19:36 +0000 (UTC) Date: Wed, 09 Sep 2020 13:19:36 +0000 To: "commits@training.apache.org" Subject: [incubator-training] branch develop updated: - Made the archetype automatically reference the current training tools version - Made the build include NOTICE, LICENSE and DISCLAIMER in every generated artifact - Made the assembly plugin have "apache" and "incubating" in the source bundle's name MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159965757666.1265.8558959749041441736@gitbox.apache.org> From: cdutz@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-training X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: c1fdad865cf2d107b0eeff28c6927b8b9d17af95 X-Git-Newrev: 771a15813d69955ffb4cf12d590b3b4c060ac0e9 X-Git-Rev: 771a15813d69955ffb4cf12d590b3b4c060ac0e9 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-training.git The following commit(s) were added to refs/heads/develop by this push: new 771a158 - Made the archetype automatically reference the current training tools version - Made the build include NOTICE, LICENSE and DISCLAIMER in every generated artifact - Made the assembly plugin have "apache" and "incubating" in the source bundle's name 771a158 is described below commit 771a15813d69955ffb4cf12d590b3b4c060ac0e9 Author: Christofer Dutz AuthorDate: Wed Sep 9 15:19:23 2020 +0200 - Made the archetype automatically reference the current training tools version - Made the build include NOTICE, LICENSE and DISCLAIMER in every generated artifact - Made the assembly plugin have "apache" and "incubating" in the source bundle's name --- tools/content-archetype/pom.xml | 26 ++++++++++++++-- .../META-INF/maven/archetype-metadata.xml | 9 +++++- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../resources/projects/basic/archetype.properties | 1 + tools/pom.xml | 36 ++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/tools/content-archetype/pom.xml b/tools/content-archetype/pom.xml index 9a5c67d..de4102c 100644 --- a/tools/content-archetype/pom.xml +++ b/tools/content-archetype/pom.xml @@ -37,15 +37,37 @@ org.apache.maven.archetype archetype-packaging - 3.0.1 + 3.2.0 + + + org.apache.maven.plugins + maven-antrun-plugin + + + prepare-package + + + + + + + + + run + + + + + + maven-archetype-plugin - 3.0.1 + 3.2.0 diff --git a/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 29fbfa4..28d79d0 100644 --- a/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -17,9 +17,15 @@ limitations under the License. --> - + + + APACHE_TRAINING_TOOLS_VERSION + + src/main/java @@ -45,6 +51,7 @@ install-deps-centos.sh install-deps-mac.sh + pom.xml README.md diff --git a/tools/content-archetype/src/main/resources/archetype-resources/pom.xml b/tools/content-archetype/src/main/resources/archetype-resources/pom.xml index 333f8a1..9805796 100644 --- a/tools/content-archetype/src/main/resources/archetype-resources/pom.xml +++ b/tools/content-archetype/src/main/resources/archetype-resources/pom.xml @@ -22,7 +22,7 @@ org.apache.training content-parent-pom - 1.1.0-SNAPSHOT + ${apacheTrainingToolsVersion} diff --git a/tools/content-archetype/src/test/resources/projects/basic/archetype.properties b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties index e76dca7..984ff8e 100644 --- a/tools/content-archetype/src/test/resources/projects/basic/archetype.properties +++ b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties @@ -21,3 +21,4 @@ package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it artifactId=basic +apacheTrainingToolsVersion=1.0.0 diff --git a/tools/pom.xml b/tools/pom.xml index e957c6c..0985201 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -60,7 +60,43 @@ true + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.7.0 + + + process-resource-bundles + + process + + + + + org.apache:apache-jar-resource-bundle:1.4 + + org.apache:apache-incubator-disclaimer-resource-bundle:1.1 + + + ${basedir}/src/remote-resources + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + apache-training-incubating-tools-${project.version} + + + +