Skip to content

Commit 02ecef5

Browse files
authored
Merge pull request #147 from CyberSource/future
Future
2 parents fd80c80 + a2a2783 commit 02ecef5

Some content is hidden

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

42 files changed

+2656
-808
lines changed

README.md

Lines changed: 130 additions & 47 deletions
Large diffs are not rendered by default.

java/pom.xml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,21 @@
8787
</executions>
8888
</plugin>
8989
<plugin>
90+
<groupId>org.apache.maven.plugins</groupId>
9091
<artifactId>maven-javadoc-plugin</artifactId>
91-
<version>2.10.1</version>
92+
<version>3.2.0</version>
9293
<executions>
9394
<execution>
9495
<id>attach-javadocs</id>
9596
<phase>package</phase>
9697
<goals><goal>jar</goal></goals>
9798
</execution>
9899
</executions>
100+
<configuration>
101+
<additionalOptions>
102+
<additionalOption>-Xdoclint:none</additionalOption>
103+
</additionalOptions>
104+
</configuration>
99105
</plugin>
100106
<plugin>
101107
<artifactId>maven-jar-plugin</artifactId>
@@ -139,6 +145,20 @@
139145
<target>1.6</target>
140146
</configuration>
141147
</plugin>
148+
<plugin>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-surefire-plugin</artifactId>
151+
<version>2.4.3</version>
152+
<configuration>
153+
<argLine>-Dfile.encoding=ISO-8859-1</argLine>
154+
<includes>
155+
<include>**/*Test.java</include>
156+
</includes>
157+
<excludes>
158+
<exclude>**/*SystemTest.java</exclude>
159+
</excludes>
160+
</configuration>
161+
</plugin>
142162
<plugin>
143163
<groupId>org.codehaus.mojo</groupId>
144164
<artifactId>exec-maven-plugin</artifactId>
@@ -190,6 +210,17 @@
190210
<artifactId>xmlsec</artifactId>
191211
<version>1.5.6</version>
192212
</dependency>
213+
<dependency>
214+
<groupId>org.apache.httpcomponents</groupId>
215+
<artifactId>httpclient</artifactId>
216+
<version>4.5.11</version>
217+
<exclusions>
218+
<exclusion>
219+
<groupId>commons-logging</groupId>
220+
<artifactId>commons-logging</artifactId>
221+
</exclusion>
222+
</exclusions>
223+
</dependency>
193224
<dependency>
194225
<groupId>commons-httpclient</groupId>
195226
<artifactId>commons-httpclient</artifactId>
@@ -216,7 +247,7 @@
216247
<artifactId>opensaml</artifactId>
217248
</exclusion>
218249
</exclusions>
219-
</dependency>
250+
</dependency>
220251
<dependency>
221252
<groupId>org.apache.commons</groupId>
222253
<artifactId>commons-lang3</artifactId>

0 commit comments

Comments
 (0)