From fe15c81da13b1f4c66ef3c6bd588569890fdd9d5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 4 Apr 2014 14:18:59 -0700 Subject: [PATCH] Included change log notes for the SDG 1.3.4 release. Updated the SDG dependency declarations in the build.gradle file to properly 'exclude' the 'commons-logging' transitive dependency included by the Spring Framework dependencies. --- build.gradle | 64 ++++++++++++++++++++----------------- docs/src/info/changelog.txt | 17 ++++++++++ 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index f875817c..5ec08f57 100644 --- a/build.gradle +++ b/build.gradle @@ -35,44 +35,50 @@ test { // Common dependencies dependencies { // Logging + compile 'org.aspectj:aspectjrt:1.7.2' + compile 'org.aspectj:aspectjweaver:1.7.2' + compile 'org.codehaus.jackson:jackson-core-asl:1.9.12' + compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.12' compile "org.slf4j:slf4j-api:$slf4jVersion" compile "org.slf4j:jcl-over-slf4j:$slf4jVersion" testRuntime "log4j:log4j:$log4jVersion" testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion" - + // Spring Framework compile("org.springframework:spring-core:$springVersion") { - exclude module: "commons-logging" + exclude group: "commons-logging", module: "commons-logging" + } + compile("org.springframework:spring-aop:$springVersion") { + exclude group: "commons-logging", module: "commons-logging" + } + compile("org.springframework:spring-context-support:$springVersion") { + exclude group: "commons-logging", module: "commons-logging" + } + compile("org.springframework:spring-tx:$springVersion") { + exclude group: "commons-logging", module: "commons-logging" } - compile "org.springframework:spring-context-support:$springVersion" - compile "org.springframework:spring-tx:$springVersion" - compile "org.springframework:spring-aop:$springVersion" - compile 'org.aspectj:aspectjweaver:1.7.2' - compile 'org.aspectj:aspectjrt:1.7.2' - compile 'org.codehaus.jackson:jackson-core-asl:1.9.12' - compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.12' - - // GemFire - compile("com.gemstone.gemfire:gemfire:$gemfireVersion") - runtime("antlr:antlr:2.7.7") - //runtime("commons-modeler:commons-modeler:2.0.1") - - - - - // Testing - testCompile "org.mockito:mockito-core:$mockitoVersion" - testCompile "org.springframework:spring-test:$springVersion" - testCompile "junit:junit-dep:$junitVersion" - testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion" - testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" - testCompile "javax.annotation:jsr250-api:1.0", optional // Spring Data - compile "org.springframework.data:spring-data-commons:${springDataCommonsVersion}" - // - testCompile "cglib:cglib:${cglibVersion}" - testCompile "org.apache.derby:derbyLocale_zh_TW:10.9.1.0" + compile("org.springframework.data:spring-data-commons:${springDataCommonsVersion}") { + exclude group: "commons-logging", module: "commons-logging" + } + + // GemFire + compile("com.gemstone.gemfire:gemfire:$gemfireVersion") + runtime("antlr:antlr:2.7.7") + + // Testing + testCompile("org.springframework:spring-test:$springVersion") { + exclude group: "commons-logging", module: "commons-logging" + } + testCompile "junit:junit-dep:$junitVersion" + testCompile "org.mockito:mockito-core:$mockitoVersion" + testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion" + testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" + testCompile "cglib:cglib:${cglibVersion}" + + testCompile "javax.annotation:jsr250-api:1.0", optional + testCompile "org.apache.derby:derbyLocale_zh_TW:10.9.1.0" } sourceCompatibility = 1.6 diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt index b45209f0..866f4aea 100644 --- a/docs/src/info/changelog.txt +++ b/docs/src/info/changelog.txt @@ -51,6 +51,23 @@ Changes in version 1.4 M1 (2014-03-31) ** Task * [SGF-266] - Release 1.4 M1 + +Changes in Version 1.3.4 (2014-04-04) +------------------------------------- +General + * This is a maintenance/patch release to address bugs and other minor improvements. +Bugs + * [SGF-235] - NPE in DefaultFunctionArgumentResolver.resolveFunctionArguments(30) when a Function has no arguments and none are provided. + * [SGF-238] - "jndi-prop" is not parced correctly. + * [SGF-239] - The value "XaPooledDataSource" of jndi-binding "type" attribute should be changed to "XAPooledDataSource". + * [SGF-240] - XML schema type restrictions should be avoided in order to support placeholders (al types should be xs:string). + * [SGF-246] - execute function always assumes arguments are passed. + * [SGF-249] - The SDG XSD is restricting the use of property placeholder values on , compaction-threshold attributes given the attribute type is a short and not string. + * [SGF-255] - The element's 'threshold' attribute is required even when the Eviction type is 'HEAP_PERCENTAGE'. +Improvements + * Upgrades SDG to Spring Framework 3.2.8 and Spring Data Commons 1.7.1. + + Changes in Version 1.3.3 (2013-11-13) ------------------------------------- General