You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/09 02:30:33 UTC
[40/50] [abbrv] incubator-geode git commit: GEODE-14: Clean up
dependencies and parameterize version numbering
GEODE-14: Clean up dependencies and parameterize version numbering
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/feb3d1c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/feb3d1c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/feb3d1c2
Branch: refs/heads/feature/GEODE-268
Commit: feb3d1c2d7dba91f7c0a6306b16b5e63408317ee
Parents: ec3533d
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Jan 6 08:23:52 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Mon Feb 8 07:06:26 2016 -0800
----------------------------------------------------------------------
extensions/gemfire-modules-assembly/build.gradle | 4 ++--
extensions/gemfire-modules-hibernate/build.gradle | 17 +++++++++--------
extensions/gemfire-modules-session/build.gradle | 6 +++---
extensions/gemfire-modules-tomcat7/build.gradle | 9 +++++----
gradle/dependency-versions.properties | 9 +++++++++
5 files changed, 28 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/feb3d1c2/extensions/gemfire-modules-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/build.gradle b/extensions/gemfire-modules-assembly/build.gradle
index 2381be9..7ef2f01 100644
--- a/extensions/gemfire-modules-assembly/build.gradle
+++ b/extensions/gemfire-modules-assembly/build.gradle
@@ -24,8 +24,8 @@ configurations {
}
dependencies {
- slf4jDeps 'org.slf4j:slf4j-api:1.7.7'
- slf4jDeps 'org.slf4j:slf4j-jdk14:1.7.7'
+ slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
+ slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
}
dependencies {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/feb3d1c2/extensions/gemfire-modules-hibernate/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/build.gradle b/extensions/gemfire-modules-hibernate/build.gradle
index 928e8bf..0fbf80f 100644
--- a/extensions/gemfire-modules-hibernate/build.gradle
+++ b/extensions/gemfire-modules-hibernate/build.gradle
@@ -21,16 +21,17 @@ jar {
dependencies {
compile project(':extensions/gemfire-modules')
- compile 'org.hibernate:hibernate-core:3.5.0-Final'
- compile 'org.hibernate:hibernate-annotations:3.5.5-Final'
- compile 'javax.persistence:persistence-api:1.0.2'
+ compile 'org.hibernate:hibernate-core:' + project.'hibernate.version'
+ compile 'org.hibernate:hibernate-annotations:' + project.'hibernate.version'
+ compile 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
- runtime 'dom4j:dom4j:1.6.1'
+ runtime 'dom4j:dom4j:' + project.'dom4j.version'
- testRuntime 'org.hibernate:hibernate-annotations:3.5.5-Final'
- testRuntime 'org.slf4j:slf4j-jdk14:1.7.7'
- testRuntime 'org.hsqldb:hsqldb:2.0.0'
- testRuntime 'org.javassist:javassist:3.13.0-GA'
+ testRuntime 'commons-collections:commons-collections:' + project.'commons-collections.version'
+ testRuntime 'org.hibernate:hibernate-commons-annotations:' + project.'hibernate-commons-annotations.version'
+ testRuntime 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
+ testRuntime 'org.hsqldb:hsqldb:' + project.'hsqldb.version'
+ testRuntime 'org.javassist:javassist:' + project.'javassist.version'
provided project(path: ':gemfire-junit', configuration: 'testOutput')
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/feb3d1c2/extensions/gemfire-modules-session/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-session/build.gradle b/extensions/gemfire-modules-session/build.gradle
index 71d59dc..d6f12c9 100644
--- a/extensions/gemfire-modules-session/build.gradle
+++ b/extensions/gemfire-modules-session/build.gradle
@@ -19,9 +19,9 @@ dependencies {
compile project(':extensions/gemfire-modules')
compile project(':gemfire-core')
- testCompile 'javax.servlet:javax.servlet-api:3.1.0'
- testCompile 'org.slf4j:slf4j-jdk14:1.7.7'
- testCompile('com.mockrunner:mockrunner-servlet:1.0.8') {
+ testCompile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+ testCompile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
+ testCompile('com.mockrunner:mockrunner-servlet:' + project.'mockrunner.version') {
exclude group: 'jboss'
}
testCompile(group: 'org.eclipse.jetty', name: 'jetty-http', version: project.'jetty.version', classifier: 'tests')
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/feb3d1c2/extensions/gemfire-modules-tomcat7/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-tomcat7/build.gradle b/extensions/gemfire-modules-tomcat7/build.gradle
index 10b8803..fc08fc0 100644
--- a/extensions/gemfire-modules-tomcat7/build.gradle
+++ b/extensions/gemfire-modules-tomcat7/build.gradle
@@ -41,10 +41,11 @@ dependencies {
compile 'org.apache.tomcat:tomcat-juli:' + project.'tomcat7.version'
testCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
- testRuntime 'javax.servlet:javax.servlet-api:3.1.0'
- testRuntime 'javax.annotation:jsr250-api:1.0'
- testRuntime 'javax.ejb:ejb-api:3.0'
- testRuntime 'javax.persistence:persistence-api:1.0.2'
+
+ testRuntime 'javax.annotation:jsr250-api:' + project.'javax.jsr250-api.version'
+ testRuntime 'javax.ejb:ejb-api:' + project.'javax.ejb-api.version'
+ testRuntime 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+ testRuntime 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
provided(project(path: ':extensions/gemfire-modules', configuration: 'testOutput')) {
// Remove everything related to Tomcat 6.x
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/feb3d1c2/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index f4616be..bfa4789 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -34,16 +34,24 @@ commons-lang.version = 2.5
commons-logging.version = 1.1.1
commons-modeler.version = 2.0
derby.version = 10.2.2.0
+dom4j.version = 1.6.1
fastutil.version = 7.0.2
guava.version = 15.0
hadoop.version = 2.4.1
hamcrest-all.version = 1.3
hbase.version = 0.94.27
+hibernate.version = 3.5.5-Final
+hibernate-commons-annotations.version = 3.2.0.Final
httpunit.version = 1.7.2
+hsqldb.version = 2.0.0
jackson.version = 2.2.0
jackson-module-scala_2.10.version = 2.1.5
jansi.version = 1.8
+javassist.version = 3.20.0-GA
+javax.ejb-api.version = 3.0
+javax.jsr250-api.version = 1.0
javax.mail-api.version = 1.4.5
+javax.persistence-api.version = 2.0.0
javax.resource-api.version = 1.7
javax.servlet-api.version = 3.1.0
javax.transaction-api.version = 1.2
@@ -59,6 +67,7 @@ JUnitParams.version = 1.0.4
log4j.version = 2.5
lucene.version = 5.3.0
mockito-core.version = 1.10.19
+mockrunner.version = 1.0.8
multithreadedtc.version = 1.01
mx4j.version = 3.0.1
mx4j-remote.version = 3.0.1