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

Clean POM layout #4

Merged
merged 3 commits into from
Nov 15, 2017
Merged

Clean POM layout #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
650cd2e
Clean POM layout and add gitignore lines for IDE files
Nov 15, 2017
86a8882
Add back configuration and rules sections to Jacoco execution
Nov 15, 2017
35efae7
Remove extra ignores
Nov 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to give students such an extensive .gitignore?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean with the IDE files included?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally believe it will mess up quite a few Git timelines if we don't add the ignore for IDE files now... But if you think it's too much, I'll remove it and they can use their Git skill to find it back :P

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After a (real life) discussion, we have decided it is better to remove these changes and leave it to the students to find it back if they really want to.

30 changes: 19 additions & 11 deletions pom.xml
View file
Open in desktop
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>