From a2e268e61727012e82048fc596de1f2a7a440fcb Mon Sep 17 00:00:00 2001 From: wallee-deployment-user Date: Thu, 27 Jul 2023 11:52:45 +0200 Subject: [PATCH] Release 5.1.2 --- .github/workflows/maven-publish.yml | 27 ++++---- .travis.yml | 31 ++++----- README.md | 6 +- before_deploy.sh | 11 ---- build.gradle | 2 +- build.sbt | 2 +- codesigning.asc.enc | Bin 9536 -> 0 bytes deploy.sh | 10 --- mvn_settings.xml | 22 ------- pom.xml | 60 ++++++++++++++++-- .../ch/postfinance/sdk/DefaultHeaders.java | 2 +- .../sdk/model/PaymentContract.java | 18 +++++- 12 files changed, 106 insertions(+), 85 deletions(-) delete mode 100644 before_deploy.sh delete mode 100644 codesigning.asc.enc delete mode 100644 deploy.sh delete mode 100644 mvn_settings.xml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index ba8e570..800574a 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -3,7 +3,8 @@ name: Maven Package on: - push + release: + types: [published] jobs: build: @@ -18,18 +19,20 @@ jobs: with: distribution: 'temurin' # See 'Supported distributions' for available options java-version: '8' + server-id: 'ossrh' + server-username: ${{ secrets.OSSRH_USERNAME }} + server-password: ${{ secrets.OSSRH_TOKEN }} + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase : ${{ secrets.SIGN_KEY_PASS }} - - name: install - run : mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V - - name: Build with Maven id: build run: mvn -B package --file pom.xml - - - name: Release Maven package - uses: samuelmeuli/action-maven-publish@v1 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg_passphrase: ${{ secrets.PASSPHRASE }} - nexus_username: ${{ secrets.OSSRH_USERNAME }} - nexus_password: ${{ secrets.OSSRH_TOKEN }} + + - name: Publish with Maven + id: deploy + run: mvn -U -B clean deploy -P release -DskipTests=true + env: + SIGN_KEY_PASS: ${{ secrets.SIGN_KEY_PASS }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/.travis.yml b/.travis.yml index b62b7cc..70cb81a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,17 @@ +# +# Generated by: https://github.com/swagger-api/swagger-codegen.git +# language: java -dist: trusty jdk: - - oraclejdk8 - -sudo: false - -install: - - mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V - + - oraclejdk8 + - oraclejdk7 +before_install: + # ensure gradlew has proper permission + - chmod a+x ./gradlew script: - - mvn test -P !build-extras -B - -cache: - directories: - - ~/.m2/repository - -after_success: - - /bin/sh ./before_deploy.sh - - /bin/sh ./deploy.sh + # test using maven + - mvn test + # uncomment below to test using gradle + # - gradle test + # uncomment below to test using sbt + # - sbt test diff --git a/README.md b/README.md index 02f11d5..251a00e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Add this dependency to your project's POM: ch.postfinance postfinancecheckout-java-sdk - 6.0.0 + 5.1.2 compile ``` @@ -33,7 +33,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "ch.postfinance:postfinancecheckout-java-sdk:6.0.0" +compile "ch.postfinance:postfinancecheckout-java-sdk:5.1.2" ``` ### Others @@ -46,7 +46,7 @@ mvn clean package Then manually install the following JARs: -* `target/postfinancecheckout-java-sdk-6.0.0.jar` +* `target/postfinancecheckout-java-sdk-5.1.2.jar` * `target/lib/*.jar` ## Usage diff --git a/before_deploy.sh b/before_deploy.sh deleted file mode 100644 index 54da5dd..0000000 --- a/before_deploy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -if [ -z "${TRAVIS_TAG}" ]; -then - echo "[INFO] This is not tagged build. The TRAVIS_TAG is not set. Skipping before_deploy step."; - -else - echo "[INFO] Running before_deploy script. Decrypting 'codesigning.asc.enc'..." - openssl aes-256-cbc -K $encrypted_81c98acad902_key -iv $encrypted_81c98acad902_iv -in codesigning.asc.enc -out codesigning.asc -d && \ - gpg --fast-import codesigning.asc; -fi \ No newline at end of file diff --git a/build.gradle b/build.gradle index 959e540..8b766bf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'idea' apply plugin: 'eclipse' group = 'ch.postfinance' -version = '6.0.0' +version = '5.1.2' buildscript { repositories { diff --git a/build.sbt b/build.sbt index e1afec1..1b9c9c3 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "ch.postfinance", name := "postfinancecheckout-java-sdk", - version := "6.0.0", + version := "5.1.2", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/codesigning.asc.enc b/codesigning.asc.enc deleted file mode 100644 index f95e32565478bb6fefa1311cf96e07c70053e80f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9536 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 diff --git a/deploy.sh b/deploy.sh deleted file mode 100644 index 7ea0df6..0000000 --- a/deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -if [ -z "${TRAVIS_TAG}" ]; -then - echo "[INFO] This is not tagged build. The TRAVIS_TAG is not set. Skipping deployment."; - -else - echo "[INFO] Running deployment based on the mvn_settings.xml" - mvn deploy -P sign,build-extras --settings mvn_settings.xml; -fi \ No newline at end of file diff --git a/mvn_settings.xml b/mvn_settings.xml deleted file mode 100644 index 046501c..0000000 --- a/mvn_settings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - ossrh - ${env.OSSRH_JIRA_USERNAME} - ${env.OSSRH_JIRA_PASSWORD} - - - - - ossrh - - true - - - gpg - ${env.GPG_KEY_NAME} - ${env.GPG_PASSPHRASE} - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9a74f5e..43c130c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ postfinancecheckout-java-sdk jar postfinancecheckout-java-sdk - 6.0.0 + 5.1.2 https://postfinance.ch/en/business/products/e-commerce/postfinance-checkout-all-in-one.html The SDK for simplifying the integration with PostFinance Checkout API. @@ -219,12 +219,53 @@ - - build-extras - - true - + + release + + + + maven-release-plugin + 3.0.0 + + @{project.version} + + + + + maven-gpg-plugin + 3.0.1 + + + sign-artifacts + verify + + sign + + + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://oss.sonatype.org/ + true + + + + org.apache.maven.plugins @@ -252,6 +293,13 @@ + + maven-gpg-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/src/main/java/ch/postfinance/sdk/DefaultHeaders.java b/src/main/java/ch/postfinance/sdk/DefaultHeaders.java index fb28920..9f877ac 100644 --- a/src/main/java/ch/postfinance/sdk/DefaultHeaders.java +++ b/src/main/java/ch/postfinance/sdk/DefaultHeaders.java @@ -34,7 +34,7 @@ public void intercept(HttpRequest request) throws IOException { private HttpHeaders getDefaultHeaders() { HttpHeaders headers = new HttpHeaders(); - headers.put("x-meta-sdk-version", "6.0.0"); + headers.put("x-meta-sdk-version", "5.1.2"); headers.put("x-meta-sdk-language", "java"); headers.put("x-meta-sdk-provider", "PostFinance Checkout"); headers.put("x-meta-sdk-language-version", System.getProperty("java.version")); diff --git a/src/main/java/ch/postfinance/sdk/model/PaymentContract.java b/src/main/java/ch/postfinance/sdk/model/PaymentContract.java index 6f296ae..0d13e3d 100644 --- a/src/main/java/ch/postfinance/sdk/model/PaymentContract.java +++ b/src/main/java/ch/postfinance/sdk/model/PaymentContract.java @@ -74,6 +74,10 @@ public class PaymentContract { protected Long id = null; + @JsonProperty("lastModifiedDate") + protected OffsetDateTime lastModifiedDate = null; + + @JsonProperty("rejectedOn") protected OffsetDateTime rejectedOn = null; @@ -183,6 +187,16 @@ public Long getId() { } + /** + * The date and time when the object was last modified. + * @return lastModifiedDate + **/ + @ApiModelProperty(value = "The date and time when the object was last modified.") + public OffsetDateTime getLastModifiedDate() { + return lastModifiedDate; + } + + /** * * @return rejectedOn @@ -271,6 +285,7 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.createdOn, paymentContract.createdOn) && Objects.equals(this.externalId, paymentContract.externalId) && Objects.equals(this.id, paymentContract.id) && + Objects.equals(this.lastModifiedDate, paymentContract.lastModifiedDate) && Objects.equals(this.rejectedOn, paymentContract.rejectedOn) && Objects.equals(this.rejectionReason, paymentContract.rejectionReason) && Objects.equals(this.startTerminatingOn, paymentContract.startTerminatingOn) && @@ -282,7 +297,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(account, activatedOn, contractIdentifier, contractType, createdBy, createdOn, externalId, id, rejectedOn, rejectionReason, startTerminatingOn, state, terminatedBy, terminatedOn, version); + return Objects.hash(account, activatedOn, contractIdentifier, contractType, createdBy, createdOn, externalId, id, lastModifiedDate, rejectedOn, rejectionReason, startTerminatingOn, state, terminatedBy, terminatedOn, version); } @@ -299,6 +314,7 @@ public String toString() { sb.append(" createdOn: ").append(toIndentedString(createdOn)).append("\n"); sb.append(" externalId: ").append(toIndentedString(externalId)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" lastModifiedDate: ").append(toIndentedString(lastModifiedDate)).append("\n"); sb.append(" rejectedOn: ").append(toIndentedString(rejectedOn)).append("\n"); sb.append(" rejectionReason: ").append(toIndentedString(rejectionReason)).append("\n"); sb.append(" startTerminatingOn: ").append(toIndentedString(startTerminatingOn)).append("\n");