diff --git a/.travis.yml b/.travis.yml
index b709c88..2c8567f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: java
 jdk:
-- openjdk7
-- oraclejdk7
+- oraclejdk8
 deploy:
   provider: heroku
   api_key:
diff --git a/build.gradle b/build.gradle
index 3179cf5..9844fb4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,13 +15,13 @@ subprojects {
     group = 'org.reparationservice'
     version = '0.0.1-SNAPSHOT'
 
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 
     eclipse {
         classpath {
             containers.remove('org.eclipse.jdt.launching.JRE_CONTAINER')
-            containers 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7'
+            containers 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8'
         }
     }
 
@@ -31,7 +31,7 @@ subprojects {
 
     dependencies {
     	compile 'joda-time:joda-time:2.6'
-        testCompile 'org.assertj:assertj-core:1.7.0'
+        testCompile 'org.assertj:assertj-core:2.0.0'
         testCompile 'de.bechte.junit:junit-hierarchicalcontextrunner:4.12.0'
     }
     //Expose project test classes
@@ -49,5 +49,5 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '2.1'
+  gradleVersion = '2.3'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b761216..3d0dee6 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 27e6690..ce05793 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 10 12:59:50 ART 2014
+#Sun Mar 15 15:40:16 ART 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
diff --git a/system.properties b/system.properties
deleted file mode 100644
index 97270b4..0000000
--- a/system.properties
+++ /dev/null
@@ -1 +0,0 @@
-java.runtime.version=1.7
diff --git a/web-interface/build.gradle b/web-interface/build.gradle
index 1d1bcd0..b797f6c 100644
--- a/web-interface/build.gradle
+++ b/web-interface/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '1.2.0.RELEASE'
+        springBootVersion = '1.2.2.RELEASE'
     }
     repositories {
         mavenCentral()