diff --git a/build.gradle b/build.gradle
index d8c32a54..3fee192f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,29 +101,16 @@ dependencies {
// Apache Geode (a.k.a. Pivotal GemFire)
compile("org.apache.geode:geode-core:$gemfireVersion") {
- exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
- exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
- exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
- exclude group: "org.apache.hbase", module: "hbase"
+ exclude group: "org.apache.logging.log4j", module: "log4j-jcl"
+ exclude group: "org.apache.logging.log4j", module: "log4j-jul"
exclude group: "org.apache.logging.log4j", module: "log4j-slf4j-impl"
- exclude group: "org.slf4j", module: "slf4j-api"
- exclude group: "org.springframework", module: "spring-aop"
- exclude group: "org.springframework", module: "spring-beans"
- exclude group: "org.springframework", module: "spring-context"
- exclude group: "org.springframework", module: "spring-context-support"
- exclude group: "org.springframework", module: "spring-core"
- exclude group: "org.springframework", module: "spring-expression"
- exclude group: "org.springframework", module: "spring-tx"
- exclude group: "org.springframework", module: "spring-web"
- exclude group: "org.springframework", module: "spring-webmvc"
- exclude group: "org.springframework.data", module: "spring-data-commons"
- exclude group: "org.springframework.shell", module: "spring-shell"
}
compile("org.apache.geode:geode-cq:$gemfireVersion")
compile("org.apache.geode:geode-wan:$gemfireVersion")
- optional("com.google.code.findbugs:annotations:2.0.2")
+ optional("com.google.code.findbugs:annotations:$googleCodeFindbugsVersion")
runtime("antlr:antlr:$antlrVersion")
+ // Java & 3rd Party Dependencies
optional "javax.enterprise:cdi-api:$cdiVersion"
compile "org.aspectj:aspectjweaver:$aspectjVersion"
compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
@@ -146,7 +133,9 @@ dependencies {
testRuntime "log4j:log4j:$log4jVersion"
testRuntime "org.apache.derby:derbyLocale_zh_TW:10.9.1.0"
testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
- testRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+ testRuntime ("org.springframework.shell:spring-shell:$springShellVersion") {
+ exclude group: "com.google.guava", module: "guava"
+ }
sharedResources "org.springframework.data.build:spring-data-build-resources:$springDataBuildVersion@zip"
}
@@ -161,7 +150,7 @@ jar {
manifest.attributes['Implementation-Title'] = project.name
manifest.attributes['Implementation-Version'] = project.version
- from("$rootDir/docs/src/info") {
+ from("$rootDir/src/main/resources") {
include "license.txt"
include "notice.txt"
into "META-INF"
@@ -172,7 +161,7 @@ jar {
javadoc {
dependsOn = [ 'extractSharedResources' ]
destinationDir = file("${buildDir}/api")
- ext.srcDir = file("${projectDir}/docs/src/api")
+ ext.srcDir = file("$buildDir/shared-resources")
ext.tmpDir = file("${buildDir}/api-work")
configure(options) {
@@ -280,7 +269,7 @@ task docsZip(type: Zip, dependsOn: [javadoc, asciidoctor, referencePdf]) {
classifier = 'docs'
group = 'Distribution'
- from('docs/src/info') {
+ from('src/main/resources') {
include 'changelog.txt'
}
@@ -300,8 +289,7 @@ task docsZip(type: Zip, dependsOn: [javadoc, asciidoctor, referencePdf]) {
}
task distZip(type: Zip, dependsOn: [jar, sourcesJar, javadocJar, schemaZip, docsZip]) {
- description = "Builds -${classifier} archive, containing all jars and docs, " +
- "suitable for community download page."
+ description = "Builds -${classifier} archive, containing all jars and docs, suitable for community download page."
baseName = project.archivesBaseName
classifier = 'dist'
@@ -310,10 +298,10 @@ task distZip(type: Zip, dependsOn: [jar, sourcesJar, javadocJar, schemaZip, docs
ext.zipRootDir = "${project.archivesBaseName}-${project.version}"
into (zipRootDir) {
- from('docs/src/info') {
- include 'readme.txt'
+ from('src/main/resources') {
include 'license.txt'
include 'notice.txt'
+ include 'readme.txt'
expand(copyright: new Date().format('yyyy'), version: project.version)
}
diff --git a/gradle.properties b/gradle.properties
index bfa84232..7b96194d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,7 @@ aspectjVersion=1.8.9
antlrVersion=2.7.7
cdiVersion=1.0
gemfireVersion=1.0.0-incubating.M3
+googleCodeFindbugsVersion=2.0.2
hamcrestVersion=1.3
jacksonVersion=2.7.6
junitVersion=4.12
@@ -11,8 +12,9 @@ multiThreadedtcVersion=1.01
openwebbeansVersion=1.2.8
servletApiVersion=2.5
slf4jVersion=1.7.21
-springVersion=4.2.7.RELEASE
+springVersion=4.2.8.RELEASE
spring.range="[4.0.0, 5.0.0)"
-springDataBuildVersion=1.8.2.RELEASE
-springDataCommonsVersion=1.12.2.RELEASE
+springDataBuildVersion=1.8.3.RELEASE
+springDataCommonsVersion=1.12.3.RELEASE
+springShellVersion=1.1.0.RELEASE
version=1.0.0.APACHE-GEODE-INCUBATING-M3-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 2de4cb14..1179253d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,22 +8,24 @@
org.springframework.data.build
spring-data-parent
- 1.8.1.RELEASE
+ 1.8.3.RELEASE
org.springframework.data
spring-data-geode
- 1.0.0.APACHE-GEODE-INCUBATING-SNAPSHOT
+ 1.0.0.APACHE-GEODE-INCUBATING-M3-SNAPSHOT
Spring Data Geode
SGF
2.7.7
- 1.0.0-incubating.M3-SNAPSHOT
+ 1.0.0-incubating.M3
+ 2.0.2
1.01
2.5
- 1.12.1.RELEASE
+ 1.12.3.RELEASE
+ 1.1.0.RELEASE
@@ -31,10 +33,12 @@
spring-libs-release
https://repo.spring.io/libs-release
+
@@ -76,93 +80,17 @@
${gemfire.version}
- com.fasterxml
- jackson-annotation
+ org.apache.logging.log4j
+ log4j-jcl
- com.fasterxml
- jackson-core
-
-
- com.fasterxml
- jackson-databind
-
-
- com.fasterxml.jackson.core
- jackson-core
-
-
- org.apache.hbase
- hbase
+ org.apache.logging.log4j
+ log4j-jul
org.apache.logging.log4j
log4j-slf4j-impl
-
- org.codehaus.jackson
- jackson-core
-
-
- org.codehaus.jackson
- jackson-core-asl
-
-
- org.codehaus.jackson
- jackson-jaxrs
-
-
- org.codehaus.jackson
- jackson-mapper-asl
-
-
- org.codehaus.jackson
- jackson-xc
-
-
- org.slf4j
- slf4j-api
-
-
- org.springframework
- spring-aop
-
-
- org.springframework
- spring-beans
-
-
- org.springframework
- spring-context
-
-
- org.springframework
- spring-context-support
-
-
- org.springframework
- spring-expression
-
-
- org.springframework
- spring-tx
-
-
- org.springframework
- spring-web
-
-
- org.springframework
- spring-webmvc
-
-
- org.springframework.data
- spring-data-commons
-
-
- org.springframework.shell
- spring-shell
-
@@ -186,7 +114,7 @@
com.google.code.findbugs
annotations
- 2.0.2
+ ${google-code-findbugs.version}
true
@@ -253,6 +181,19 @@
test
+
+ org.springframework.shell
+ spring-shell
+ ${spring-shell.version}
+ test
+
+
+ com.google.guava
+ guava
+
+
+
+