From 650cd2e8ad648a5c604ed1eefba16a946a7e6c09 Mon Sep 17 00:00:00 2001
From: Chris Lemaire <c.lemaire@student.tudelft.nl>
Date: Wed, 15 Nov 2017 10:06:43 +0100
Subject: [PATCH 1/3] Clean POM layout and add gitignore lines for IDE files

---
 .gitignore |  8 +++++++-
 pom.xml    | 34 +++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99650a7..74eee8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,10 @@ buildNumber.properties
 .mvn/timing.properties
 
 # Exclude maven wrapper
-!/.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
+!/.mvn/wrapper/maven-wrapper.jar
+
+# Exclude IDE files
+*.iml
+.idea/
+*.project
+*.classpath
diff --git a/pom.xml b/pom.xml
index da19171..411038e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,17 @@
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Starter OOPProject-Template</name>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+
+        <checkstyle.version>7.2</checkstyle.version>
+        <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
+
+        <jacoco-maven-plugin.version>0.7.8</jacoco-maven-plugin.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -17,13 +28,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <properties>
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-        <checkstyle.version>7.2</checkstyle.version>
-        <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
-        <argLine/>
-    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -38,10 +43,11 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.8</version>
+                <version>${jacoco-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>
@@ -61,23 +67,21 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                            </rules>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+
     <reporting>
         <plugins>
             <plugin>
@@ -89,8 +93,8 @@
                 <configuration>
                     <configLocation>TI1216.checkstyle.xml</configLocation>
                 </configuration>
-
             </plugin>
         </plugins>
     </reporting>
+
 </project>
\ No newline at end of file

From 86a88820939bf9151a3c9a188526483ed4285db4 Mon Sep 17 00:00:00 2001
From: Chris Lemaire <c.lemaire@student.tudelft.nl>
Date: Wed, 15 Nov 2017 10:15:45 +0100
Subject: [PATCH 2/3] Add back configuration and rules sections to Jacoco
 execution

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

diff --git a/pom.xml b/pom.xml
index 411038e..9389409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,10 @@
                         <goals>
                             <goal>check</goal>
                         </goals>
+                        <configuration>
+                            <rules>
+                            </rules>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

From 35efae7be80960b56f38d531cacd8929b0ed772e Mon Sep 17 00:00:00 2001
From: Chris Lemaire <c.lemaire@student.tudelft.nl>
Date: Wed, 15 Nov 2017 13:17:15 +0100
Subject: [PATCH 3/3] Remove extra ignores

---
 .gitignore | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74eee8c..69a5d6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+# Maven ignores
 target/
 pom.xml.tag
 pom.xml.releaseBackup
@@ -10,9 +11,3 @@ buildNumber.properties
 
 # Exclude maven wrapper
 !/.mvn/wrapper/maven-wrapper.jar
-
-# Exclude IDE files
-*.iml
-.idea/
-*.project
-*.classpath