You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2014/03/04 01:15:49 UTC
git commit: TAP5-2296: Update dependencies and remove cross-module
dependency conflicts
Repository: tapestry-5
Updated Branches:
refs/heads/master 38df9dc43 -> ece516abb
TAP5-2296: Update dependencies and remove cross-module dependency conflicts
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/ece516ab
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/ece516ab
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/ece516ab
Branch: refs/heads/master
Commit: ece516abbcc86d302c05c85c6cd82d45d6bbfeb6
Parents: 38df9dc
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Mar 3 16:15:23 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Mar 3 16:15:23 2014 -0800
----------------------------------------------------------------------
build.gradle | 43 ++++++++++++++++++++++++++++++-
tapestry-hibernate-core/build.gradle | 20 +++-----------
2 files changed, 46 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ece516ab/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c1c401c..6013abd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ project.ext.versions = [
easymock: "3.0",
servletapi: "2.5",
spock: "0.7-groovy-2.0",
- hibernate: "4.1.2.Final",
+ hibernate: "4.3.1.Final",
groovy: "2.0.6",
slf4j: "1.7.2",
wro4j: "1.7.0",
@@ -260,6 +260,47 @@ subprojects {
subprojects.each { project.evaluationDependsOn(it.name) }
+subprojects {
+
+ // Prefer this version, because it has source artifacts available.
+ def servletAPI = 'org.mortbay.jetty:servlet-api-2.5:6.1.11'
+
+ def versionOverrides = [
+ "antlr:antlr": "2.7.7",
+ "cglib:cglib-nodep": "2.2",
+ "commons-codec:commons-codec": "1.8",
+ "commons-io:commons-io": "2.4",
+ "commons-logging:commons-logging": "1.1.3",
+ "hsqldb:hsqldb": "2.2.8",
+ "org.antlr:antlr-runtime": "3.4",
+ "org.apache.tomcat:dbcp": "6.0.32",
+ // "org.apache.tomcat:servlet-api": "6.0.30",
+ "org.hamcrest:hamcrest-core": "1.3",
+ "org.json:json": "20140107",
+ "org.yaml:snakeyaml": "1.8",
+ "xml-apis:xml-apis": "1.4.01"
+ ]
+
+ configurations.all {
+
+ resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+
+ def overrideVersion = versionOverrides[details.requested.group + ":" + details.requested.name]
+
+ if (overrideVersion != null && details.requested.version != overrideVersion) {
+ logger.info "Overriding dependency ${details.requested.group}:${details.requested.name} version ${details.requested.version} --> $overrideVersion"
+ details.useVersion overrideVersion
+ }
+
+ if (details.requested.name.startsWith("servlet-api")) {
+ logger.info "Overriding dependency ${details.requested.group}:${details.requested.name}:${details.requested.version} --> $servletAPI"
+ details.useTarget servletAPI
+ }
+
+ }
+ }
+}
+
// Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19
task aggregateJavadoc(type: Javadoc) {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ece516ab/tapestry-hibernate-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-hibernate-core/build.gradle b/tapestry-hibernate-core/build.gradle
index 3a5aec0..a2416d4 100644
--- a/tapestry-hibernate-core/build.gradle
+++ b/tapestry-hibernate-core/build.gradle
@@ -3,24 +3,12 @@ description = "Basic Hibernate services for Tapestry, useable outside of a Tapes
dependencies {
compile project(':tapestry-ioc')
-
- compile group: 'org.hibernate', name: 'hibernate-core', version: versions.hibernate, transitive: false
- compile "org.hibernate:hibernate-commons-annotations:3.2.0.Final"
- compile "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final"
- compile "org.jboss.logging:jboss-logging:3.1.0.GA"
-
- runtime "geronimo-spec:geronimo-spec-jta:1.0-M1"
- runtime "antlr:antlr:2.7.6"
- runtime "dom4j:dom4j:1.6.1"
- runtime "javassist:javassist:3.12.1.GA"
-
-
- testCompile project(':tapestry-test')
- testCompile "org.easymock:easymock:${versions.easymock}"
-
+ compile group: 'org.hibernate', name: 'hibernate-core', version: versions.hibernate
+
+ testCompile project(':tapestry-test')
+ testCompile "org.easymock:easymock:${versions.easymock}"
testCompile "org.testng:testng:${versions.testng}", { transitive = false }
-
testRuntime "org.hsqldb:hsqldb:2.2.8"
}