From c7b4d6187c858ea30644a8f4f8a5b32be0abe968 Mon Sep 17 00:00:00 2001 From: Damian Palpacelli Date: Sun, 15 Mar 2015 16:25:49 -0300 Subject: [PATCH] Upgrade to java 8 and dependencies --- .travis.yml | 3 +-- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 51017 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- system.properties | 1 - web-interface/build.gradle | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 system.properties 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 b7612167031001b7b84baf2a959e8ea8ad03c011..3d0dee6e8edfecc92e04653ec780de06f7b34f8b 100644 GIT binary patch delta 1824 zcmZXU3rtg29L8^NTWGbE%A!{!C?1bGl(y%cN}&s%Inz!4d&4S2<>CjnkJXRVENUBeS;|59q$@uE z?TOA{4{HetjeyRjg$(lB!}y$5ilXKz&=4U3bv;7R#p%RQCbyBs%9>|kf|a}Q3h{1> zJh|B8ixW(-O1F12$EteYPEu|1F4=)Sk5Cm+-$cks-lHR2lD8I>YszCHyGKZz2g@S6g zW&NG=Ma_z4x5%q)v$i*dm8_lZv*Xu(YSR7rVy;XPzg}?8+4_Ro$$#NYg{Z~g_NwZ2$1vLT343cQnMVXB@$MW(X!ggK z(ntY)!ZNmgP;6jJ)23V|sxG;Tg{xjE4!m8=P`eEA^(h+8u?a;5fTGOZU{PrT4(mml z+Kf3eEH^WlEky71)I>rRm!fLT!08exFgFM^%h}&@apalL{w3ih1t(3h_oQ%!c;m&b zB<<6Z^A@;jRPT<}x2_7KDbais-M`^DxOweYk zC3AreCiMZRj$pCdQp$8&p?F#@hQV2|)whi} ziUx*m2jJD?hrq4tLC1V;%aV6az!XJ@)sLQjeq zze>9oTOL{o{n8qtO06UIilC>kN8XqAW?)deIUM?D_o3l^Z(`J~PeRvtBQ#2A3T}D} zK~^8Z3t{bzP*jtJz6O5m!!56Tp0Aa_c5ex`zqNA_2-ZfJ1Dk#fKfEjt(6A^<&Zek9 zqnC022!fSbGob3eK%D!ARO}ob%EH1hL`v4fN!ZET6m!FA*a;tzV^KG?Dqo4#!4Qu;Ve7 Ph(+00+SaCC8;kxAYaCJ{ delta 1783 zcmZXU3rtg29L8^7wDKs0L2;do4tYc#qm(hU!}ttQ-j7ikR0C3A2!V=>Ido_>_*jIE z9-@?CmdH@)7KXIEN};V#kOU$mEM*dgC>vikUuG#r57ojx7~Zm)%w2QWvFesfb2wg6;~L6g=dM#=nE8 z5%|#_Q$ow77t@h-iTOLS6s&q=Y27%^HpmO)-of5DFNlRaJANt~sa$tIN2G29*x~B! z;Bs5!1%+p0rH+u|ycf|doVOBN%;u0i{^{6I0!~X0IB|ExBrp06Cx}EJi<))f;C2w( z#s^QN!Yz*=#(Zw|9s+hpwx0`)+gH#lH3Z zk{EHjdQv?)?j5~qI2dL5zK%10pySe^){MG}nf)h+Sys)&4~{)FS!J*;t}s7t?lmph z_s!!`ki@oh)$g=z>2_Wf>Z-dhrZoj-csGeZ_uPA0mR8uQrrn8D47eH_ z$G!nh(IKn7-ZQ0THOBp^WnoJ_3u^gU>$Ay2S0fdo8)tp3Lt5giGY%IU5??J8a@%Kp z(!b2EYgYY|`0Gm6c=ew3_eTCnV3Xp{B!xCKk)>@qHiuPhhKh!& zqRe+WPUO^WdHj3Bbb^?$A&4-bEbszT$812PiKkWPS@E>u0ttgl!k(prsVWvhs2#w$ zav^Xu+iT}e*0E6JmCs+{@bWKCu#xxT{0R02E@*JtXXVw-sOnI&h&|f3Q&`R1Y-OVA z&0BN^)nc2e`BV*TQ3G4t{a=eyeSGa=!!11R`dt~m(aXlYI6%_$5PJ^INtlzjs2Cjb zuhfnudQ|=}08_izgY5I`w7)9(Fj4`Vq?*Q@PPqyh4itPt1^m zPFcbPv=~>Q?s$g+nT@5BG8mWu0|PgJ=`0F-*5N~e+nyYqu)vkF3?D(r29V96KnX_( zQabD@IP)i^J{_j=;0xZE>dvL$c&-2#JMGacdDtnSKj4wRO1}eHfqDV`wJWqdL7v_j zc}nPg;!aJ!=I#KD`nBoMzZ^hK@A5&YUzdP>J(xn{xoj{J%ms=rjGu=!k8rA%814oh zbfK32ICEMrfbEXjZ+>D|BPiGq;Rv=G5Ilcd8m6TYgp@%LJ2yOxr_m6WfHDKVTctrj zpN|FRc6Tsfa9;o5O&j<$IrzsQ_8`|T^>KqaZ^O*38}eR)!`;5r_5sD+yO6loorVOj zClQJ4o@^vWdUBBX$cUL*BX(G(3{*N{%0n}?Gj@J6%aIdvUx9@AJ}$ZT v9z{;cny~g}A!l!&6p7ltwVPU!kR!9;4*M;c$O-J1AyLtvwZ4Iu`{VuvJJ`1a 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()