Skip to content

Commit 8f60135

Browse files
GreatG0oseGreatG0ose
authored
Merge pull request #87 from unzerdev/develop
Release 1.2.1.0
2 parents dda6f66 + a7d7d08 commit 8f60135

File tree

202 files changed

+14951
-14230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+14951
-14230
lines changed

‎.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
1211
runs-on: ubuntu-latest
13-
1412
steps:
1513
- uses: actions/checkout@v3
1614
- name: Set up JDK 11
@@ -25,4 +23,6 @@ jobs:
2523
env:
2624
PAPI_PUBLIC_KEY: ${{ secrets.PAPI_PUBLIC_KEY }}
2725
PAPI_PRIVATE_KEY: ${{ secrets.PAPI_PRIVATE_KEY }}
28-
run: mvn -B test --file pom.xml -Dpublickey1="$PAPI_PUBLIC_KEY" -Dprivatekey1="$PAPI_PRIVATE_KEY" -Dprivatekey2="$PAPI_PRIVATE_KEY" -Dprivatekey3="$PAPI_PRIVATE_KEY" -DmarketplacePrivatekey="$PAPI_PRIVATE_KEY"
26+
PAPI_PRIVATE_KEY_NO_3DS: ${{ secrets.PAPI_PRIVATE_KEY_NO_3DS }}
27+
PAPI_PRIVATE_JAVA_MERCH_KEY: ${{ secrets.PAPI_PRIVATE_JAVA_MERCH_KEY }}
28+
run: mvn -B test --file pom.xml -Dpublickey1="$PAPI_PUBLIC_KEY" -Dprivatekey1="$PAPI_PRIVATE_KEY" -Dprivatekey2="$PAPI_PRIVATE_KEY_NO_3DS" -Dprivatekey3="$PAPI_PRIVATE_JAVA_MERCH_KEY" -DmarketplacePrivatekey="$PAPI_PRIVATE_KEY"

‎CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,35 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres
77
to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
88

