Merge pull request #22 from tubbynl/master

unused imports and updated .gitignore
stil4m · Oct 27, 2016 · d0d530e · d0d530e
2 parents 6186552 + 48a3450
commit d0d530e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 target
+.project
+.settings
diff --git a/pom.xml b/pom.xml
@@ -9,9 +9,11 @@
     <name>Mollie API</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit-version>4.11</junit-version>
-        <org.mockito-mockito-all-version>1.10.19</org.mockito-mockito-all-version>
+        <junit.version>4.11</junit.version>
+        <mockito.version>1.10.19</mockito.version>
         <jackson.version>2.8.0</jackson.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -20,7 +22,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit-dep</artifactId>
-            <version>${junit-version}</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -32,7 +34,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${org.mockito-mockito-all-version}</version>
+            <version>${mockito.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -84,15 +86,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

diff --git a/src/main/java/nl/stil4m/mollie/Client.java b/src/main/java/nl/stil4m/mollie/Client.java
@@ -1,11 +1,6 @@
 package nl.stil4m.mollie;
 
 import nl.stil4m.mollie.concepts.*;
-import nl.stil4m.mollie.domain.CreatePayment;
-import nl.stil4m.mollie.domain.CreatedPayment;
-import nl.stil4m.mollie.domain.Payment;
-
-import java.io.IOException;
 
 public class Client {
 

diff --git a/src/main/java/nl/stil4m/mollie/DynamicClient.java b/src/main/java/nl/stil4m/mollie/DynamicClient.java
@@ -1,12 +1,6 @@
 package nl.stil4m.mollie;
 
 import nl.stil4m.mollie.concepts.*;
-import nl.stil4m.mollie.domain.ApiKeyCheck;
-import nl.stil4m.mollie.domain.CreatePayment;
-import nl.stil4m.mollie.domain.CreatedPayment;
-import nl.stil4m.mollie.domain.Payment;
-
-import java.io.IOException;
 
 public class DynamicClient {
 

diff --git a/src/main/java/nl/stil4m/mollie/concepts/Methods.java b/src/main/java/nl/stil4m/mollie/concepts/Methods.java
@@ -10,7 +10,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.util.List;
 import java.util.Optional;
 
 import static nl.stil4m.mollie.Util.validatePaymentId;

diff --git a/src/test/java/nl/stil4m/mollie/ClientIntegrationTest.java b/src/test/java/nl/stil4m/mollie/ClientIntegrationTest.java
@@ -1,6 +1,5 @@
 package nl.stil4m.mollie;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
 import nl.stil4m.mollie.domain.CreatePayment;
 import nl.stil4m.mollie.domain.CreatedPayment;

diff --git a/src/test/java/nl/stil4m/mollie/IssuesIntegrationTest.java b/src/test/java/nl/stil4m/mollie/IssuesIntegrationTest.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import nl.stil4m.mollie.domain.CreatePayment;
-import nl.stil4m.mollie.domain.CreatedPayment;
 import nl.stil4m.mollie.domain.subpayments.ideal.CreateIdealPayment;
 import nl.stil4m.mollie.domain.subpayments.ideal.IdealPaymentOptions;
 import org.junit.Before;