diff --git a/build.gradle b/build.gradle index 35ebaaaf..12141135 100644 --- a/build.gradle +++ b/build.gradle @@ -2,23 +2,23 @@ buildscript { repositories { mavenCentral() maven { - url "https://releases.jfrog.io/artifactory/oss-releases" + url="https://releases.jfrog.io/artifactory/oss-releases" } } dependencies { - classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4+') + classpath('org.jfrog.buildinfo:build-info-extractor-gradle:6+') } } plugins { - id 'io.github.gradle-nexus.publish-plugin' version '1.0.0' + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } allprojects { repositories { mavenCentral() maven { - url "https://releases.jfrog.io/artifactory/oss-releases" + url="https://releases.jfrog.io/artifactory/oss-releases" } } @@ -57,9 +57,10 @@ nexusPublishing { subprojects { apply plugin: 'java-library' apply plugin: 'signing' - - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } // Force secure versions to fix vulnerabilities configurations.all { @@ -125,9 +126,9 @@ subprojects { test { useTestNG() testLogging { - exceptionFormat "full" + exceptionFormat="full" events "started", "passed", "skipped", "failed", "standardOut", "standardError" - minGranularity 0 + minGranularity=0 } ignoreFailures = System.getenv("IGNORE_FAILURES") ? System.getenv("IGNORE_FAILURES").toBoolean() : false } @@ -169,7 +170,7 @@ subprojects { } signing { - required { !version.endsWith('-SNAPSHOT') } + required={ !version.endsWith('-SNAPSHOT') } def signingKey = findProperty("signingKey") def signingPassword = findProperty("signingPassword") useInMemoryPgpKeys(signingKey, signingPassword) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c7d437bb..78dfb562 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/httpClient/build.gradle b/httpClient/build.gradle index b5ca94e0..85716be0 100644 --- a/httpClient/build.gradle +++ b/httpClient/build.gradle @@ -1,4 +1,4 @@ -group 'org.jfrog.artifactory.client' +group='org.jfrog.artifactory.client' apply plugin: 'java' @@ -7,6 +7,6 @@ repositories { } dependencies { - testImplementation group: 'org.testng', name: 'testng', version: '7.5.1' - testImplementation group: 'com.github.tomakehurst', name: 'wiremock-jre8', version: '2.35.2' + testImplementation 'org.testng:testng:7.5.1' + testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.2' } \ No newline at end of file diff --git a/services/build.gradle b/services/build.gradle index 0d7a2dac..e2386720 100644 --- a/services/build.gradle +++ b/services/build.gradle @@ -8,14 +8,14 @@ dependencies { implementation addSlf4J('log4j-over-slf4j') implementation addSlf4J('jcl-over-slf4j') implementation 'commons-io:commons-io:2.18.0' - testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: '2.2' - testImplementation group: 'org.testng', name: 'testng', version: '7.5.1' + testImplementation 'org.hamcrest:hamcrest-core:2.2' + testImplementation 'org.testng:testng:7.5.1' /* * Don't depend upon a specific logging implementation as a compile or runtime dependency. * https://github.com/jfrog/artifactory-client-java/issues/43 * https://github.com/jfrog/artifactory-client-java/issues/232 */ - testRuntimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.16' + testRuntimeOnly 'ch.qos.logback:logback-classic:1.3.16' } task createReleasePropertiesFile(type: Exec) { @@ -26,11 +26,11 @@ task createReleasePropertiesFile(type: Exec) { } def addGroovy(name) { - [group: 'org.apache.groovy', name: name, version: '4.0.23'] + "org.apache.groovy:${name}:4.0.23" } def addSlf4J(name) { - [group: 'org.slf4j', name: name, version: '1.7.32'] + "org.slf4j:${name}:1.7.32" } configurations {