Skip to content

Commit

Permalink
Merge pull request #159 from AuthorizeNet/future
Browse files Browse the repository at this point in the history 
+ Cleaning up the SDK of old model code
  • Loading branch information
@gnongsie
gnongsie authored Mar 20, 2019
2 parents 54df8d6 + 44962b5 commit ddd1351
Show file tree
Hide file tree
Showing 19 changed files with 159 additions and 1,997 deletions.
2 changes: 1 addition & 1 deletion .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="lib/jmock-2.6.0.jar"/>
<classpathentry kind="lib" path="lib/gson-2.3.1.jar" />
<classpathentry kind="lib" path="lib/gson-2.3.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 0 additions & 2 deletions anet-java-sdk.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@
# the keys above.
api.login.id=API_LOGIN_ID
transaction.key=TRANSACTION_KEY
md5.hash.key=MD5_HASH_KEY

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

# if behind a proxy, use these settings:
# http.proxyHost=HTTP_PROXY_HOST
Expand Down
3 changes: 0 additions & 3 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<property name="prop.message" value="must be defined in ${user.home}/${ant.project.name}.properties" />
<fail message="api.login.id ${prop.message}" unless="api.login.id" />
<fail message="transaction.key ${prop.message}" unless="transaction.key" />
<fail message="md5.hash.key ${prop.message}" unless="md5.hash.key" />

<path id="classpath">
<fileset dir="${lib.dir}" includes="**/*.jar" />
Expand Down Expand Up @@ -88,12 +87,10 @@
</classpath>
<sysproperty key="API_LOGIN_ID" value="${api.login.id}" />
<sysproperty key="TRANSACTION_KEY" value="${transaction.key}" />
<sysproperty key="MD5_HASH_KEY" value="${md5.hash.key}" />
<formatter type="plain" />
<batchtest fork="yes" todir="${reports.tests}">
<fileset dir="${classes.dir}">
<include name="**/*Test*.class" />
<!--include name="net/authorize/cim/functional_test/*Test*.class" /-->
<exclude name="**/UnitTestData.class, **/MyTest.class" />
</fileset>
</batchtest>
Expand Down
328 changes: 158 additions & 170 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,173 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<groupId>net.authorize</groupId>
<artifactId>anet-java-sdk</artifactId>
<packaging>jar</packaging>
<version>2.0.1-SNAPSHOT</version>
<name>Authorize.Net Java SDK</name>
<description>Authorize.Net SDK includes standard payments, recurring billing, and customer profiles.</description>
<url>http://developer.authorize.net</url>
<licenses>
<license>
<name>SDK License Agreement</name>
<url>https://github.com/AuthorizeNet/sdk-java/blob/master/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</connection>
<developerConnection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</developerConnection>
<url>https://github.com/AuthorizeNet/sdk-java.git</url>
</scm>
<developers>
<developer>
<id>authorizenet</id>
<name>Authorize.Net Developer</name>
<email>developer@authorize.net</email>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<groupId>net.authorize</groupId>
<artifactId>anet-java-sdk</artifactId>
<packaging>jar</packaging>
<version>2.0.1-SNAPSHOT</version>
<name>Authorize.Net Java SDK</name>
<description>Authorize.Net SDK includes standard payments, recurring billing, and customer profiles.</description>
<url>http://developer.authorize.net</url>
<licenses>
<license>
<name>SDK License Agreement</name>
<url>https://github.com/AuthorizeNet/sdk-java/blob/master/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</connection>
<developerConnection>scm:git:https://github.com/AuthorizeNet/sdk-java.git</developerConnection>
<url>https://github.com/AuthorizeNet/sdk-java.git</url>
</scm>
<developers>
<developer>
<id>authorizenet</id>
<name>Authorize.Net Developer</name>
<email>developer@authorize.net</email>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
<maven.compile.optimize>true</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<!--
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>${user.home}/anet-java-sdk.properties</file>
</files>
</configuration>
</execution>
</executions>
-->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration>
<includes>
<include> **/mocktest/**.java</include>
</includes>
<skipTests>false</skipTests>
<forkCount>1</forkCount>
<systemPropertyVariables>
<API_LOGIN_ID>${api.login.id}</API_LOGIN_ID>
<TRANSACTION_KEY>${transaction.key}</TRANSACTION_KEY>
<MD5_HASH_KEY>${md5.hash.key}</MD5_HASH_KEY>
</systemPropertyVariables>
<environmentVariables>
<API_LOGIN_ID>API_LOGIN_ID</API_LOGIN_ID>
<TRANSACTION_KEY>TRANSACTION_KEY</TRANSACTION_KEY>
<MD5_HASH_KEY>MD5_HASH_KEY</MD5_HASH_KEY>
</environmentVariables>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>resources</directory>
<filtering>true</filtering>
<includes>
<include>**/AuthorizedNetSensitiveTagsConfig.json</include>
</includes>
</resource>
<resource>
<directory>resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.*</include>
</includes>
<excludes>
<exclude>log4j.properties</exclude>
</excludes>
</resource>
</resources>
</build>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
<maven.compile.optimize>true</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<!-- <executions> <execution> <phase>initialize</phase> <goals> <goal>read-project-properties</goal>
</goals> <configuration> <files> <file>${user.home}/anet-java-sdk.properties</file>
</files> </configuration> </execution> </executions> -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration>
<includes>
<include> **/mocktest/**.java</include>
</includes>
<skipTests>false</skipTests>
<forkCount>1</forkCount>
<systemPropertyVariables>
<API_LOGIN_ID>${api.login.id}</API_LOGIN_ID>
<TRANSACTION_KEY>${transaction.key}</TRANSACTION_KEY>
</systemPropertyVariables>
<environmentVariables>
<API_LOGIN_ID>API_LOGIN_ID</API_LOGIN_ID>
<TRANSACTION_KEY>TRANSACTION_KEY</TRANSACTION_KEY>
</environmentVariables>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>resources</directory>
<filtering>true</filtering>
<includes>
<include>**/AuthorizedNetSensitiveTagsConfig.json</include>
</includes>
</resource>
<resource>
<directory>resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.*</include>
</includes>
<excludes>
<exclude>log4j.properties</exclude>
</excludes>
</resource>
</resources>
</build>
</project>
Loading

0 comments on commit ddd1351

Please sign in to comment.