Skip to content
Merged
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
- name: Build
run: ./gradlew build

- name: Publish to OSSRH
- name: Publish to Maven Central
if: github.ref == 'refs/heads/main'
run: ./gradlew publishToOSSRH closeAndReleaseOSSRHStagingRepository -PisReleaseVersion=${{ env.DO_RELEASE }}
run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PisReleaseVersion=${{ env.DO_RELEASE }}
env:
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PWD }}
ORG_GRADLE_PROJECT_OSSRHUsername: ${{ secrets.OSSRH_USER_NAME }}
ORG_GRADLE_PROJECT_OSSRHPassword: ${{ secrets.OSSRH_PASSWORD }}
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.MAVEN_CENTRAL_USER }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

- name: Prepare release PR
uses: GoogleCloudPlatform/release-please-action@v2
Expand All @@ -43,4 +43,4 @@ jobs:
command: release-pr
release-type: simple
package-name: ${{ github.event.repository.name }}
changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"api","section":"API changes","hidden":false}]'
changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"api","section":"API changes","hidden":false}]'
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'signing'
id 'base'
id 'io.freefair.lombok' version '8.11' apply false
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
}

description = 'Utility classes for working with the REST API interfaces provided by the various Fortify products'
Expand All @@ -24,12 +24,12 @@ ext {
version = latestReleaseVersion+versionSuffix

nexusPublishing {
repositories {
OSSRH {
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
repositories {
sonatype {
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
}
}
}

allprojects {
Expand Down Expand Up @@ -85,7 +85,7 @@ allprojects {
def signingKey = findProperty("signingKey")
def signingPassword = findProperty("signingPassword")
useInMemoryPgpKeys(signingKey, signingPassword)
required { gradle.taskGraph.hasTask("publishToOSSRH") }
required { gradle.taskGraph.hasTask("publishToSonatype") }
sign publishing.publications.mavenJava
}
}
Expand Down
6 changes: 3 additions & 3 deletions common-rest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies {
implementation 'commons-lang:commons-lang'
implementation 'commons-logging:commons-logging'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testImplementation 'org.junit.platform:junit-platform-launcher:1.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
testImplementation 'org.junit.platform:junit-platform-launcher:1.11.4'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'

}
10 changes: 5 additions & 5 deletions fortify-client-api-bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ javaPlatform {
}

dependencies {
api platform('com.fasterxml.jackson:jackson-bom:2.19.4')
api platform('org.glassfish.jersey:jersey-bom:2.42')
api platform('com.fasterxml.jackson:jackson-bom:2.20.1')
api platform('org.glassfish.jersey:jersey-bom:2.47')
api platform('org.apache.logging.log4j:log4j-bom:2.25.3')
api platform('org.springframework:spring-framework-bom:5.3.33')
api platform('org.springframework:spring-framework-bom:5.3.39')

constraints {
api "org.apache.httpcomponents:httpcore:4.4.16"
api "org.apache.httpcomponents:httpclient:4.5.14"
api "jakarta.ws.rs:jakarta.ws.rs-api:2.1.6"

api "commons-lang:commons-lang:2.6"
api "commons-beanutils:commons-beanutils:1.9.4"
api "commons-beanutils:commons-beanutils:1.10.0"
api "commons-codec:commons-codec:1.20.0"
api "commons-collections:commons-collections:3.2.2"
api "commons-logging:commons-logging:1.3.0"
api "commons-logging:commons-logging:1.3.4"

api "com.fortify.client.api:common-log:${project.version}"
api "com.fortify.client.api:common-spring:${project.version}"
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.1.8
6.1.9