From bd63cb549ba3f3e45b43e12c274d4f8ef961cfd6 Mon Sep 17 00:00:00 2001
From: Jason Taylor <jason@screencasts.pro>
Date: Fri, 19 Jun 2015 22:33:53 -0400
Subject: [PATCH] Start adding spring framework

---
 .gitignore                                    |  2 +
 core/pom.xml                                  | 30 +++++++++-----
 .../timetraker/core/TrackerCoreConfig.java    |  8 ++++
 pom.xml                                       | 39 +++++++++++--------
 web/pom.xml                                   | 18 ++++-----
 5 files changed, 62 insertions(+), 35 deletions(-)
 create mode 100644 core/src/main/java/pro/jtaylor/timetraker/core/TrackerCoreConfig.java

diff --git a/.gitignore b/.gitignore
index 8fffe724..4eb0cb06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ pom.xml.next
 release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
+.idea
+*.iml
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 34fa8685..8ac8aa4f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,11 +1,23 @@
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>training.time-tracker</groupId>
-  <artifactId>time-tracker-core</artifactId>
-  <packaging>jar</packaging>
-  <version>0.1.0-SNAPSHOT</version>
-  <name>Time Tracker (Core)</name>
-  
-  
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>training.time-tracker</groupId>
+        <artifactId>time-tracker-parent</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>training.time-tracker</groupId>
+    <artifactId>time-tracker-core</artifactId>
+    <packaging>jar</packaging>
+    <name>Time Tracker (Core)</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/pro/jtaylor/timetraker/core/TrackerCoreConfig.java b/core/src/main/java/pro/jtaylor/timetraker/core/TrackerCoreConfig.java
new file mode 100644
index 00000000..c8779edc
--- /dev/null
+++ b/core/src/main/java/pro/jtaylor/timetraker/core/TrackerCoreConfig.java
@@ -0,0 +1,8 @@
+package pro.jtaylor.timetraker.core;
+
+/**
+ * Created by Jason on 6/19/2015.
+ */
+public class TrackerCoreConfig {
+
+}
diff --git a/pom.xml b/pom.xml
index 1d593f0f..da84b4b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,24 @@
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>training.time-tracker</groupId>
-  <artifactId>time-tracker-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>0.1.1-SNAPSHOT</version>
-  <name>Time Tracker (Parent)</name>
-  <description>
-	This is a simple Maven / Java web project.
-  </description>
-  <inceptionYear>2015</inceptionYear>
-  <url>http://maven.training/</url>
-  
-  <modules>
-	<module>core</module>
-    <module>web</module>
-  </modules>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>training.time-tracker</groupId>
+    <artifactId>time-tracker-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>0.1.1-SNAPSHOT</version>
+    <name>Time Tracker (Parent)</name>
+    <description>
+        This is a simple Maven / Java web project.
+    </description>
+    <inceptionYear>2015</inceptionYear>
+    <url>http://maven.training/</url>
+
+    <properties>
+        <spring.version>4.1.6.RELEASE</spring.version>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <modules>
+        <module>core</module>
+        <module>web</module>
+    </modules>
 </project>
\ No newline at end of file
diff --git a/web/pom.xml b/web/pom.xml
index 30a7f28b..40c78923 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -1,11 +1,11 @@
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>training.time-tracker</groupId>
-  <artifactId>time-tracker-web</artifactId>
-  <packaging>war</packaging>
-  <version>0.1.0-SNAPSHOT</version>
-  <name>Time Tracker (Web)</name>
-  
-  
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>training.time-tracker</groupId>
+    <artifactId>time-tracker-web</artifactId>
+    <packaging>war</packaging>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>Time Tracker (Web)</name>
+
+
 </project>
\ No newline at end of file