Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 14 additions & 25 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,19 @@ 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+')
}
}

plugins {
id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
}

allprojects {
repositories {
mavenCentral()
maven {
url "https://releases.jfrog.io/artifactory/oss-releases"
url = "https://releases.jfrog.io/artifactory/oss-releases"
}
}

Expand All @@ -30,8 +26,8 @@ allprojects {
version = currentVersion
status = version.endsWith('-SNAPSHOT') ? 'integration' : 'release'

project.tasks.withType(Jar).each {
it.version = currentVersion
tasks.withType(Jar).configureEach {
version = currentVersion
}
}

Expand All @@ -45,23 +41,14 @@ artifactory {
}
}

nexusPublishing {
repositories {
sonatype {
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
}
}
}

subprojects {
apply plugin: 'java-library'
apply plugin: 'signing'

sourceCompatibility = 1.8
targetCompatibility = 1.8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

// Force secure versions to fix vulnerabilities
configurations.all {
Expand Down Expand Up @@ -91,22 +78,24 @@ subprojects {
api 'org.jfrog.buildinfo:build-info-api:2.43.9'
}

task sourcesJar(type: Jar, dependsOn: classes) {
tasks.register('sourcesJar', Jar) {
dependsOn classes
archiveClassifier.set('sources')
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
tasks.register('javadocJar', Jar) {
dependsOn javadoc
archiveClassifier.set('javadoc')
from javadoc.destinationDir
}

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
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
currentVersion=2.22.0
currentVersion=2.23.0-SNAPSHOT
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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-8.12.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2.22.0-SNAPSHOT
version=2.23.0-SNAPSHOT
12 changes: 12 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
plugins {
id 'com.gradleup.nmcp.settings' version '1.6.1'
}

nmcpSettings {
centralPortal {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
publishingType = "USER_MANAGED"
}
}

String rootName = 'artifactory-java-client'
String api = 'api'
String services = 'services'
Expand Down