Minor updates and such

1 files changed, 105 insertions, 82 deletions

diff --git a/clformat/pom.xml b/clformat/pom.xml
index 23ddb58..5fdc5a2 100644
--- a/clformat/pom.xml
+++ b/clformat/pom.xml
@@ -1,89 +1,112 @@
 <?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>
-	  <artifactId>BJCUtils-Parent</artifactId>
-	  <groupId>bjc</groupId>
-	  <version>1.0.0</version>
-  </parent>
+<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>
+		<artifactId>BJCUtils-Parent</artifactId>
+		<groupId>bjc</groupId>
+		<version>1.0.0</version>
+	</parent>
 
-  <artifactId>clformat</artifactId>
-  <packaging>jar</packaging>
+	<artifactId>clformat</artifactId>
+	<packaging>jar</packaging>
 
-  <properties>
-	  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 
-  <name>clformat</name>
+	<name>clformat</name>
 
-  <dependencies>
-	  <dependency>
-		  <groupId>junit</groupId>
-		  <artifactId>junit</artifactId>
-		  <version>4.12</version>
-		  <scope>test</scope>
-	  </dependency>
-	  <dependency>
-		  <groupId>bjc</groupId>
-		  <artifactId>BJC-Utils2</artifactId>
-		  <version>1.0.0</version>
-	  </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>bjc</groupId>
+			<artifactId>BJC-Utils2</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>bjc</groupId>
+			<artifactId>inflexion</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.github.bculkin2442</groupId>
+			<artifactId>esodata</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>data/</directory>
+				<includes>
+					<include>**/*.txt</include>
+					<include>**/*.sprop</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
 
-	  <dependency>
-		  <groupId>bjc</groupId>
-		  <artifactId>inflexion</artifactId>
-		  <version>1.0.0</version>
-	  </dependency>
-  </dependencies>
-
-  <build>
-	  <resources>
-		  <resource>
-			  <directory>data/</directory>
-
-			  <includes>
-				  <include>**/*.txt</include>
-				  <include>**/*.sprop</include>
-			  </includes>
-		  </resource>
-	  </resources>
-	  <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
-		  <plugins>
-			  <plugin>
-				  <artifactId>maven-compiler-plugin</artifactId>
-				  <version>3.7.0</version>
-
-				  <configuration>
-					  <source>1.8</source>
-					  <target>1.8</target>
-				  </configuration>
-			  </plugin>
-			  <plugin>
-				  <artifactId>maven-clean-plugin</artifactId>
-				  <version>3.0.0</version>
-			  </plugin>
-			  <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
-			  <plugin>
-				  <artifactId>maven-resources-plugin</artifactId>
-				  <version>3.0.2</version>
-			  </plugin>
-			  <plugin>
-				  <artifactId>maven-surefire-plugin</artifactId>
-				  <version>2.20.1</version>
-			  </plugin>
-			  <plugin>
-				  <artifactId>maven-jar-plugin</artifactId>
-				  <version>3.0.2</version>
-			  </plugin>
-			  <plugin>
-				  <artifactId>maven-install-plugin</artifactId>
-				  <version>2.5.2</version>
-			  </plugin>
-			  <plugin>
-				  <artifactId>maven-deploy-plugin</artifactId>
-				  <version>2.8.2</version>
-			  </plugin>
-		  </plugins>
-	  </pluginManagement>
-  </build>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.20.1</version>
+				<configuration>
+					<!-- Sets the VM argument line used when unit tests are run. -->
+					<argLine>${surefireArgLine}</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.2</version>
+				<executions>
+					<!-- Prepares the property pointing to the JaCoCo runtime agent which 
+						is passed as VM argument when Maven the Surefire plugin is executed. -->
+					<execution>
+						<id>pre-unit-test</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<!-- Sets the path to the file which contains the execution data. -->
+							<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+							<!-- Sets the name of the property containing the settings for JaCoCo 
+								runtime agent. -->
+							<propertyName>surefireArgLine</propertyName>
+						</configuration>
+					</execution>
+					<!-- Ensures that the code coverage report for unit tests is created 
+						after unit tests have been run. -->
+					<execution>
+						<id>post-unit-test</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+						<configuration>
+							<!-- Sets the path to the file which contains the execution data. -->
+							<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+							<!-- Sets the output directory for the code coverage report. -->
+							<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>