Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge pull request #133 from ottlinger/master
Streamline usage of junit among the project and add Travis CI build support
  • Loading branch information
chrismattmann committed Jun 19, 2018
2 parents a2c0da3 + 67b1720 commit 7bb8c186e3f88c3043e87065d49135c92a4c7fc5
Showing 9 changed files with 25 additions and 11 deletions.
@@ -0,0 +1,13 @@
language: java
jdk:
- oraclejdk8
- oraclejdk9

#before_script:
# - pip install --user codecov

#after_success:
# - codecov

#addons:
# srcclr: true
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -77,7 +77,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<version>${junit.version}</version>
</dependency>
</dependencies>

@@ -60,7 +60,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

@@ -60,7 +60,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

@@ -13,6 +13,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<oodt.version>1.2.2</oodt.version>
<junit.version>4.12</junit.version>
</properties>

<repositories>
@@ -48,6 +49,7 @@
</distributionManagement>

<build>
<defaultGoal>clean install</defaultGoal>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
<plugins>
@@ -56,8 +58,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
@@ -39,7 +39,6 @@
</licenses>
<properties>
<wicket.version>7.8.0</wicket.version>
<junit.version>4.12</junit.version>
<log4j.version>2.3</log4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>2.2.3</cxf.version>
@@ -181,8 +180,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
@@ -60,7 +60,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

@@ -83,7 +83,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

0 comments on commit 7bb8c18

Please sign in to comment.