Skip to content

Commit 10d5ad7

Browse files
ohernandovisaohernandovisa
authored
Merge pull request #12 from CyberSource/v25.4.1
Latest code with multi-mid support and updated dependencies. GENAI=NO
2 parents 2e75c06 + 223dcd6 commit 10d5ad7

File tree

261 files changed

+3150
-2750
lines changed

Some content is hidden

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

261 files changed

+3150
-2750
lines changed

‎documentation/CJL/CJL.md‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## CJL - Core Java Library <!-- omit in toc -->
44

5-
**Version 25.4.0**
5+
**Version 25.4.1**
66
May 2025
77

88
## Contents <!-- omit in toc -->
@@ -429,11 +429,7 @@ isv.cjl.payment.service.flex.FlexService
429429
isv.cjl.payment.security.service.DefaultFlexService
430430
```
431431

432-
The public key is used on a the client side to initiate the Microform API and to validate a token passed back through the cardholder's browser. The wirings are defined through the following [Google Guice](https://github.com/google/guice) module:
433-
434-
```text
435-
isv.cjl.module.common.FlexMicroformModule
436-
```
432+
The public key is used on a the client side to initiate the Microform API and to validate a token passed back through the cardholder's browser.
437433

438434
The payment service request is executed through an instance of PaymentServiceExecutor, which dispatches the request to an instance of PaymentServiceProvider component defined through the following [Google Guice](https://github.com/google/guice) module:
439435

@@ -2525,6 +2521,24 @@ Each property above can be MID specific, e.g. key alias can be configured as:
25252521
```text
25262522
isv.payment.api.rest.<MERCHANT_ID>.keyAlias=<key_alias>
25272523
```
2524+
#### P12 Configuration <!-- omit in toc -->
2525+
2526+
In order to configure the P12 authentication provide the following configuration.
2527+
```text
2528+
isv.payment.p12.merchantId= <merchantID>
2529+
isv.payment.p12.libVersion= <Lib Version>
2530+
isv.payment.p12.keyAlias= <Key Alias>
2531+
isv.payment.p12.keyFile= <p12 File>
2532+
isv.payment.p12.keyPass= <p12 File Passward>
2533+
isv.payment.p12.keysDirectory= <key Directory>
2534+
```
2535+
2536+
Each property above can be MID specific, e.g. key alias can be configured as:
2537+
2538+
```text
2539+
isv.payment.p12.<merchantID>.keyAlias= <Key Alias>
2540+
```
2541+
25282542

25292543
### Implementation Details
25302544

‎documentation/Guide to Upgrade SAP Commerce for Multi-Mid Support via P12.pdf‎

152 KB
Binary file not shown.

‎documentation/sap-commerce.md‎

Lines changed: 131 additions & 89 deletions
Large diffs are not rendered by default.

‎hybris/bin/b2b/isvb2bpaymentaddon/resources/isvb2bpaymentaddon.build.number‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ name=isvb2bpaymentaddon
55
builddate=20210318 1419
66
releasedate=20210318 1509
77
vendor=isv.sap
8-
version=25.4.0
8+
version=25.4.1
99
version.api=2011

‎hybris/bin/b2b/isvfulfilmentprocess/resources/isvfulfilmentprocess.build.number‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ name=isvfulfilmentprocess
55
builddate=20210318 1419
66
releasedate=20210318 1509
77
vendor=isv.sap
8-
version=25.4.0
8+
version=25.4.1
99
version.api=2011

‎hybris/bin/b2b/isvpayment/external-dependencies.xml‎

Lines changed: 10 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,20 @@
88
<packaging>jar</packaging>
99

1010
<dependencies>
11-
<dependency>
12-
<groupId>com.cybersource</groupId>
13-
<artifactId>flex-server-sdk</artifactId>
14-
<version>0.11.0</version>
15-
</dependency>
1611
<dependency>
1712
<groupId>com.netflix.archaius</groupId>
1813
<artifactId>archaius-core</artifactId>
19-
<version>0.7.7</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>cglib</groupId>
23-
<artifactId>cglib-nodep</artifactId>
24-
<version>3.3.0</version>
14+
<version>0.7.12</version>
2515
</dependency>
2616
<dependency>
2717
<groupId>com.google.code.gson</groupId>
2818
<artifactId>gson</artifactId>
29-
<version>2.12.0</version>
19+
<version>2.13.1</version>
3020
</dependency>
3121
<dependency>
3222
<groupId>org.hdrhistogram</groupId>
3323
<artifactId>HdrHistogram</artifactId>
34-
<version>2.1.12</version>
24+
<version>2.2.2</version>
3525
</dependency>
3626
<dependency>
3727
<groupId>com.netflix.hystrix</groupId>
@@ -43,26 +33,11 @@
4333
<artifactId>hystrix-servo-metrics-publisher</artifactId>
4434
<version>1.5.18</version>
4535
</dependency>
46-
<dependency>
47-
<groupId>com.netflix.servo</groupId>
48-
<artifactId>servo-core</artifactId>
49-
<version>0.13.0</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>com.netflix.spectator</groupId>
53-
<artifactId>spectator-api</artifactId>
54-
<version>0.123.1</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>ma.glasnost.orika</groupId>
58-
<artifactId>orika-core</artifactId>
59-
<version>1.5.4</version>
60-
</dependency>
6136
<dependency>
6237
<groupId>io.qala.datagen</groupId>
6338
<artifactId>qala-datagen</artifactId>
6439
<version>2.5.1</version>
65-
</dependency>
40+
</dependency>
6641
<dependency>
6742
<groupId>org.springframework.guice</groupId>
6843
<artifactId>spring-guice</artifactId>
@@ -73,31 +48,21 @@
7348
<artifactId>guice</artifactId>
7449
<version>4.2.3</version>
7550
</dependency>
76-
<dependency>
77-
<groupId>com.google.inject.extensions</groupId>
78-
<artifactId>guice-multibindings</artifactId>
79-
<version>4.2.3</version>
80-
</dependency>
8151
<dependency>
8252
<groupId>org.bouncycastle</groupId>
8353
<artifactId>bcpkix-jdk15on</artifactId>
84-
<version>1.68</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.jetbrains.kotlin</groupId>
88-
<artifactId>kotlin-runtime</artifactId>
89-
<version>1.2.71</version>
54+
<version>1.70</version>
9055
</dependency>
9156
<dependency>
9257
<groupId>com.squareup.okio</groupId>
9358
<artifactId>okio-jvm</artifactId>
94-
<version>3.7.0</version>
59+
<version>3.12.0</version>
9560
<scope>runtime</scope>
9661
</dependency>
9762
<dependency>
9863
<groupId>org.jetbrains.kotlin</groupId>
9964
<artifactId>kotlin-stdlib</artifactId>
100-
<version>1.9.22</version>
65+
<version>2.1.21</version>
10166
</dependency>
10267
<dependency>
10368
<groupId>com.squareup.okhttp3</groupId>
@@ -119,7 +84,7 @@
11984
<dependency>
12085
<groupId>com.cybersource</groupId>
12186
<artifactId>cybersource-rest-client-java</artifactId>
122-
<version>0.0.75</version>
87+
<version>0.0.79</version>
12388
<scope>runtime</scope>
12489
<exclusions>
12590
<exclusion>
@@ -131,7 +96,7 @@
13196
<dependency>
13297
<groupId>com.cybersource</groupId>
13398
<artifactId>AuthenticationSdk</artifactId>
134-
<version>0.0.34</version>
99+
<version>0.0.37</version>
135100
</dependency>
136101
<dependency>
137102
<groupId>com.nimbusds</groupId>
@@ -143,11 +108,6 @@
143108
<artifactId>okio</artifactId>
144109
<version>3.7.0</version>
145110
</dependency>
146-
<dependency>
147-
<groupId>javax.xml.ws</groupId>
148-
<artifactId>jaxws-api</artifactId>
149-
<version>2.3.1</version>
150-
</dependency>
151111
<dependency>
152112
<groupId>javax.xml.soap</groupId>
153113
<artifactId>javax.xml.soap-api</artifactId>
@@ -171,53 +131,18 @@
171131
<dependency>
172132
<groupId>jakarta.jws</groupId>
173133
<artifactId>jakarta.jws-api</artifactId>
174-
<version>1.1.1</version>
134+
<version>2.1.0</version>
175135
</dependency>
176136
<dependency>
177137
<groupId>jakarta.xml.ws</groupId>
178138
<artifactId>jakarta.xml.ws-api</artifactId>
179139
<version>2.3.3</version>
180140
</dependency>
181-
<dependency>
182-
<groupId>commons-collections</groupId>
183-
<artifactId>commons-collections</artifactId>
184-
<version>3.2.2</version>
185-
</dependency>
186-
<dependency>
187-
<groupId>org.apache.httpcomponents</groupId>
188-
<artifactId>httpcore</artifactId>
189-
<version>4.4.16</version>
190-
</dependency>
191-
<dependency>
192-
<groupId>com.google.code.findbugs</groupId>
193-
<artifactId>jsr305</artifactId>
194-
<version>3.0.2</version>
195-
</dependency>
196-
<dependency>
197-
<groupId>org.apache.httpcomponents</groupId>
198-
<artifactId>httpclient</artifactId>
199-
<version>4.5.14</version>
200-
</dependency>
201-
<dependency>
202-
<groupId>org.apache.commons</groupId>
203-
<artifactId>commons-collections4</artifactId>
204-
<version>4.4</version>
205-
</dependency>
206-
<dependency>
207-
<groupId>com.fasterxml.jackson.core</groupId>
208-
<artifactId>jackson-databind</artifactId>
209-
<version>2.18.2</version>
210-
</dependency>
211141
<dependency>
212142
<groupId>jakarta.xml.soap</groupId>
213143
<artifactId>jakarta.xml.soap-api</artifactId>
214144
<version>2.0.1</version>
215145
</dependency>
216-
<dependency>
217-
<groupId>commons-configuration</groupId>
218-
<artifactId>commons-configuration</artifactId>
219-
<version>1.10</version>
220-
</dependency>
221146
<dependency>
222147
<groupId>org.jvnet.staxex</groupId>
223148
<artifactId>stax-ex</artifactId>
@@ -290,16 +215,5 @@
290215
</exclusion>
291216
</exclusions>
292217
</dependency>
293-
<dependency>
294-
<groupId>org.apache.santuario</groupId>
295-
<artifactId>xmlsec</artifactId>
296-
<version>2.3.4</version>
297-
<exclusions>
298-
<exclusion>
299-
<artifactId>woodstox-core</artifactId>
300-
<groupId>com.fasterxml.woodstox</groupId>
301-
</exclusion>
302-
</exclusions>
303-
</dependency>
304218
</dependencies>
305219
</project>

‎hybris/bin/b2b/isvpayment/lib/.lastupdate‎

Whitespace-only changes.

hybris/bin/b2b/isvpayment/lib/AuthenticationSdk-0.0.34.jar renamed to hybris/bin/b2b/isvpayment/lib/AuthenticationSdk-0.0.37.jar

65.1 KB
Binary file not shown.

‎hybris/bin/b2b/isvpayment/lib/HdrHistogram-2.1.12.jar‎

-170 KB
Binary file not shown.

‎hybris/bin/b2b/isvpayment/lib/HdrHistogram-2.2.2.jar‎

173 KB
Binary file not shown.

0 commit comments

Comments
 (0)