diff --git a/.gitignore b/.gitignore index 7b715a59b..1a64107ed 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ atlassian-ide-plugin.xml *.class .*.swp /bin +*.log diff --git a/build.gradle b/build.gradle index 7e12f9427..a10b91ba8 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ allprojects { } subprojects { - apply plugin: 'java' apply plugin: 'maven' + apply plugin: 'java' sourceCompatibility = JavaVersion.VERSION_1_7 repositories { @@ -35,7 +35,7 @@ subprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.0' + gradleVersion = '2.1' } project(':integration') { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0087cd3b1..b76121670 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 96cfe1be9..9541b2481 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 29 14:10:20 MDT 2014 +#Mon Oct 13 13:19:26 MDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip