Skip to content
This repository has been archived by the owner on Feb 4, 2020. It is now read-only.

Commit

Permalink
Merge pull request #4 from SERG-Delft/clean-pom
Browse files Browse the repository at this point in the history
Clean POM layout
  • Loading branch information
mjwsteenbergen authored Nov 15, 2017
2 parents e840e95 + 35efae7 commit 227744e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Maven ignores
target/
pom.xml.tag
pom.xml.releaseBackup
Expand All @@ -9,4 +10,4 @@ buildNumber.properties
.mvn/timing.properties

# Exclude maven wrapper
!/.mvn/wrapper/maven-wrapper.jar
!/.mvn/wrapper/maven-wrapper.jar
30 changes: 19 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -68,16 +74,18 @@
</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>
Expand All @@ -89,8 +97,8 @@
<configuration>
<configLocation>TI1216.checkstyle.xml</configLocation>
</configuration>

</plugin>
</plugins>
</reporting>

</project>

0 comments on commit 227744e

Please sign in to comment.