From commits-return-5860-archive-asf-public=cust-asf.ponee.io@juneau.apache.org Sun Dec 16 17:33:24 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 028FF180625 for ; Sun, 16 Dec 2018 17:33:23 +0100 (CET) Received: (qmail 8808 invoked by uid 500); 16 Dec 2018 16:33:23 -0000 Mailing-List: contact commits-help@juneau.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@juneau.apache.org Delivered-To: mailing list commits@juneau.apache.org Received: (qmail 8799 invoked by uid 99); 16 Dec 2018 16:33:23 -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; Sun, 16 Dec 2018 16:33:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6AA7A85286; Sun, 16 Dec 2018 16:33:22 +0000 (UTC) Date: Sun, 16 Dec 2018 16:33:22 +0000 To: "commits@juneau.apache.org" Subject: [juneau] branch master updated: Bug fixes in examples. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154497800238.24876.10742880951371600971@gitbox.apache.org> From: jamesbognar@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: juneau X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5d9f1cb44dab2c7db82c2c788f15fa5e9ab455fb X-Git-Newrev: 60089b326ed3db8cecfca517be89a83c4ea7d803 X-Git-Rev: 60089b326ed3db8cecfca517be89a83c4ea7d803 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. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git The following commit(s) were added to refs/heads/master by this push: new 60089b3 Bug fixes in examples. 60089b3 is described below commit 60089b326ed3db8cecfca517be89a83c4ea7d803 Author: JamesBognar AuthorDate: Sun Dec 16 11:33:11 2018 -0500 Bug fixes in examples. --- .../juneau-microservice-jetty-template/build-overlay/pom.xml | 2 +- juneau-microservice/juneau-microservice-jetty-template/pom.xml | 2 +- .../juneau-microservice-jetty-template/src/assembly/bin.xml | 2 +- juneau-microservice/juneau-microservice-springboot-template/pom.xml | 2 +- .../juneau-microservice-springboot-template/src/assembly/bin.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml index 9fd8101..48f2cbe 100644 --- a/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml +++ b/juneau-microservice/juneau-microservice-jetty-template/build-overlay/pom.xml @@ -73,7 +73,7 @@ . - my-microservice.cfg + my-jetty-microservice.cfg diff --git a/juneau-microservice/juneau-microservice-jetty-template/pom.xml b/juneau-microservice/juneau-microservice-jetty-template/pom.xml index 4dca41c..0570209 100644 --- a/juneau-microservice/juneau-microservice-jetty-template/pom.xml +++ b/juneau-microservice/juneau-microservice-jetty-template/pom.xml @@ -68,7 +68,7 @@ single - my-microservice-jetty-${project.version} + my-jetty-microservice-${project.version} src/assembly/bin.xml diff --git a/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml b/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml index e9467fb..6077ee7 100644 --- a/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml +++ b/juneau-microservice/juneau-microservice-jetty-template/src/assembly/bin.xml @@ -34,7 +34,7 @@ src/main/** .settings/** - my-microservice.cfg + *.cfg diff --git a/juneau-microservice/juneau-microservice-springboot-template/pom.xml b/juneau-microservice/juneau-microservice-springboot-template/pom.xml index ee13663..16f8af1 100644 --- a/juneau-microservice/juneau-microservice-springboot-template/pom.xml +++ b/juneau-microservice/juneau-microservice-springboot-template/pom.xml @@ -73,7 +73,7 @@ single - my-microservice-${project.version} + my-springboot-microservice-${project.version} src/assembly/bin.xml diff --git a/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml b/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml index 1c4f696..c396055 100644 --- a/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml +++ b/juneau-microservice/juneau-microservice-springboot-template/src/assembly/bin.xml @@ -38,7 +38,7 @@ files/** META-INF/** jetty.xml - my-microservice.cfg + *.cfg