9+
## [1.2.1.0][1.2.1.0]
10+
11+
This release brings Unzer Paylater Invoice payment type support to Java SDK.
12+
13+
### Added
14+
15+
* Added payment type Paylater Invoice. See more at [Unzer Docs](https://docs.unzer.com/payment-methods/unzer-invoice-upl/)
16+
* Added ability to set client IP. Use `com.unzer.payment.communication.impl.HttpClientBasedRestCommunication.HttpClientBasedRestCommunication(java.util.Locale, java.lang.String)` and `com.unzer.payment.Unzer.Unzer(java.lang.String, java.util.Locale, java.lang.String, java.lang.String)` to set client ip.
17+
* Added `com.unzer.payment.Unzer.cancelCharge(java.lang.String, java.math.BigDecimal)` to cancel Paylater charges.
18+
19+
### Fixed
20+
21+
* Fixed: customer salutation is null, because of marshalling/unmarshalling issue.
22+
* Fixed: cancel InvoiceSecured charge failed with error `API.340.100.024: Reason code is mandatory for the payment type INVOICE_SECURED`. Please, use `com.unzer.payment.Cancel.setReasonCode` to set reason code and `com.unzer.payment.Unzer.cancelCharge(java.lang.String, java.lang.String, com.unzer.payment.Cancel)` to cancel InvoiceSecured charge.
23+
24+
### Removed
25+
26+
* Removed unused `com.unzer.payment.UnsupportedPaymentTypeException`
27+
28+
### Deprecated
29+
30+
* Deprecated `com.unzer.payment.util.SDKInfo.getVersion()`. Use `com.unzer.payment.util.SDKInfo.VERSION` instead.
31+
* Deprecated payment type `com.unzer.payment.paymenttypes.InvoiceSecured`. Use `com.unzer.payment.paymenttypes.PaylaterInvoice` instead.
32+
* Deprecated `com.unzer.payment.Customer.setShippingAddress(com.unzer.payment.Address)`. Use `com.unzer.payment.Customer.setShippingAddress(com.unzer.payment.ShippingAddress)` instead
33+
34+
### Changed
35+
36+
* Changed type of `com.unzer.payment.Customer.shippingAddress` and according getter/setter: `com.unzer.payment.Address` -> `com.unzer.payment.ShippingAddress`. Use `ShippingAddress.of(Address, Type)` to adapt
37+
938
## [1.2.0.0][1.2.0.0]
1039

1140
### Breaking changes
@@ -205,6 +234,8 @@ to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
205234
* Remove deprecated classes
206235
* RestCommunication
207236

237+
[1.2.1.0]: http://github.com/unzerdev/java-sdk/compare/1.2.0.0..1.2.1.0
238+
208239
[1.2.0.0]: http://github.com/unzerdev/java-sdk/compare/1.1.2.7..1.2.0.0
209240

210241
[1.1.2.7]: http://github.com/unzerdev/java-sdk/compare/1.1.2.6..1.1.2.7

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2021 Unzer E-Com GmbH
1+
Copyright 2020-today Unzer E-Com GmbH
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Java 1.8 or later.
1414
<dependency>
1515
<groupId>com.unzer.payment</groupId>
1616
<artifactId>java-sdk</artifactId>
17-
<version>1.2.0.0</version>
17+
<version>1.2.1.0</version>
1818
</dependency>
1919
```
2020

‎pom.xml

Lines changed: 74 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.unzer.payment</groupId>
88
<artifactId>java-sdk</artifactId>
9-
<version>1.2.0.0</version>
9+
<version>1.2.1.0</version>
1010
<name>Unzer Java SDK</name>
1111
<description>Unzer Java SDK</description>
1212
<url>https://docs.unzer.com/</url>
@@ -43,6 +43,7 @@
4343
<skip.dependency.check>true</skip.dependency.check>
4444
<log4j.version>2.18.0</log4j.version>
4545
<jackson.version>2.12.7</jackson.version>
46+
<junit.version>5.9.0</junit.version>
4647
</properties>
4748

4849
<distributionManagement>
@@ -102,7 +103,7 @@
102103
<plugin>
103104
<groupId>org.jacoco</groupId>
104105
<artifactId>jacoco-maven-plugin</artifactId>
105-
<version>0.8.5</version>
106+
<version>0.8.8</version>
106107
<configuration>
107108
<excludes>
108109
<exclude>**/*Test.*</exclude>
@@ -132,7 +133,7 @@
132133
<plugin>
133134
<groupId>org.apache.maven.plugins</groupId>
134135
<artifactId>maven-compiler-plugin</artifactId>
135-
<version>3.8.1</version>
136+
<version>3.10.1</version>
136137
<configuration>
137138
<source>1.8</source>
138139
<target>1.8</target>
@@ -141,7 +142,7 @@
141142
<plugin>
142143
<groupId>org.apache.maven.plugins</groupId>
143144
<artifactId>maven-javadoc-plugin</artifactId>
144-
<version>3.2.0</version>
145+
<version>3.4.0</version>
145146
<configuration>
146147
<doclint>none</doclint>
147148
</configuration>
@@ -167,27 +168,7 @@
167168
</execution>
168169
</executions>
169170
</plugin>
170-
<!-- <plugin>
171-
<groupId>org.codehaus.mojo</groupId>
172-
<artifactId>license-maven-plugin</artifactId>
173-
<version>2.0.0</version>
174-
<executions>
175-
<execution>
176-
<id>first</id>
177-
<goals>
178-
<goal>update-file-header</goal>
179-
</goals>
180-
<phase>process-sources</phase>
181-
<configuration>
182-
<licenseName>apache_v2</licenseName>
183-
<roots>
184-
<root>src/main/java</root>
185-
<root>src/test/java</root>
186-
</roots>
187-
</configuration>
188-
</execution>
189-
</executions>
190-
</plugin>-->
171+
191172
<plugin>
192173
<groupId>org.apache.maven.plugins</groupId>
193174
<artifactId>maven-gpg-plugin</artifactId>
@@ -208,6 +189,7 @@
208189
</execution>
209190
</executions>
210191
</plugin>
192+
211193
<plugin>
212194
<groupId>org.sonatype.plugins</groupId>
213195
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -241,6 +223,35 @@
241223
</execution>
242224
</executions>
243225
</plugin>
226+
227+
<plugin>
228+
<groupId>com.mycila</groupId>
229+
<artifactId>license-maven-plugin</artifactId>
230+
<version>4.1</version>
231+
<configuration>
232+
<licenseSets>
233+
<licenseSet>
234+
<header>LICENSE</header>
235+
<excludes>
236+
<exclude>**/*.md</exclude>
237+
<exclude>**/*.xml</exclude>
238+
<exclude>selenium/**</exclude>
239+
<exclude>src/test/resources/**</exclude>
240+
<exclude>src/main/resources/**</exclude>
241+
</excludes>
242+
</licenseSet>
243+
</licenseSets>
244+
</configuration>
245+
<executions>
246+
<execution>
247+
<id>check-license-headers</id>
248+
<phase>validate</phase>
249+
<goals>
250+
<goal>check</goal>
251+
</goals>
252+
</execution>
253+
</executions>
254+
</plugin>
244255
</plugins>
245256
</build>
246257

@@ -256,9 +267,24 @@
256267
<dependency>
257268
<groupId>com.google.code.gson</groupId>
258269
<artifactId>gson</artifactId>
259-
<version>2.8.9</version>
270+
<version>2.9.1</version>
260271
</dependency>
261272

273+
<dependency>
274+
<groupId>com.fasterxml.jackson.core</groupId>
275+
<artifactId>jackson-core</artifactId>
276+
<version>${jackson.version}</version>
277+
</dependency>
278+
<dependency>
279+
<groupId>com.fasterxml.jackson.core</groupId>
280+
<artifactId>jackson-databind</artifactId>
281+
<version>${jackson.version}</version>
282+
</dependency>
283+
<dependency>
284+
<groupId>javax.xml.bind</groupId>
285+
<artifactId>jaxb-api</artifactId>
286+
<version>2.3.1</version>
287+
</dependency>
262288

263289
<!-- HTTP Client Library -->
264290
<dependency>
@@ -267,11 +293,26 @@
267293
<version>4.5.13</version>
268294
</dependency>
269295

270-
<!-- Test dependencies -->
296+
297+
<!-- Test dependencies -->
298+
<dependency>
299+
<groupId>org.junit.jupiter</groupId>
300+
<artifactId>junit-jupiter-engine</artifactId>
301+
<version>${junit.version}</version>
302+
<scope>test</scope>
303+
</dependency>
304+
305+
<dependency>
306+
<groupId>org.awaitility</groupId>
307+
<artifactId>awaitility</artifactId>
308+
<version>4.0.2</version>
309+
<scope>test</scope>
310+
</dependency>
311+
271312
<dependency>
272-
<groupId>junit</groupId>
273-
<artifactId>junit</artifactId>
274-
<version>4.13.1</version>
313+
<groupId>org.awaitility</groupId>
314+
<artifactId>awaitility-proxy</artifactId>
315+
<version>3.1.6</version>
275316
<scope>test</scope>
276317
</dependency>
277318

@@ -289,53 +330,26 @@
289330
<scope>test</scope>
290331
</dependency>
291332

292-
293333
<!-- UI Test dependencies Selenium -->
294334
<dependency>
295335
<groupId>org.seleniumhq.selenium</groupId>
296336
<artifactId>selenium-java</artifactId>
297337
<version>3.141.59</version>
298338
<scope>test</scope>
299339
</dependency>
340+
300341
<dependency>
301342
<groupId>org.seleniumhq.selenium</groupId>
302343
<artifactId>selenium-server</artifactId>
303344
<version>3.141.59</version>
304345
<scope>test</scope>
305346
</dependency>
347+
306348
<dependency>
307349
<groupId>org.seleniumhq.selenium</groupId>
308350
<artifactId>htmlunit-driver</artifactId>
309351
<version>2.39.0</version>
310352
<scope>test</scope>
311353
</dependency>
312-
313-
<dependency>
314-
<groupId>org.awaitility</groupId>
315-
<artifactId>awaitility</artifactId>
316-
<version>4.0.2</version>
317-
<scope>test</scope>
318-
</dependency>
319-
<dependency>
320-
<groupId>org.awaitility</groupId>
321-
<artifactId>awaitility-proxy</artifactId>
322-
<version>3.1.6</version>
323-
<scope>test</scope>
324-
</dependency>
325-
<dependency>
326-
<groupId>com.fasterxml.jackson.core</groupId>
327-
<artifactId>jackson-core</artifactId>
328-
<version>${jackson.version}</version>
329-
</dependency>
330-
<dependency>
331-
<groupId>com.fasterxml.jackson.core</groupId>
332-
<artifactId>jackson-databind</artifactId>
333-
<version>${jackson.version}</version>
334-
</dependency>
335-
<dependency>
336-
<groupId>javax.xml.bind</groupId>
337-
<artifactId>jaxb-api</artifactId>
338-
<version>2.3.1</version>
339-
</dependency>
340354
</dependencies>
341-
</project>
355+
</project>

0 commit comments

Comments
 (0)