Release 6.0.1

wallee-payment · Jul 27, 2023 · 7724f33 · 7724f33
1 parent f94eaec
commit 7724f33
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 122 deletions.
diff --git 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
@@ -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
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.wallee</groupId>
     <artifactId>wallee-java-sdk</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -33,7 +33,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "com.wallee:wallee-java-sdk:6.0.0"
+compile "com.wallee:wallee-java-sdk:6.0.1"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/wallee-java-sdk-6.0.0.jar`
+* `target/wallee-java-sdk-6.0.1.jar`
 * `target/lib/*.jar`
 
 ## Usage

diff --git a/before_deploy.sh b/before_deploy.sh
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.wallee'
-version = '6.0.0'
+version = '6.0.1'
 
 buildscript {
     repositories {

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.wallee",
     name := "wallee-java-sdk",
-    version := "6.0.0",
+    version := "6.0.1",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

diff --git a/codesigning.asc.enc b/codesigning.asc.enc
diff --git a/deploy.sh b/deploy.sh
diff --git a/mvn_settings.xml b/mvn_settings.xml
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>wallee-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>wallee-java-sdk</name>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <url>https://www.wallee.com</url>
     <description>The SDK for simplifying the integration with wallee API.</description>
     <scm>
@@ -38,20 +38,8 @@
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
     </distributionManagement>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -103,7 +91,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <!-- attach test jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -120,7 +107,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -192,35 +178,54 @@
             </plugin>
         </plugins>
     </build>
-
     <profiles>
         <profile>
-            <id>sign</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>build-extras</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>release</id>
             <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <artifactId>maven-release-plugin</artifactId>
+                            <version>3.0.0</version>
+                            <configuration>
+                                <tagNameFormat>@{project.version}</tagNameFormat>
+                            </configuration>
+                        </plugin>
+                        <!-- The key's name & passphrase are configured via GitHub's setup-java action. -->
+                        <plugin>
+                            <artifactId>maven-gpg-plugin</artifactId>
+                            <version>3.0.1</version>
+                            <executions>
+                                <execution>
+                                    <id>sign-artifacts</id>
+                                    <phase>verify</phase>
+                                    <goals>
+                                        <goal>sign</goal>
+                                    </goals>
+                                    <configuration>
+                                        <!-- This is required to make sure the plugin does not stop asking for -->
+                                        <!-- user input on the passphrase -->
+                                        <gpgArguments>
+                                            <arg>--pinentry-mode</arg>
+                                            <arg>loopback</arg>
+                                        </gpgArguments>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                         <plugin>
+                            <groupId>org.sonatype.plugins</groupId>
+                            <artifactId>nexus-staging-maven-plugin</artifactId>
+                            <version>1.6.13</version>
+                            <extensions>true</extensions>
+                            <configuration>
+                                <serverId>ossrh</serverId>
+                                <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                                <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                 </pluginManagement>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -248,11 +253,17 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
-
     <dependencies>
         <dependency>
             <groupId>io.swagger</groupId>
@@ -310,4 +321,4 @@
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.2</junit-version>
     </properties>
-</project>
+</project>
diff --git a/src/main/java/com/wallee/sdk/DefaultHeaders.java b/src/main/java/com/wallee/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", "6.0.1");
         headers.put("x-meta-sdk-language", "java");
         headers.put("x-meta-sdk-provider", "wallee");
         headers.put("x-meta-sdk-language-version", System.getProperty("java.version"));

diff --git a/src/main/java/com/wallee/sdk/model/PaymentContract.java b/src/main/java/com/wallee/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");