From b71decb9e076a3bb90a17cd8c3772562febc0d63 Mon Sep 17 00:00:00 2001 From: Florian Rampp Date: Sun, 15 Jul 2012 13:10:21 +0200 Subject: [PATCH] switch to Gradle 1.0 and workaround for orbit dependency --- gradle/wrapper/gradle-wrapper.properties | 3 ++- server/build.gradle | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bc16716..073319c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions-snapshots/gradle-1.1-rc-1-20120714000108+0200-bin.zip +#distributionUrl=http\://services.gradle.org/distributions-snapshots/gradle-1.1-rc-1-20120714000108+0200-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip diff --git a/server/build.gradle b/server/build.gradle index b242b7d..23cf931 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -3,6 +3,19 @@ dependencies { compile project(':hub') compile group: 'com.google.inject.extensions', name: 'guice-servlet', version: '3.0' - compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.+' - compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.1.+' + compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.1.4.v20120524' + + // compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.4.v20120524' + // this is a workaround for bug http://issues.gradle.org/browse/GRADLE-2076 + compile module("org.eclipse.jetty:jetty-server:8.1.4.v20120524") { + dependencies( + "org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016@jar", + "org.eclipse.jetty:jetty-continuation:8.1.4.v20120524", + "org.eclipse.jetty:jetty-http:8.1.4.v20120524" + ) + } + + compile group: 'org.zdevra', name: 'lime', version: '0.4.1' + + compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.6' } \ No newline at end of file