From commits-return-5819-archive-asf-public=cust-asf.ponee.io@juneau.apache.org Tue Dec 11 16:23:37 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 8A81B180671 for ; Tue, 11 Dec 2018 16:23:36 +0100 (CET) Received: (qmail 15441 invoked by uid 500); 11 Dec 2018 15:23:35 -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 15432 invoked by uid 99); 11 Dec 2018 15:23:35 -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; Tue, 11 Dec 2018 15:23:35 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 18AB482F11; Tue, 11 Dec 2018 15:23:35 +0000 (UTC) Date: Tue, 11 Dec 2018 15:23:35 +0000 To: "commits@juneau.apache.org" Subject: [juneau] branch master updated: Fix build issue. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154454181504.16497.11973387127992352586@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: ee05307c7542cfa62edc7667f6884e16b4ed75a4 X-Git-Newrev: efd3f889ff336470b84d32120b143cbed82ac0e6 X-Git-Rev: efd3f889ff336470b84d32120b143cbed82ac0e6 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 efd3f88 Fix build issue. new cfe6542 Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git efd3f88 is described below commit efd3f889ff336470b84d32120b143cbed82ac0e6 Author: JamesBognar AuthorDate: Tue Dec 11 10:22:32 2018 -0500 Fix build issue. --- juneau-examples/juneau-examples-rest/.classpath | 1 - .../juneau-examples-rest/src/assembly/bin.xml | 51 ---------------- juneau-releng/juneau-distrib/pom.xml | 69 +++++++++++++++++++--- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/juneau-examples/juneau-examples-rest/.classpath b/juneau-examples/juneau-examples-rest/.classpath index 458e40d..968a4da 100644 --- a/juneau-examples/juneau-examples-rest/.classpath +++ b/juneau-examples/juneau-examples-rest/.classpath @@ -17,7 +17,6 @@ - diff --git a/juneau-examples/juneau-examples-rest/src/assembly/bin.xml b/juneau-examples/juneau-examples-rest/src/assembly/bin.xml deleted file mode 100644 index f8991cb..0000000 --- a/juneau-examples/juneau-examples-rest/src/assembly/bin.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - bin - - zip - - / - true - - - ${basedir} - - src/main/** - src/test/** - .settings/** - files/** - .project - *.launch - *.cfg - - - - ${basedir}/build-overlay - / - true - - - - \ No newline at end of file diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-releng/juneau-distrib/pom.xml index 95edd6f..2135b95 100644 --- a/juneau-releng/juneau-distrib/pom.xml +++ b/juneau-releng/juneau-distrib/pom.xml @@ -237,7 +237,7 @@ ${project.build.directory}/src/lib org.apache.juneau - juneau-microservice-server + juneau-microservice-core ${project.version} jar sources @@ -245,15 +245,59 @@ ${project.build.directory}/bin/lib org.apache.juneau - juneau-microservice-server + juneau-microservice-core ${project.version} ${project.build.directory}/bin/osgi org.apache.juneau - juneau-microservice-server + juneau-microservice-core ${project.version} - org.apache.juneau.microservice.server_${project.version}.jar + org.apache.juneau.microservice.core_${project.version}.jar + + + + ${project.build.directory}/src/lib + org.apache.juneau + juneau-microservice-jetty + ${project.version} + jar + sources + + + ${project.build.directory}/bin/lib + org.apache.juneau + juneau-microservice-jetty + ${project.version} + + + ${project.build.directory}/bin/osgi + org.apache.juneau + juneau-microservice-jetty + ${project.version} + org.apache.juneau.microservice.jetty_${project.version}.jar + + + + ${project.build.directory}/src/lib + org.apache.juneau + juneau-microservice-springboot + ${project.version} + jar + sources + + + ${project.build.directory}/bin/lib + org.apache.juneau + juneau-microservice-springboot + ${project.version} + + + ${project.build.directory}/bin/osgi + org.apache.juneau + juneau-microservice-springboot + ${project.version} + org.apache.juneau.microservice.springboot_${project.version}.jar @@ -268,20 +312,29 @@ ${project.build.directory}/bin/projects org.apache.juneau - juneau-examples-rest + juneau-examples-rest-jetty + bin + zip + ${project.version} + juneau-examples-rest-jetty-${project.version}.zip + + + ${project.build.directory}/bin/projects + org.apache.juneau + juneau-examples-rest-springboot bin zip ${project.version} - juneau-examples-rest-${project.version}.zip + juneau-examples-rest-springboot-${project.version}.zip ${project.build.directory}/bin/projects org.apache.juneau - juneau-microservice-template + juneau-microservice-jetty-template bin zip ${project.version} - my-microservice-${project.version}.zip + my-jetty-microservice-${project.version}.zip