Skip to content

Commit de89c82

Browse files
wallee-deployment-userwallee-deployment-user
committed
Release 6.1.0
1 parent 87b51ef commit de89c82

14 files changed

+690
-36
lines changed

‎.github/workflows/maven-publish.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
33

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

79
jobs:
810
build:

‎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.1</version>
26+
<version>6.1.0</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.1"
36+
compile "ch.postfinance:postfinancecheckout-java-sdk:6.1.0"
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.1.jar`
49+
* `target/postfinancecheckout-java-sdk-6.1.0.jar`
5050
* `target/lib/*.jar`
5151

5252
## Usage

‎build.gradle

Lines changed: 10 additions & 4 deletions
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.1'
5+
version = '6.1.0'
66

77
buildscript {
88
repositories {
@@ -96,20 +96,26 @@ if(hasProperty('target') && target == 'android') {
9696
ext {
9797
swagger_annotations_version = "1.5.17"
9898
jackson_version = "2.14.1"
99-
google_api_client_version = "1.23.0"
99+
google_api_client_version = "2.2.0"
100+
guava_version = "32.1.2-jre"
100101
jodatime_version = "2.9.9"
101102
junit_version = "4.13.2"
102103
httpclient_version = "4.5.14"
103104
}
104105

105106
dependencies {
106107
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
107-
compile "com.google.api-client:google-api-client:${google_api_client_version}"
108+
compile "com.google.api-client:google-api-client:${google_api_client_version}" {
109+
exclude group: 'commons-codec', module: 'commons-codec'
110+
}
111+
compile "com.google.guava:guava:$guava_version"
108112
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
109113
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
110114
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
111115
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
112-
compile "org.apache.httpcomponents:httpclient:$httpclient_version"
116+
compile("org.apache.httpcomponents:httpclient:$httpclient_version") {
117+
exclude group: 'commons-codec', module: 'commons-codec'
118+
}
113119
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
114120
testCompile "junit:junit:$junit_version"
115121
}

‎build.sbt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "ch.postfinance",
44
name := "postfinancecheckout-java-sdk",
5-
version := "6.0.1",
5+
version := "6.1.0",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.17",
13-
"com.google.api-client" % "google-api-client" % "1.23.0",
14-
"org.glassfish.jersey.core" % "jersey-common" % "2.34",
13+
"com.google.api-client" % "google-api-client" % "2.2.0" "compile" exclude("com.google.guava", "guava"),
14+
"com.google.guava" % "guava" % "32.1.2-jre" "compile",
15+
"org.glassfish.jersey.core" % "jersey-common" % "2.34" "compile",
1516
"com.fasterxml.jackson.core" % "jackson-core" % "2.14.1" % "compile",
1617
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.14.1" % "compile",
1718
"com.fasterxml.jackson.core" % "jackson-databind" % "2.14.1" % "compile",
18-
"org.apache.httpcomponents" % "httpclient" % "4.5.14" % "compile",
19+
"org.apache.httpcomponents" % "httpclient" % "4.5.14" % "compile" exclude("commons-codec", "commons-codec"),
1920
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.14.1" % "compile",
2021
"junit" % "junit" % "4.13.2" % "test",
2122
"com.novocode" % "junit-interface" % "0.10" % "test"

‎pom.xml

Lines changed: 20 additions & 12 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.1</version>
8+
<version>6.1.0</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>
@@ -22,16 +22,6 @@
2222
</license>
2323
</licenses>
2424

25-
<developers>
26-
<developer>
27-
<id>adamovic</id>
28-
<name>Slobodan Adamovic</name>
29-
<email>[email protected]</email>
30-
<organization>customweb GmbH</organization>
31-
<organizationUrl>https://www.customweb.com</organizationUrl>
32-
</developer>
33-
</developers>
34-
3525
<distributionManagement>
3626
<snapshotRepository>
3727
<id>ossrh</id>
@@ -316,12 +306,29 @@
316306
<groupId>com.google.api-client</groupId>
317307
<artifactId>google-api-client</artifactId>
318308
<version>${google-api-client-version}</version>
309+
<exclusions>
310+
<exclusion>
311+
<groupId>com.google.guava</groupId>
312+
<artifactId>guava</artifactId>
313+
</exclusion>
314+
</exclusions>
315+
</dependency>
316+
<dependency>
317+
<groupId>com.google.guava</groupId>
318+
<artifactId>guava</artifactId>
319+
<version>${guava-version}</version>
319320
</dependency>
320321
<!-- Apache HttpClient for building URLs from templates -->
321322
<dependency>
322323
<groupId>org.apache.httpcomponents</groupId>
323324
<artifactId>httpclient</artifactId>
324325
<version>${apache-httpclient-version}</version>
326+
<exclusions>
327+
<exclusion>
328+
<groupId>commons-codec</groupId>
329+
<artifactId>commons-codec</artifactId>
330+
</exclusion>
331+
</exclusions>
325332
</dependency>
326333
<!-- JSON processing: jackson -->
327334
<dependency>
@@ -356,7 +363,8 @@
356363
<properties>
357364
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
358365
<swagger-annotations-version>1.5.17</swagger-annotations-version>
359-
<google-api-client-version>1.23.0</google-api-client-version>
366+
<google-api-client-version>2.2.0</google-api-client-version>
367+
<guava-version>32.1.2-jre</guava-version>
360368
<jackson-version>2.14.1</jackson-version>
361369
<apache-httpclient-version>4.5.14</apache-httpclient-version>
362370
<maven-plugin-version>1.0.0</maven-plugin-version>

‎src/main/java/ch/postfinance/sdk/ApiClient.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,14 @@ public UserSpaceRoleService getUserSpaceRoleService() {
719719
return this.userSpaceRoleService;
720720
}
721721

722+
private WebAppService webAppService;
723+
public WebAppService getWebAppService() {
724+
if (this.webAppService == null) {
725+
this.webAppService = new WebAppService(this);
726+
}
727+
return this.webAppService;
728+
}
729+
722730
private WebhookListenerService webhookListenerService;
723731
public WebhookListenerService getWebhookListenerService() {
724732
if (this.webhookListenerService == null) {

‎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.1");
37+
headers.put("x-meta-sdk-version", "6.1.0");
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/AbstractPaymentLinkUpdate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@ public AbstractPaymentLinkUpdate addLineItemsItem(LineItemCreate lineItemsItem)
241241
}
242242

243243
/**
244-
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.
244+
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.
245245
* @return lineItems
246246
**/
247-
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.")
247+
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.")
248248
public List<LineItemCreate> getLineItems() {
249249
return lineItems;
250250
}

