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 6B0E1200CC2 for ; Wed, 5 Jul 2017 21:54:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 69F8216445C; Wed, 5 Jul 2017 19:54:48 +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 B2541164459 for ; Wed, 5 Jul 2017 21:54:47 +0200 (CEST) Received: (qmail 96525 invoked by uid 500); 5 Jul 2017 19:54:46 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 96516 invoked by uid 99); 5 Jul 2017 19:54:46 -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; Wed, 05 Jul 2017 19:54:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1432E0996; Wed, 5 Jul 2017 19:54:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: upthewaterspout@apache.org To: commits@geode.apache.org Message-Id: <6452a234bd4a4394a35880fc59d3baff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-3167: Added commons-validator dependency to modify_war script and Tomcat required jars Date: Wed, 5 Jul 2017 19:54:46 +0000 (UTC) archived-at: Wed, 05 Jul 2017 19:54:48 -0000 Repository: geode Updated Branches: refs/heads/develop e715abfb9 -> 4ed790621 GEODE-3167: Added commons-validator dependency to modify_war script and Tomcat required jars This closes #618 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4ed79062 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4ed79062 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4ed79062 Branch: refs/heads/develop Commit: 4ed7906218135e2a528e2e0500f4216a4b2108e5 Parents: e715abf Author: David Anuta Authored: Wed Jul 5 10:12:01 2017 -0700 Committer: Dan Smith Committed: Wed Jul 5 12:46:32 2017 -0700 ---------------------------------------------------------------------- extensions/geode-modules-assembly/build.gradle | 1 + extensions/geode-modules-assembly/release/session/bin/modify_war | 1 + .../test/java/org/apache/geode/session/tests/TomcatInstall.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/4ed79062/extensions/geode-modules-assembly/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle index 945a83b..94db200 100644 --- a/extensions/geode-modules-assembly/build.gradle +++ b/extensions/geode-modules-assembly/build.gradle @@ -177,6 +177,7 @@ task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:asse filter(ReplaceTokens, tokens:['JGROUPS_VERSION': project.'jgroups.version']) filter(ReplaceTokens, tokens:['SHIRO_VERSION': project.'shiro.version']) filter(ReplaceTokens, tokens:['COMMONS_LANG_VERSION': project.'commons-lang.version']) + filter(ReplaceTokens, tokens:['COMMONS_VALIDATOR_VERSION': project.'commons-validator.version']) } } http://git-wip-us.apache.org/repos/asf/geode/blob/4ed79062/extensions/geode-modules-assembly/release/session/bin/modify_war ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/release/session/bin/modify_war b/extensions/geode-modules-assembly/release/session/bin/modify_war index 5f2d5e1..529f524 100755 --- a/extensions/geode-modules-assembly/release/session/bin/modify_war +++ b/extensions/geode-modules-assembly/release/session/bin/modify_war @@ -270,6 +270,7 @@ OTHER_JARS=(${GEODE}/lib/geode-core-${VERSION}.jar \ ${GEODE}/lib/jgroups-@JGROUPS_VERSION@.jar \ ${GEODE}/lib/commons-lang-@COMMONS_LANG_VERSION@.jar \ ${GEODE}/lib/shiro-core-@SHIRO_VERSION@.jar \ + ${GEODE}/lib/commons-validator-@COMMONS_VALIDATOR_VERSION@.jar \ ${LIB_DIR}/geode-modules-${VERSION}.jar \ ${LIB_DIR}/geode-modules-session-internal-${VERSION}.jar \ ${LIB_DIR}/slf4j-api-@SLF4J_VERSION@.jar \ http://git-wip-us.apache.org/repos/asf/geode/blob/4ed79062/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatInstall.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatInstall.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatInstall.java index 9a5b15e..fe00cd3 100644 --- a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatInstall.java +++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatInstall.java @@ -160,7 +160,7 @@ public class TomcatInstall extends ContainerInstall { private static final String[] tomcatRequiredJars = {"antlr", "commons-lang", "fastutil", "geode-core", "geode-modules", "geode-modules-tomcat7", "geode-modules-tomcat8", "javax.transaction-api", "jgroups", "log4j-api", "log4j-core", - "log4j-jul", "shiro-core", "slf4j-api", "slf4j-jdk14"}; + "log4j-jul", "shiro-core", "slf4j-api", "slf4j-jdk14", "commons-validator"}; private TomcatConfig config; private final TomcatVersion version;