Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DFA2E200B6C for ; Sun, 28 Aug 2016 23:53:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DE336160AA6; Sun, 28 Aug 2016 21:53:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D8A4B160AC7 for ; Sun, 28 Aug 2016 23:53:00 +0200 (CEST) Received: (qmail 45965 invoked by uid 500); 28 Aug 2016 21:53:00 -0000 Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@guacamole.incubator.apache.org Delivered-To: mailing list commits@guacamole.incubator.apache.org Received: (qmail 45952 invoked by uid 99); 28 Aug 2016 21:53:00 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Aug 2016 21:53:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id AA86CC023E for ; Sun, 28 Aug 2016 21:52:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id ZWcDeXTxV_pK for ; Sun, 28 Aug 2016 21:52:57 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id ED14E5F307 for ; Sun, 28 Aug 2016 21:52:56 +0000 (UTC) Received: (qmail 45855 invoked by uid 99); 28 Aug 2016 21:52:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Aug 2016 21:52:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5AA1AE0E06; Sun, 28 Aug 2016 21:52:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmuehlner@apache.org To: commits@guacamole.incubator.apache.org Date: Sun, 28 Aug 2016 21:52:56 -0000 Message-Id: <1d19d1be7b094801b479d7040ecd7988@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] incubator-guacamole-client git commit: GUACAMOLE-93: Ensure database auth extension .jars are included in dist .tar.gz. archived-at: Sun, 28 Aug 2016 21:53:02 -0000 Repository: incubator-guacamole-client Updated Branches: refs/heads/master 25d259e67 -> 30639f280 GUACAMOLE-93: Ensure database auth extension .jars are included in dist .tar.gz. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/dce39bdc Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/dce39bdc Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/dce39bdc Branch: refs/heads/master Commit: dce39bdc1ee7d7da8c4aa1b938b2ef728460a9f5 Parents: ced3083 Author: Michael Jumper Authored: Sun Aug 28 11:33:19 2016 -0700 Committer: Michael Jumper Committed: Sun Aug 28 11:41:10 2016 -0700 ---------------------------------------------------------------------- .../modules/guacamole-auth-jdbc-dist/pom.xml | 68 ++++++++++++++++++++ .../project-assembly.xml | 52 +++++++++++++++ extensions/guacamole-auth-jdbc/pom.xml | 32 +-------- .../src/main/assembly/dist.xml | 45 ------------- guacamole-docker/bin/build-guacamole.sh | 2 +- 5 files changed, 124 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml new file mode 100644 index 0000000..32c7dfe --- /dev/null +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + org.apache.guacamole + guacamole-auth-jdbc-dist + jar + guacamole-auth-jdbc-dist + http://guac-dev.org/ + + + UTF-8 + + + + org.apache.guacamole + guacamole-auth-jdbc + 0.9.10-incubating + ../../ + + + + + + + + maven-assembly-plugin + 2.5.3 + + ${project.parent.artifactId}-${project.parent.version} + false + + project-assembly.xml + + + + + make-dist-archive + package + + single + + + + + + + + + + + + + org.apache.guacamole + guacamole-auth-jdbc-mysql + 0.9.10-incubating + + + + + org.apache.guacamole + guacamole-auth-jdbc-postgresql + 0.9.10-incubating + + + + + http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml new file mode 100644 index 0000000..f69df7f --- /dev/null +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml @@ -0,0 +1,52 @@ + + + dist + ${project.parent.artifactId}-${project.parent.version} + + + + tar.gz + + + + + + + + mysql + + org.apache.guacamole:guacamole-auth-jdbc-mysql + + + + + + postgresql + + org.apache.guacamole:guacamole-auth-jdbc-postgresql + + + + + + + + + + + mysql/schema + ../guacamole-auth-jdbc-mysql/schema + + + + + postgresql/schema + ../guacamole-auth-jdbc-postgresql/schema + + + + + http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml index f2c1b09..37b5e3d 100644 --- a/extensions/guacamole-auth-jdbc/pom.xml +++ b/extensions/guacamole-auth-jdbc/pom.xml @@ -17,6 +17,9 @@ + + modules/guacamole-auth-jdbc-dist + modules/guacamole-auth-jdbc-base @@ -26,35 +29,6 @@ - - - - - - maven-assembly-plugin - 2.5.3 - false - - - make-dist-archive - package - - single - - - ${project.artifactId}-${project.version} - false - - src/main/assembly/dist.xml - - - - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml deleted file mode 100644 index 4e72cec..0000000 --- a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - dist - ${project.artifactId}-${project.version} - - - - tar.gz - - - - - - - - mysql/schema - modules/guacamole-auth-jdbc-mysql/schema - - - modules/guacamole-auth-jdbc-mysql/target - mysql - - *.jar - - - - - - postgresql/schema - modules/guacamole-auth-jdbc-postgresql/schema - - - modules/guacamole-auth-jdbc-postgresql/target - postgresql - - *.jar - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/guacamole-docker/bin/build-guacamole.sh ---------------------------------------------------------------------- diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh index 0f531e2..4df6289 100755 --- a/guacamole-docker/bin/build-guacamole.sh +++ b/guacamole-docker/bin/build-guacamole.sh @@ -66,7 +66,7 @@ cp guacamole/target/*.war "$DESTINATION/guacamole.war" # Copy JDBC auth extensions and SQL scripts # -tar -xzf extensions/guacamole-auth-jdbc/target/*.tar.gz \ +tar -xzf extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/target/*.tar.gz \ -C "$DESTINATION" \ --wildcards \ --no-anchored \