‎src/main/java/ch/postfinance/sdk/model/CardAuthenticationResponse.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
*/
3434
public enum CardAuthenticationResponse {
3535

36-
ENROLLMENT_VERIFICATION_ERROR("ENROLLMENT_VERIFICATION_ERROR"),
36+
FULLY_AUTHENTICATED("FULLY_AUTHENTICATED"),
3737

38-
NOT_ENROLLED("NOT_ENROLLED"),
38+
AUTHENTICATION_NOT_REQUIRED("AUTHENTICATION_NOT_REQUIRED"),
3939

40-
AUTHENTICATION_ERROR("AUTHENTICATION_ERROR"),
40+
NOT_ENROLLED("NOT_ENROLLED"),
4141

42-
AUTHENTICATION_NOT_REQUIRED("AUTHENTICATION_NOT_REQUIRED"),
42+
ENROLLMENT_ERROR("ENROLLMENT_ERROR"),
4343

44-
FULLY_AUTHENTICATED("FULLY_AUTHENTICATED");
44+
AUTHENTICATION_ERROR("AUTHENTICATION_ERROR");
4545

4646
private String value;
4747

‎src/main/java/ch/postfinance/sdk/model/PaymentLink.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ public String getLanguage() {
212212

213213

214214
/**
215-
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.
215+
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.
216216
* @return lineItems
217217
**/
218-
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.")
218+
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.")
219219
public List<LineItem> getLineItems() {
220220
return lineItems;
221221
}

0 commit comments

Comments
 (0)