Skip to content

Commit ddd1351

Browse files
gnongsiegnongsie
authored
Merge pull request #159 from AuthorizeNet/future
+ Cleaning up the SDK of old model code
2 parents 54df8d6 + 44962b5 commit ddd1351

19 files changed

+159
-1997
lines changed

‎.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
1313
<classpathentry kind="lib" path="lib/hamcrest-library-1.3.jar"/>
1414
<classpathentry kind="lib" path="lib/jmock-2.6.0.jar"/>
15-
<classpathentry kind="lib" path="lib/gson-2.3.1.jar" />
15+
<classpathentry kind="lib" path="lib/gson-2.3.1.jar"/>
1616
<classpathentry kind="output" path="target/classes"/>
1717
</classpath>

‎anet-java-sdk.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
# the keys above.
99
api.login.id=API_LOGIN_ID
1010
transaction.key=TRANSACTION_KEY
11-
md5.hash.key=MD5_HASH_KEY
1211

1312
# Keys for ApplePay transaction tests. These keys may or may not be
1413
# the same as the key above. If not specified, they are defaulted to
1514
# the keys above.
1615
# api.login.id.applepay=API_LOGIN_ID_APPLEPAY
1716
# transaction.key.applepay=TRANSACTION_KEY_APPLEPAY
18-
# md5.hash.key.applepay=MD5_HASH_KEY_APPLEPAY
1917

2018
# if behind a proxy, use these settings:
2119
# http.proxyHost=HTTP_PROXY_HOST

‎build.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<property name="prop.message" value="must be defined in ${user.home}/${ant.project.name}.properties" />
1818
<fail message="api.login.id ${prop.message}" unless="api.login.id" />
1919
<fail message="transaction.key ${prop.message}" unless="transaction.key" />
20-
<fail message="md5.hash.key ${prop.message}" unless="md5.hash.key" />
2120

2221
<path id="classpath">
2322
<fileset dir="${lib.dir}" includes="**/*.jar" />
@@ -88,12 +87,10 @@
8887
</classpath>
8988
<sysproperty key="API_LOGIN_ID" value="${api.login.id}" />
9089
<sysproperty key="TRANSACTION_KEY" value="${transaction.key}" />
91-
<sysproperty key="MD5_HASH_KEY" value="${md5.hash.key}" />
9290
<formatter type="plain" />
9391
<batchtest fork="yes" todir="${reports.tests}">
9492
<fileset dir="${classes.dir}">
9593
<include name="**/*Test*.class" />
96-
<!--include name="net/authorize/cim/functional_test/*Test*.class" /-->
9794
<exclude name="**/UnitTestData.class, **/MyTest.class" />
9895
</fileset>
9996
</batchtest>

‎pom.xml‎

