geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [47/50] [abbrv] geode git commit: GEODE-3167: Added commons-validator dependency to modify_war script and Tomcat required jars
Date Thu, 06 Jul 2017 18:27:21 GMT
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/feature/GEODE-1279
Commit: 4ed7906218135e2a528e2e0500f4216a4b2108e5
Parents: e715abf
Author: David Anuta <david.r.anuta@gmail.com>
Authored: Wed Jul 5 10:12:01 2017 -0700
Committer: Dan Smith <upthewaterspout@apache.org>
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;


Mime
View raw message