switch to Gradle 1.0 and workaround for orbit dependency

jambit · Jul 15, 2012 · b71decb · b71decb
1 parent 277a5fd
commit b71decb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git 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
@@ -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'
 }