diff --git a/build.gradle b/build.gradle index 51f42158331..9bd38cadf7b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,3 @@ -buildscript { - dependencies { - classpath "pl.allegro.tech.build:axion-release-plugin:1.14.4" - } - - configurations.all { - resolutionStrategy.dependencySubstitution { - substitute module("com.jcraft:jsch") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained" - substitute module("com.jcraft:jsch.agentproxy") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained" - substitute module("com.jcraft:jzlib") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained" - } - } -} - plugins { id 'datadog.gradle-debug' id 'datadog.dependency-locking' @@ -20,7 +6,7 @@ plugins { id 'com.github.spotbugs' version '5.0.14' id 'de.thetaphi.forbiddenapis' version '3.8' - id 'pl.allegro.tech.build.axion-release' version '1.14.4' + id 'org.shipkit.shipkit-auto-version' version '2.1.2' id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' id 'com.gradleup.shadow' version '8.3.6' apply false @@ -34,7 +20,6 @@ description = 'dd-trace-java' def isCI = System.getenv("CI") != null apply from: "$rootDir/gradle/repositories.gradle" -apply from: "$rootDir/gradle/scm.gradle" spotless { // only resolve the spotless dependencies once in the build @@ -69,9 +54,11 @@ apply from: "$rootDir/gradle/spotless.gradle" def compileTask = tasks.register("compile") +def repoVersion = version + allprojects { group = 'com.datadoghq' - version = scmVersion.version + version = repoVersion if (isCI) { buildDir = "$rootDir/workspace/${projectDir.path.replace(rootDir.path, '')}/build/" @@ -119,7 +106,7 @@ nexusPublishing { def writeMainVersionFileTask = tasks.register('writeMainVersionFile') { def versionFile = file("${rootProject.buildDir}/main.version") - inputs.property "version", scmVersion.version + inputs.property "version", project.version outputs.file versionFile doFirst { diff --git a/gradle/scm.gradle b/gradle/scm.gradle deleted file mode 100644 index 655de2ae8cf..00000000000 --- a/gradle/scm.gradle +++ /dev/null @@ -1,14 +0,0 @@ -scmVersion { - tag { - prefix = 'v' - versionSeparator = '' - } - - versionIncrementer 'incrementMinor' - - checks { - uncommittedChanges = false - aheadOfRemote = true - snapshotDependencies = false - } -}