Skip to content

Commit a2e268e

Browse files
Release 5.1.2
1 parent a1e74a1 commit a2e268e

File tree

12 files changed

+106
-85
lines changed

12 files changed

+106
-85
lines changed

.github/workflows/maven-publish.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
name: Maven Package
55
on:
6-
push
6+
release:
7+
types: [published]
78

89
jobs:
910
build:
@@ -18,18 +19,20 @@ jobs:
1819
with:
1920
distribution: 'temurin' # See 'Supported distributions' for available options
2021
java-version: '8'
22+
server-id: 'ossrh'
23+
server-username: ${{ secrets.OSSRH_USERNAME }}
24+
server-password: ${{ secrets.OSSRH_TOKEN }}
25+
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
26+
gpg-passphrase : ${{ secrets.SIGN_KEY_PASS }}
2127

22-
- name: install
23-
run : mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V
24-
2528
- name: Build with Maven
2629
id: build
2730
run: mvn -B package --file pom.xml
28-
29-
- name: Release Maven package
30-
uses: samuelmeuli/action-maven-publish@v1
31-
with:
32-
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
33-
gpg_passphrase: ${{ secrets.PASSPHRASE }}
34-
nexus_username: ${{ secrets.OSSRH_USERNAME }}
35-
nexus_password: ${{ secrets.OSSRH_TOKEN }}
31+
32+
- name: Publish with Maven
33+
id: deploy
34+
run: mvn -U -B clean deploy -P release -DskipTests=true
35+
env:
36+
SIGN_KEY_PASS: ${{ secrets.SIGN_KEY_PASS }}
37+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
38+
OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.travis.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1+
#
2+
# Generated by: https://github.com/swagger-api/swagger-codegen.git
3+
#
14
language: java
2-
dist: trusty
35
jdk:
4-
- oraclejdk8
5-
6-
sudo: false
7-
8-
install:
9-
- mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V
10-
6+
- oraclejdk8
7+
- oraclejdk7
8+
before_install:
9+
# ensure gradlew has proper permission
10+
- chmod a+x ./gradlew
1111
script:
12-
- mvn test -P !build-extras -B
13-
14-
cache:
15-
directories:
16-
- ~/.m2/repository
17-
18-
after_success:
19-
- /bin/sh ./before_deploy.sh
20-
- /bin/sh ./deploy.sh
12+
# test using maven
13+
- mvn test
14+
# uncomment below to test using gradle
15+
# - gradle test
16+
# uncomment below to test using sbt
17+
# - sbt test

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
2323
<dependency>
2424
<groupId>ch.postfinance</groupId>
2525
<artifactId>postfinancecheckout-java-sdk</artifactId>
26-
<version>6.0.0</version>
26+
<version>5.1.2</version>
2727
<scope>compile</scope>
2828
</dependency>
2929
```
@@ -33,7 +33,7 @@ Add this dependency to your project's POM:
3333
Add this dependency to your project's build file:
3434

3535
```groovy
36-
compile "ch.postfinance:postfinancecheckout-java-sdk:6.0.0"
36+
compile "ch.postfinance:postfinancecheckout-java-sdk:5.1.2"
3737
```
3838

3939
### Others
@@ -46,7 +46,7 @@ mvn clean package
4646

4747
Then manually install the following JARs:
4848

49-
* `target/postfinancecheckout-java-sdk-6.0.0.jar`
49+
* `target/postfinancecheckout-java-sdk-5.1.2.jar`
5050
* `target/lib/*.jar`
5151

5252
## Usage

before_deploy.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'idea'
22
apply plugin: 'eclipse'
33

44
group = 'ch.postfinance'
5-
version = '6.0.0'
5+
version = '5.1.2'
66

77
buildscript {
88
repositories {

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "ch.postfinance",
44
name := "postfinancecheckout-java-sdk",
5-
version := "6.0.0",
5+
version := "5.1.2",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),

codesigning.asc.enc

-9.31 KB
Binary file not shown.

deploy.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

mvn_settings.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

pom.xml

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>postfinancecheckout-java-sdk</artifactId>
66
<packaging>jar</packaging>
77
<name>postfinancecheckout-java-sdk</name>
8-
<version>6.0.0</version>
8+
<version>5.1.2</version>
99
<url>https://postfinance.ch/en/business/products/e-commerce/postfinance-checkout-all-in-one.html</url>
1010
<description>The SDK for simplifying the integration with PostFinance Checkout API.</description>
1111
<scm>
@@ -219,12 +219,53 @@
219219
</plugins>
220220
</build>
221221
</profile>
222-
<profile>
223-
<id>build-extras</id>
224-
<activation>
225-
<activeByDefault>true</activeByDefault>
226-
</activation>
222+
<profile>
223+
<id>release</id>
227224
<build>
225+
<pluginManagement>
226+
<plugins>
227+
<plugin>
228+
<artifactId>maven-release-plugin</artifactId>
229+
<version>3.0.0</version>
230+
<configuration>
231+
<tagNameFormat>@{project.version}</tagNameFormat>
232+
</configuration>
233+
</plugin>
234+
<!-- The key's name & passphrase are configured via GitHub's setup-java action. -->
235+
<plugin>
236+
<artifactId>maven-gpg-plugin</artifactId>
237+
<version>3.0.1</version>
238+
<executions>
239+
<execution>
240+
<id>sign-artifacts</id>
241+
<phase>verify</phase>
242+
<goals>
243+
<goal>sign</goal>
244+
</goals>
245+
<configuration>
246+
<!-- This is required to make sure the plugin does not stop asking for -->
247+
<!-- user input on the passphrase -->
248+
<gpgArguments>
249+
<arg>--pinentry-mode</arg>
250+
<arg>loopback</arg>
251+
</gpgArguments>
252+
</configuration>
253+
</execution>
254+
</executions>
255+
</plugin>
256+
<plugin>
257+
<groupId>org.sonatype.plugins</groupId>
258+
<artifactId>nexus-staging-maven-plugin</artifactId>
259+
<version>1.6.13</version>
260+
<extensions>true</extensions>
261+
<configuration>
262+
<serverId>ossrh</serverId>
263+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
264+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
265+
</configuration>
266+
</plugin>
267+
</plugins>
268+
</pluginManagement>
228269
<plugins>
229270
<plugin>
230271
<groupId>org.apache.maven.plugins</groupId>
@@ -252,6 +293,13 @@
252293
</execution>
253294
</executions>
254295
</plugin>
296+
<plugin>
297+
<artifactId>maven-gpg-plugin</artifactId>
298+
</plugin>
299+
<plugin>
300+
<groupId>org.sonatype.plugins</groupId>
301+
<artifactId>nexus-staging-maven-plugin</artifactId>
302+
</plugin>
255303
</plugins>
256304
</build>
257305
</profile>

src/main/java/ch/postfinance/sdk/DefaultHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void intercept(HttpRequest request) throws IOException {
3434

3535
private HttpHeaders getDefaultHeaders() {
3636
HttpHeaders headers = new HttpHeaders();
37-
headers.put("x-meta-sdk-version", "6.0.0");
37+
headers.put("x-meta-sdk-version", "5.1.2");
3838
headers.put("x-meta-sdk-language", "java");
3939
headers.put("x-meta-sdk-provider", "PostFinance Checkout");
4040
headers.put("x-meta-sdk-language-version", System.getProperty("java.version"));

src/main/java/ch/postfinance/sdk/model/PaymentContract.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ public class PaymentContract {
7474
protected Long id = null;
7575

7676

77+
@JsonProperty("lastModifiedDate")
78+
protected OffsetDateTime lastModifiedDate = null;
79+
80+
7781
@JsonProperty("rejectedOn")
7882
protected OffsetDateTime rejectedOn = null;
7983

@@ -183,6 +187,16 @@ public Long getId() {
183187
}
184188

185189

190+
/**
191+
* The date and time when the object was last modified.
192+
* @return lastModifiedDate
193+
**/
194+
@ApiModelProperty(value = "The date and time when the object was last modified.")
195+
public OffsetDateTime getLastModifiedDate() {
196+
return lastModifiedDate;
197+
}
198+
199+
186200
/**
187201
*
188202
* @return rejectedOn
@@ -271,6 +285,7 @@ public boolean equals(java.lang.Object o) {
271285
Objects.equals(this.createdOn, paymentContract.createdOn) &&
272286
Objects.equals(this.externalId, paymentContract.externalId) &&
273287
Objects.equals(this.id, paymentContract.id) &&
288+
Objects.equals(this.lastModifiedDate, paymentContract.lastModifiedDate) &&
274289
Objects.equals(this.rejectedOn, paymentContract.rejectedOn) &&
275290
Objects.equals(this.rejectionReason, paymentContract.rejectionReason) &&
276291
Objects.equals(this.startTerminatingOn, paymentContract.startTerminatingOn) &&
@@ -282,7 +297,7 @@ public boolean equals(java.lang.Object o) {
282297

283298
@Override
284299
public int hashCode() {
285-
return Objects.hash(account, activatedOn, contractIdentifier, contractType, createdBy, createdOn, externalId, id, rejectedOn, rejectionReason, startTerminatingOn, state, terminatedBy, terminatedOn, version);
300+
return Objects.hash(account, activatedOn, contractIdentifier, contractType, createdBy, createdOn, externalId, id, lastModifiedDate, rejectedOn, rejectionReason, startTerminatingOn, state, terminatedBy, terminatedOn, version);
286301
}
287302

288303

@@ -299,6 +314,7 @@ public String toString() {
299314
sb.append(" createdOn: ").append(toIndentedString(createdOn)).append("\n");
300315
sb.append(" externalId: ").append(toIndentedString(externalId)).append("\n");
301316
sb.append(" id: ").append(toIndentedString(id)).append("\n");
317+
sb.append(" lastModifiedDate: ").append(toIndentedString(lastModifiedDate)).append("\n");
302318
sb.append(" rejectedOn: ").append(toIndentedString(rejectedOn)).append("\n");
303319
sb.append(" rejectionReason: ").append(toIndentedString(rejectionReason)).append("\n");
304320
sb.append(" startTerminatingOn: ").append(toIndentedString(startTerminatingOn)).append("\n");

0 commit comments

Comments
 (0)