diff --git a/.gitignore b/.gitignore index a41b34ac..e456dd90 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ build *.ipr .idea *.iws +out diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 02e3bd63..4a55e410 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,5 +5,3 @@ dependencies { compile gradleApi() compile localGroovy() } - -configurations.archives.artifacts.clear() diff --git a/gradle/release-checks.gradle b/gradle/release-checks.gradle index 2f2796c2..3afdd055 100644 --- a/gradle/release-checks.gradle +++ b/gradle/release-checks.gradle @@ -1,8 +1,10 @@ -task checkDependencies << { - verifyNoDependenciesMatchingVersion(".*-SNAPSHOT") - if(releaseBuild) { - verifyNoDependenciesMatchingVersion(".*M.*") - verifyNoDependenciesMatchingVersion(".*RC.*") +task checkDependencies { + doLast { + verifyNoDependenciesMatchingVersion(".*-SNAPSHOT") + if (releaseBuild) { + verifyNoDependenciesMatchingVersion(".*M.*") + verifyNoDependenciesMatchingVersion(".*RC.*") + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ffe4709..2c19c0da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java b/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java index b1d2c7fa..0f150114 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java @@ -30,7 +30,7 @@ public class TestsWithJdepend { @Before public void setUp() throws IOException { jdepend = new JDepend(); - jdepend.addDirectory("build/classes/main"); + jdepend.addDirectory("build/classes/java/main"); } @Test diff --git a/settings.gradle b/settings.gradle index ebfb3463..7717667b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,8 +30,4 @@ rootProject.children.each { p-> } findProject(":spring-ldap-test-support").name = "spring-ldap-test" -findProject(":spring-ldap-test-support-unboundid").name = "spring-ldap-test-unboundid" - -// Exposes gradle buildSrc for IDE support -include "buildSrc" -rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src" +findProject(":spring-ldap-test-support-unboundid").name = "spring-ldap-test-unboundid" \ No newline at end of file