diff --git a/CHANGELOG.md b/CHANGELOG.md index dc02e1c..e5e04d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [3.0.4.1] - 2024-09-13 + ### Fixed - Fix dependency information stripped from non-shaded jar [cyberark/conjur-api-java#119](https://github.com/cyberark/conjur-api-java/issues/119) @@ -34,15 +36,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [3.0.2] - 2020-10-28 ### Fixed -- Multiple unused transitive dependencies, such as `exec-maven-plugin`, were removed. - These could cause issues with downstream projects that had the `conjur-api-java` as +- Multiple unused transitive dependencies, such as `exec-maven-plugin`, were removed. + These could cause issues with downstream projects that had the `conjur-api-java` as a dependency [cyberark/conjur-api-java#93](https://github.com/cyberark/conjur-api-java/issues/93) ## [3.0.1] - 2020-06-23 ### Fixed -- A minor syntax issue in the `pom.xml` did not meet the requirements for Maven Central - publishing, preventing `3.0.0` from being released on Maven Central. This requirement - has been added, and all versions from `3.0.1` onward will be released on Maven Central. +- A minor syntax issue in the `pom.xml` did not meet the requirements for Maven Central + publishing, preventing `3.0.0` from being released on Maven Central. This requirement + has been added, and all versions from `3.0.1` onward will be released on Maven Central. [PR cyberark/conjur-api-java#86](https://github.com/cyberark/conjur-api-java/pull/86) ## [3.0.0] - 2020-06-22 @@ -52,16 +54,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. [cyberark/conjur-api-java#78](https://github.com/cyberark/conjur-api-java/issues/78) ### Added -- The `conjur-api-java` is now available through Maven Central without needing to be - built locally. Please see our [README.md](./README.md#using-maven-releases) for more - information on how you can use our latest Maven releases in your project! Alternatively, - check out [UPGRADING.md](./UPGRADING.md) to find out how to upgrade to `3.0.0` +- The `conjur-api-java` is now available through Maven Central without needing to be + built locally. Please see our [README.md](./README.md#using-maven-releases) for more + information on how you can use our latest Maven releases in your project! Alternatively, + check out [UPGRADING.md](./UPGRADING.md) to find out how to upgrade to `3.0.0` through maven central. [cyberark/conjur-api-java#6](https://github.com/cyberark/conjur-api-java/issues/6) - Enabled setting custom `javax.net.ssl.SSLContext` for TLS connection to Conjur server, which enables users to set up trust between the app and Conjur directly from the Java code. [cyberark/conjur-api-java#74](https://github.com/cyberark/conjur-api-java/issues/74) -- Introduced [upgrade instructions](https://github.com/cyberark/conjur-api-java/UPGRADING.md) - to provide instructions for upgrading to 3.0.0, or make use of published artifacts. These can be +- Introduced [upgrade instructions](https://github.com/cyberark/conjur-api-java/UPGRADING.md) + to provide instructions for upgrading to 3.0.0, or make use of published artifacts. These can be found in `UPGRADING.md`. [cyberark/conjur-api-java#77](https://github.com/cyberark/conjur-api-java/issues/77) ### Changed diff --git a/Jenkinsfile b/Jenkinsfile index 82bc475..30e3ddd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,6 +31,14 @@ if (params.MODE == "PROMOTE") { summon ./bin/publish.sh cp target/*.jar "${assetDirectory}" """ + + // Ensure the working directory is a safe git directory for the subsequent + // promotion operations after this block. + infrapool.agentSh 'git config --global --add safe.directory "$(pwd)"' + + // Copy Github Enterprise release to Github + release.copyEnterpriseRelease(params.VERSION_TO_PROMOTE) + } return } diff --git a/bin/build-tools-image.sh b/bin/build-tools-image.sh index d112a94..934f320 100755 --- a/bin/build-tools-image.sh +++ b/bin/build-tools-image.sh @@ -4,6 +4,13 @@ set -euo pipefail # Build tools image #FROM maven:${maven_version}-openjdk-${java_version}-slim +#docker build \ + #--build-arg maven_version=3 \ + #--build-arg java_version=8 \ + #-t tools \ + #-f tools.Dockerfile \ + #. + docker build \ --build-arg maven_version=3.8.4 \ --build-arg java_version=11 \ diff --git a/secrets.yml b/secrets.yml index e84b3fc..880fe0d 100644 --- a/secrets.yml +++ b/secrets.yml @@ -4,7 +4,7 @@ JFROG_USERNAME: !var ci/artifactory/users/jenkins/username JFROG_APIKEY: !var ci/artifactory/users/jenkins/password JFROG_REPO: "libs-snapshot-local" -OSSRH_USERNAME: !var ecosystems/java/ossrh/username -OSSRH_PASSWORD: !var ecosystems/java/ossrh/password +OSSRH_USERNAME: !var ecosystems/java/ossrh/token/username +OSSRH_PASSWORD: !var ecosystems/java/ossrh/token/password GPG_PRIVATE_KEY: !var:file ecosystems/java/gpg/private-key GPG_PASSWORD: !var:file ecosystems/java/gpg/password