Skip to content

Commit b911a79

Browse files
mahendya1002mahendya1002
authored
Merge pull request #166 from CyberSource/master
sync with master
2 parents f487d4b + 44a4c7f commit b911a79

File tree

16 files changed

+169
-45
lines changed

16 files changed

+169
-45
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CyberSource Simple Order API for Java
22

3-
[![Build Status](https://travis-ci.org/CyberSource/cybersource-sdk-java.png?branch=future)](https://travis-ci.org/CyberSource/cybersource-sdk-java)
3+
[![Build Status](https://travis-ci.org/CyberSource/cybersource-sdk-java.png?branch=master)](https://travis-ci.org/CyberSource/cybersource-sdk-java)
44

55
## Package Managers
66

@@ -252,7 +252,7 @@ Retry Pattern allows to retry sending a failed request and it will only work wit
252252

253253
## Changes
254254
_______________________________
255-
Version Cybersource-sdk-java 6.2.12 (JUNE,2022)
255+
Version Cybersource-sdk-java 6.2.12 (JULY,2022)
256256
_______________________________
257257
1) Mitigation of Apache WSS4j Security Vulnerability (CVE-2016-1000343, CVE-2018-1000180).
258258
i) Updated Apache wss4j version from 1.6.19 to 2.4.1

‎java/pom.xml‎

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<artifactId>cybersource-sdk-master</artifactId>
8-
<groupId>com.cybersource</groupId>
9-
<version>6.2.12-SNAPSHOT</version>
7+
<groupId>org.sonatype.oss</groupId>
8+
<artifactId>oss-parent</artifactId>
9+
<version>7</version>
1010
</parent>
1111

1212
<groupId>com.cybersource</groupId>
1313
<artifactId>cybersource-sdk-java</artifactId>
14-
<version>6.2.12-SNAPSHOT</version>
14+
<version>6.2.13-SNAPSHOT</version>
1515
<name>cybersource-sdk-java</name>
1616
<description>Simple Order API Client</description>
1717
<url>http://www.cybersource.com</url>
@@ -37,6 +37,20 @@
3737
</developer>
3838
</developers>
3939

40+
<properties>
41+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
42+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
43+
<junit.version>4.13.1</junit.version>
44+
<xalan.version>2.7.2</xalan.version>
45+
<xmlsec.version>2.3.0</xmlsec.version>
46+
<httpclient.version>4.5.13</httpclient.version>
47+
<bouncycastle.version>1.70</bouncycastle.version>
48+
<wss4j.version>2.4.1</wss4j.version>
49+
<commonlang3.version>3.4</commonlang3.version>
50+
<mockito.version>1.10.19</mockito.version>
51+
<slf4j.version>1.7.32</slf4j.version>
52+
</properties>
53+
4054
<packaging>jar</packaging>
4155

4256
<profiles>
@@ -230,6 +244,12 @@
230244
<groupId>org.apache.santuario</groupId>
231245
<artifactId>xmlsec</artifactId>
232246
<version>${xmlsec.version}</version>
247+
<exclusions>
248+
<exclusion>
249+
<artifactId>woodstox-core</artifactId>
250+
<groupId>com.fasterxml.woodstox</groupId>
251+
</exclusion>
252+
</exclusions>
233253
</dependency>
234254
<dependency>
235255
<groupId>org.apache.httpcomponents</groupId>
@@ -256,6 +276,42 @@
256276
<groupId>com.google.guava</groupId>
257277
<artifactId>guava</artifactId>
258278
</exclusion>
279+
<exclusion>
280+
<artifactId>cryptacular</artifactId>
281+
<groupId>org.cryptacular</groupId>
282+
</exclusion>
283+
<exclusion>
284+
<artifactId>opensaml-saml-impl</artifactId>
285+
<groupId>org.opensaml</groupId>
286+
</exclusion>
287+
<exclusion>
288+
<artifactId>opensaml-xacml-impl</artifactId>
289+
<groupId>org.opensaml</groupId>
290+
</exclusion>
291+
<exclusion>
292+
<artifactId>opensaml-xacml-saml-impl</artifactId>
293+
<groupId>org.opensaml</groupId>
294+
</exclusion>
295+
<exclusion>
296+
<artifactId>slf4j-api</artifactId>
297+
<groupId>org.slf4j</groupId>
298+
</exclusion>
299+
<exclusion>
300+
<artifactId>joda-time</artifactId>
301+
<groupId>joda-time</groupId>
302+
</exclusion>
303+
<exclusion>
304+
<artifactId>jasypt</artifactId>
305+
<groupId>org.jasypt</groupId>
306+
</exclusion>
307+
<exclusion>
308+
<artifactId>geronimo-javamail_1.4_mail</artifactId>
309+
<groupId>org.apache.geronimo.javamail</groupId>
310+
</exclusion>
311+
<exclusion>
312+
<artifactId>xmlsec</artifactId>
313+
<groupId>org.apache.santuario</groupId>
314+
</exclusion>
259315
</exclusions>
260316
</dependency>
261317
<dependency>

‎java/src/main/java/com/cybersource/ws/client/Utility.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private Utility() {
4545
/**
4646
* Version number of this release.
4747
*/
48-
public static final String VERSION = "6.2.12";
48+
public static final String VERSION = "6.2.13";
4949
public static final String ORIGIN_TIMESTAMP = "v-c-client-iat";
5050
public static final String SDK_ELAPSED_TIMESTAMP = "v-c-client-computetime";
5151
public static final String RESPONSE_TIME_REPLY = "v-c-response-time";
@@ -54,7 +54,6 @@ private Utility() {
5454
public static final String AUTH_SERVICE = "ccAuthService";
5555
public static final String AUTH_SERVICE_XML_RUN_ATT = "run";
5656
public static final String AUTH_SERVICE_NVP = "ccAuthService_run";
57-
5857
public static final String ELEM_MERCHANT_ID = "merchantID";
5958
public static final String KEY_ALIAS = "keyAlias";
6059
public static final String ELEM_MERCHANT_REFERENCE_CODE = "merchantReferenceCode";

‎pom.xml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,12 @@
1212

1313
<groupId>com.cybersource</groupId>
1414
<artifactId>cybersource-sdk-master</artifactId>
15-
<version>6.2.12-SNAPSHOT</version>
15+
<version>6.2.13-SNAPSHOT</version>
1616
<name>cybersource-sdk-java-master</name>
1717
<packaging>pom</packaging>
1818

1919
<modules>
2020
<module>zip</module>
2121
<module>java</module>
2222
</modules>
23-
24-
<properties>
25-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
27-
<junit.version>4.13.1</junit.version>
28-
<xalan.version>2.7.2</xalan.version>
29-
<xmlsec.version>2.3.0</xmlsec.version>
30-
<httpclient.version>4.5.13</httpclient.version>
31-
<bouncycastle.version>1.70</bouncycastle.version>
32-
<wss4j.version>2.4.1</wss4j.version>
33-
<commonlang3.version>3.4</commonlang3.version>
34-
<mockito.version>1.10.19</mockito.version>
35-
<slf4j.version>1.7.32</slf4j.version>
36-
</properties>
37-
3823
</project>

‎samples/nvp/compileSample.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
set LOCAL_CP=
44
rem ----------------------------------------------------------------------------
5-
rem Replace this with cybersource-sdk-java-6.2.12.jar when using Java SDK 1.6 or later.
5+
rem Replace this with cybersource-sdk-java-6.2.13.jar when using Java SDK 1.6 or later.
66
rem If using this scripts outside zip package then give maven clean install.
77
rem This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
88
rem ----------------------------------------------------------------------------
99

10-
if exist ../../lib set LOCAL_CP=%LOCAL_CP%;../../lib/cybersource-sdk-java-6.2.12.jar
10+
if exist ../../lib set LOCAL_CP=%LOCAL_CP%;../../lib/cybersource-sdk-java-6.2.13.jar
1111
if not exist ../../lib (
1212
if not exist target goto error
13-
set LOCAL_CP=%LOCAL_CP%;target/dependencies/cybersource-sdk-java-6.2.12.jar
13+
set LOCAL_CP=%LOCAL_CP%;target/dependencies/cybersource-sdk-java-6.2.13.jar
1414
)
1515

1616
if not exist classes mkdir classes

‎samples/nvp/compileSample.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
LOCAL_CP=
44
# -----------------------------------------------------------------------------
5-
# Replace this with cybersource-sdk-java-6.2.12.jar when using Java SDK 1.6 or later.
5+
# Replace this with cybersource-sdk-java-6.2.13.jar when using Java SDK 1.6 or later.
66
# If using this scripts outside zip package then give maven clean install.
77
# This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
88
# -----------------------------------------------------------------------------
99

1010
if test -d ../../lib
11-
then LOCAL_CP=$LOCAL_CP:../../lib/cybersource-sdk-java-6.2.12.jar
11+
then LOCAL_CP=$LOCAL_CP:../../lib/cybersource-sdk-java-6.2.13.jar
1212
fi
1313

1414
if test ! -d ../../lib
@@ -19,7 +19,7 @@ then
1919
echo "Execute maven clean install , This will generate all required dependencies under target/dependencies!!"
2020
exit 1
2121
fi
22-
LOCAL_CP=$LOCAL_CP:target/dependencies/cybersource-sdk-java-6.2.12.jar
22+
LOCAL_CP=$LOCAL_CP:target/dependencies/cybersource-sdk-java-6.2.13.jar
2323
fi
2424

2525
if test ! -d ./classes

‎samples/nvp/pom.xml‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<name>RunSample</name>
99
<url>http://maven.apache.org</url>
1010
<properties>
11-
<javasdk.version>[6.2.0, 6.2.12-SNAPSHOT]</javasdk.version>
11+
<javasdk.version>[6.2.0, 6.2.13-SNAPSHOT]</javasdk.version>
1212
<httpclient.version>4.5.13</httpclient.version>
1313
<bouncycastle.version>1.67</bouncycastle.version>
1414
<wss4j.version>2.4.1</wss4j.version>
@@ -41,6 +41,48 @@
4141
<groupId>org.apache.wss4j</groupId>
4242
<artifactId>wss4j-ws-security-common</artifactId>
4343
<version>${wss4j.version}</version>
44+
<exclusions>
45+
<exclusion>
46+
<groupId>com.google.guava</groupId>
47+
<artifactId>guava</artifactId>
48+
</exclusion>
49+
<exclusion>
50+
<artifactId>cryptacular</artifactId>
51+
<groupId>org.cryptacular</groupId>
52+
</exclusion>
53+
<exclusion>
54+
<artifactId>opensaml-saml-impl</artifactId>
55+
<groupId>org.opensaml</groupId>
56+
</exclusion>
57+
<exclusion>
58+
<artifactId>opensaml-xacml-impl</artifactId>
59+
<groupId>org.opensaml</groupId>
60+
</exclusion>
61+
<exclusion>
62+
<artifactId>opensaml-xacml-saml-impl</artifactId>
63+
<groupId>org.opensaml</groupId>
64+
</exclusion>
65+
<exclusion>
66+
<artifactId>slf4j-api</artifactId>
67+
<groupId>org.slf4j</groupId>
68+
</exclusion>
69+
<exclusion>
70+
<artifactId>joda-time</artifactId>
71+
<groupId>joda-time</groupId>
72+
</exclusion>
73+
<exclusion>
74+
<artifactId>jasypt</artifactId>
75+
<groupId>org.jasypt</groupId>
76+
</exclusion>
77+
<exclusion>
78+
<artifactId>geronimo-javamail_1.4_mail</artifactId>
79+
<groupId>org.apache.geronimo.javamail</groupId>
80+
</exclusion>
81+
<exclusion>
82+
<artifactId>xmlsec</artifactId>
83+
<groupId>org.apache.santuario</groupId>
84+
</exclusion>
85+
</exclusions>
4486
</dependency>
4587
<dependency>
4688
<groupId>org.apache.wss4j</groupId>

‎samples/nvp/runSample.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set LOCAL_CP=
44
set LOCAL_CP=%LOCAL_CP%;classes
55

66
rem ----------------------------------------------------------------------------
7-
rem Replace cybersource-sdk-java-6.2.12.jar when using Java SDK 1.6 or later.
7+
rem Replace cybersource-sdk-java-6.2.13.jar when using Java SDK 1.6 or later.
88
rem If using this scripts outside zip package then give maven clean install.
99
rem This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
1010
rem ----------------------------------------------------------------------------

‎samples/nvp/runSample.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LOCAL_CP=
44
LOCAL_CP=$LOCAL_CP:./classes
55

66
# -----------------------------------------------------------------------------
7-
# Replace this with cybersource-sdk-java-6.2.12.jar when using Java SDK 1.6 or later.
7+
# Replace this with cybersource-sdk-java-6.2.13.jar when using Java SDK 1.6 or later.
88
# If using this scripts outside zip package then give maven clean install.
99
# This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
1010
# -----------------------------------------------------------------------------

‎samples/xml/compileSample.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
set LOCAL_CP=
44
rem ----------------------------------------------------------------------------
5-
rem Replace this with cybersource-sdk-java-6.2.12.jar when using Java SDK 1.6 or later.
5+
rem Replace this with cybersource-sdk-java-6.2.13.jar when using Java SDK 1.6 or later.
66
rem If using this scripts outside zip package then give maven clean install.
77
rem This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
88
rem ----------------------------------------------------------------------------
99

10-
if exist ../../lib set LOCAL_CP=%LOCAL_CP%;../../lib/cybersource-sdk-java-6.2.12.jar
10+
if exist ../../lib set LOCAL_CP=%LOCAL_CP%;../../lib/cybersource-sdk-java-6.2.13.jar
1111
if not exist ../../lib (
1212
if not exist target goto error
13-
set LOCAL_CP=%LOCAL_CP%;target/dependencies/cybersource-sdk-java-6.2.12.jar
13+
set LOCAL_CP=%LOCAL_CP%;target/dependencies/cybersource-sdk-java-6.2.13.jar
1414
)
1515

1616
if not exist classes mkdir classes

0 commit comments

Comments
 (0)