Lines changed: 158 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,173 +1,161 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.sonatype.oss</groupId>
6-
<artifactId>oss-parent</artifactId>
7-
<version>7</version>
8-
</parent>
9-
<groupId>net.authorize</groupId>
10-
<artifactId>anet-java-sdk</artifactId>
11-
<packaging>jar</packaging>
12-
<version>2.0.1-SNAPSHOT</version>
13-
<name>Authorize.Net Java SDK</name>
14-
<description>Authorize.Net SDK includes standard payments, recurring billing, and customer profiles.</description>
15-
<url>http://developer.authorize.net</url>
16-
<licenses>
17-
<license>
18-
<name>SDK License Agreement</name>
19-
<url>https://github.com/AuthorizeNet/sdk-java/blob/master/LICENSE.txt</url>
20-
<distribution>repo</distribution>
21-
</license>
22-
</licenses>
23-
<scm>
24-
<connection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</connection>
25-
<developerConnection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</developerConnection>
26-
<url>https://github.com/AuthorizeNet/sdk-java.git</url>
27-
</scm>
28-
<developers>
29-
<developer>
30-
<id>authorizenet</id>
31-
<name>Authorize.Net Developer</name>
32-
<email>[email protected]</email>
33-
</developer>
34-
</developers>
35-
<dependencies>
36-
<dependency>
37-
<groupId>junit</groupId>
38-
<artifactId>junit</artifactId>
39-
<version>4.8.1</version>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>commons-logging</groupId>
44-
<artifactId>commons-logging</artifactId>
45-
<version>1.1.1</version>
46-
<scope>compile</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.apache.httpcomponents</groupId>
50-
<artifactId>httpclient</artifactId>
51-
<version>4.5.3</version>
52-
<scope>compile</scope>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.apache.httpcomponents</groupId>
56-
<artifactId>httpcore</artifactId>
57-
<version>4.4.6</version>
58-
<scope>compile</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>log4j</groupId>
62-
<artifactId>log4j</artifactId>
63-
<version>1.2.16</version>
64-
<scope>compile</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.jmock</groupId>
68-
<artifactId>jmock</artifactId>
69-
<version>2.6.0</version>
70-
<scope>test</scope>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.hamcrest</groupId>
74-
<artifactId>hamcrest-core</artifactId>
75-
<version>1.3</version>
76-
<scope>test</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.hamcrest</groupId>
80-
<artifactId>hamcrest-library</artifactId>
81-
<version>1.3</version>
82-
<scope>test</scope>
83-
</dependency>
84-
<dependency>
85-
<groupId>com.google.code.gson</groupId>
86-
<artifactId>gson</artifactId>
87-
<version>2.3.1</version>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>org.sonatype.oss</groupId>
8+
<artifactId>oss-parent</artifactId>
9+
<version>7</version>
10+
</parent>
11+
<groupId>net.authorize</groupId>
12+
<artifactId>anet-java-sdk</artifactId>
13+
<packaging>jar</packaging>
14+
<version>2.0.1-SNAPSHOT</version>
15+
<name>Authorize.Net Java SDK</name>
16+
<description>Authorize.Net SDK includes standard payments, recurring billing, and customer profiles.</description>
17+
<url>http://developer.authorize.net</url>
18+
<licenses>
19+
<license>
20+
<name>SDK License Agreement</name>
21+
<url>https://github.com/AuthorizeNet/sdk-java/blob/master/LICENSE.txt</url>
22+
<distribution>repo</distribution>
23+
</license>
24+
</licenses>
25+
<scm>
26+
<connection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</connection>
27+
<developerConnection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</developerConnection>
28+
<url>https://github.com/AuthorizeNet/sdk-java.git</url>
29+
</scm>
30+
<developers>
31+
<developer>
32+
<id>authorizenet</id>
33+
<name>Authorize.Net Developer</name>
34+
<email>[email protected]</email>
35+
</developer>
36+
</developers>
37+
<dependencies>
38+
<dependency>
39+
<groupId>junit</groupId>
40+
<artifactId>junit</artifactId>
41+
<version>4.8.1</version>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>commons-logging</groupId>
46+
<artifactId>commons-logging</artifactId>
47+
<version>1.1.1</version>
8848
<scope>compile</scope>
89-
</dependency>
90-
</dependencies>
91-
<properties>
92-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
93-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
94-
<maven.compile.source>1.5</maven.compile.source>
95-
<maven.compile.target>1.5</maven.compile.target>
96-
<maven.compile.optimize>true</maven.compile.optimize>
97-
<maven.compile.deprecation>true</maven.compile.deprecation>
98-
</properties>
99-
<build>
100-
<plugins>
101-
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103-
<artifactId>maven-compiler-plugin</artifactId>
104-
<version>2.0.2</version>
105-
<configuration>
106-
<source>1.5</source>
107-
<target>1.5</target>
108-
</configuration>
109-
</plugin>
110-
<plugin>
111-
<groupId>org.codehaus.mojo</groupId>
112-
<artifactId>properties-maven-plugin</artifactId>
113-
<version>1.0-alpha-2</version>
114-
<!--
115-
<executions>
116-
<execution>
117-
<phase>initialize</phase>
118-
<goals>
119-
<goal>read-project-properties</goal>
120-
</goals>
121-
<configuration>
122-
<files>
123-
<file>${user.home}/anet-java-sdk.properties</file>
124-
</files>
125-
</configuration>
126-
</execution>
127-
</executions>
128-
-->
129-
</plugin>
130-
<plugin>
131-
<groupId>org.apache.maven.plugins</groupId>
132-
<artifactId>maven-surefire-plugin</artifactId>
133-
<version>2.9</version>
134-
<configuration>
135-
<includes>
136-
<include> **/mocktest/**.java</include>
137-
</includes>
138-
<skipTests>false</skipTests>
139-
<forkCount>1</forkCount>
140-
<systemPropertyVariables>
141-
<API_LOGIN_ID>${api.login.id}</API_LOGIN_ID>
142-
<TRANSACTION_KEY>${transaction.key}</TRANSACTION_KEY>
143-
<MD5_HASH_KEY>${md5.hash.key}</MD5_HASH_KEY>
144-
</systemPropertyVariables>
145-
<environmentVariables>
146-
<API_LOGIN_ID>API_LOGIN_ID</API_LOGIN_ID>
147-
<TRANSACTION_KEY>TRANSACTION_KEY</TRANSACTION_KEY>
148-
<MD5_HASH_KEY>MD5_HASH_KEY</MD5_HASH_KEY>
149-
</environmentVariables>
150-
</configuration>
151-
</plugin>
152-
</plugins>
153-
<resources>
154-
<resource>
155-
<directory>resources</directory>
156-
<filtering>true</filtering>
157-
<includes>
158-
<include>**/AuthorizedNetSensitiveTagsConfig.json</include>
159-
</includes>
160-
</resource>
161-
<resource>
162-
<directory>resources</directory>
163-
<filtering>false</filtering>
164-
<includes>
165-
<include>**/*.*</include>
166-
</includes>
167-
<excludes>
168-
<exclude>log4j.properties</exclude>
169-
</excludes>
170-
</resource>
171-
</resources>
172-
</build>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.httpcomponents</groupId>
52+
<artifactId>httpclient</artifactId>
53+
<version>4.5.3</version>
54+
<scope>compile</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.apache.httpcomponents</groupId>
58+
<artifactId>httpcore</artifactId>
59+
<version>4.4.6</version>
60+
<scope>compile</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>log4j</groupId>
64+
<artifactId>log4j</artifactId>
65+
<version>1.2.16</version>
66+
<scope>compile</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.jmock</groupId>
70+
<artifactId>jmock</artifactId>
71+
<version>2.6.0</version>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.hamcrest</groupId>
76+
<artifactId>hamcrest-core</artifactId>
77+
<version>1.3</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.hamcrest</groupId>
82+
<artifactId>hamcrest-library</artifactId>
83+
<version>1.3</version>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>com.google.code.gson</groupId>
88+
<artifactId>gson</artifactId>
89+
<version>2.3.1</version>
90+
<scope>compile</scope>
91+
</dependency>
92+
</dependencies>
93+
<properties>
94+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
95+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
96+
<maven.compile.source>1.5</maven.compile.source>
97+
<maven.compile.target>1.5</maven.compile.target>
98+
<maven.compile.optimize>true</maven.compile.optimize>
99+
<maven.compile.deprecation>true</maven.compile.deprecation>
100+
</properties>
101+
<build>
102+
<plugins>
103+
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
105+
<artifactId>maven-compiler-plugin</artifactId>
106+
<version>2.0.2</version>
107+
<configuration>
108+
<source>1.5</source>
109+
<target>1.5</target>
110+
</configuration>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.codehaus.mojo</groupId>
114+
<artifactId>properties-maven-plugin</artifactId>
115+
<version>1.0-alpha-2</version>
116+
<!-- <executions> <execution> <phase>initialize</phase> <goals> <goal>read-project-properties</goal>
117+
</goals> <configuration> <files> <file>${user.home}/anet-java-sdk.properties</file>
118+
</files> </configuration> </execution> </executions> -->
119+
</plugin>
120+
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122+
<artifactId>maven-surefire-plugin</artifactId>
123+
<version>2.9</version>
124+
<configuration>
125+
<includes>
126+
<include> **/mocktest/**.java</include>
127+
</includes>
128+
<skipTests>false</skipTests>
129+
<forkCount>1</forkCount>
130+
<systemPropertyVariables>
131+
<API_LOGIN_ID>${api.login.id}</API_LOGIN_ID>
132+
<TRANSACTION_KEY>${transaction.key}</TRANSACTION_KEY>
133+
</systemPropertyVariables>
134+
<environmentVariables>
135+
<API_LOGIN_ID>API_LOGIN_ID</API_LOGIN_ID>
136+
<TRANSACTION_KEY>TRANSACTION_KEY</TRANSACTION_KEY>
137+
</environmentVariables>
138+
</configuration>
139+
</plugin>
140+
</plugins>
141+
<resources>
142+
<resource>
143+
<directory>resources</directory>
144+
<filtering>true</filtering>
145+
<includes>
146+
<include>**/AuthorizedNetSensitiveTagsConfig.json</include>
147+
</includes>
148+
</resource>
149+
<resource>
150+
<directory>resources</directory>
151+
<filtering>false</filtering>
152+
<includes>
153+
<include>**/*.*</include>
154+
</includes>
155+
<excludes>
156+
<exclude>log4j.properties</exclude>
157+
</excludes>
158+
</resource>
159+
</resources>
160+
</build>
173161
</project>

0 commit comments

Comments
 (0)