Skip to content

Commit

Permalink
Merge 53e4554 into 42e3610
Browse files Browse the repository at this point in the history
  • Loading branch information
wuan committed Mar 10, 2017
2 parents 42e3610 + 53e4554 commit 8562653
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ script: "mvn -e clean test jacoco:report coveralls:report"
jdk:
- oraclejdk8
- oraclejdk7
- openjdk6
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.org/TNG/property-loader.svg?branch=master)](https://travis-ci.org/TNG/property-loader)
[![Coverage Status](https://coveralls.io/repos/TNG/property-loader/badge.svg?branch=master&service=github)](https://coveralls.io/github/TNG/property-loader?branch=master)
[![Stories in Ready](https://badge.waffle.io/TNG/property-loader.png?label=ready&title=Ready)](http://waffle.io/TNG/property-loader)
[![Maven Central](https://img.shields.io/maven-central/v/com.tngtech.java/property-loader.svg?maxAge=2592000?style=plastic)](http://search.maven.org/#search|ga|1|g%3A%22com.tngtech.java%22%20AND%20a%3A%22property-loader%22)
[![Maven Central](https://img.shields.io/maven-central/v/com.tngtech.java/property-loader.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.tngtech.java%22%20AND%20a%3A%22property-loader%22)

# Property loader
===============
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
<version>9</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Expand All @@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -90,12 +90,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>2.10.4</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.6.201602180812</version>
<version>0.7.9</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand All @@ -108,7 +108,7 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.1.0</version>
<version>4.3.0</version>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -161,6 +161,6 @@
</dependency>
</dependencies>
<properties>
<slf4j.version>1.7.21</slf4j.version>
<slf4j.version>1.7.24</slf4j.version>
</properties>
</project>

0 comments on commit 8562653

Please sign in to comment.