From 2988296537e10faa70299173b5a8d33646cb7198 Mon Sep 17 00:00:00 2001
From: u209936 <jamie.townsend@sbb.ch>
Date: Wed, 9 Nov 2016 23:00:30 +0100
Subject: [PATCH 1/2] Added support for Maven (& gitignore for IntelliJ
 directory)

---
 .gitignore |  2 ++
 pom.xml    | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
index 93d8045..a927168 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /Interactive
 /.DS_Store
 /.gradle
+/.idea
+/target
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..dca8a51
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,59 @@
+<?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>
+
+    <groupId>org.noroomattheinn</groupId>
+    <artifactId>tesla-client</artifactId>
+    <version>1.1-SNAPSHOT</version>
+
+    <description>Tesla Rest API Client</description>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>us.monoid.web</groupId>
+            <artifactId>resty</artifactId>
+            <version>0.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.geocoder-java</groupId>
+            <artifactId>geocoder-java</artifactId>
+            <version>0.15</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

From d17a5554e69df7e12daf2ae22556ebf9f7602d32 Mon Sep 17 00:00:00 2001
From: u209936 <jamie.townsend@sbb.ch>
Date: Mon, 14 Nov 2016 22:20:47 +0100
Subject: [PATCH 2/2] Create uberjar so all dependencies are packaged into the
 resulting jar file

---
 pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pom.xml b/pom.xml
index dca8a51..109e9b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,26 @@
 
     <build>
         <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <!-- make an uberjar, so that we have eveything we need in one .jar file -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <outputFile>${project.build.directory}/${project.artifactId}-${project.version}.uber.jar</outputFile>
+                        </configuration>
+                    </execution>
+                </executions>
+
+            </plugin>
+        </plugins>
     </build>
 
     <dependencies>
@@ -56,4 +76,5 @@
             <version>0.15</version>
         </dependency>
     </dependencies>
+
 </project>
\ No newline at end of file