Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-533 - Update Spring dependencies, set Apache Geode version to 1.0.0-incubating.M3 and refactor exclusions.

Browse Source 
SGF-525 - Set Apache Geode version to 1.0.0-incubating.M3.
This commit is contained in:
John Blum
2016-09-20 13:20:16 -07:00
parent 86a5344a4a
commit 2c17055540
3 changed files with 44 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
build.gradle
View File

@@ -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)
}

8
gradle.properties
View File

@@ -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

111
pom.xml
View File

@@ -8,22 +8,24 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>1.8.1.RELEASE</version>
<version>1.8.3.RELEASE</version>
</parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-geode</artifactId>
<version>1.0.0.APACHE-GEODE-INCUBATING-SNAPSHOT</version>
<version>1.0.0.APACHE-GEODE-INCUBATING-M3-SNAPSHOT</version>
<name>Spring Data Geode</name>
<properties>
<dist.key>SGF</dist.key>
<antlr.version>2.7.7</antlr.version>
<gemfire.version>1.0.0-incubating.M3-SNAPSHOT</gemfire.version>
<gemfire.version>1.0.0-incubating.M3</gemfire.version>
<google-code-findbugs.version>2.0.2</google-code-findbugs.version>
<multithreadedtc.version>1.01</multithreadedtc.version>
<servlet-api.version>2.5</servlet-api.version>
<springdata.commons>1.12.1.RELEASE</springdata.commons>
<springdata.commons>1.12.3.RELEASE</springdata.commons>
<spring-shell.version>1.1.0.RELEASE</spring-shell.version>
</properties>
<repositories>
@@ -31,10 +33,12 @@
<id>spring-libs-release</id>
<url>https://repo.spring.io/libs-release</url>
</repository>
<!--
<repository>
<id>apache-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots</url>
</repository>
-->
</repositories>
<pluginRepositories>
@@ -76,93 +80,17 @@
<version>${gemfire.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml</groupId>
<artifactId>jackson-annotation</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.shell</groupId>
<artifactId>spring-shell</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -186,7 +114,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>2.0.2</version>
<version>${google-code-findbugs.version}</version>
<optional>true</optional>
</dependency>
@@ -253,6 +181,19 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.shell</groupId>
<artifactId>spring-shell</artifactId>
<version>${spring-shell.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>