Skip to content

Commit 06ba779

Browse files
committed
Merge remote-tracking branch 'origin/master'
Conflicts: pom.xml
2 parents 80e0092 + f09c3b5 commit 06ba779

File tree

5 files changed

+428
-649
lines changed

5 files changed

+428
-649
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
language: java
22
jdk:
33
- oraclejdk8
4+
after_success:
5+
- mvn deploy -Dmaven.test.skip -DcreateDocs=true -s settings.xml

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Money and Currency Parent
55

66
This module is licenced under the the [Apache 2 Licence](https://www.apache.org/licenses/LICENSE-2.0.html).
77

8+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.javamoney/javamoney-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.javamoney/javamoney-parent)
89
[![Build Status](https://api.travis-ci.org/JavaMoney/javamoney-parent.png?branch=master)](https://travis-ci.org/JavaMoney/javamoney-parent) [![License](http://img.shields.io/badge/license-Apache2-red.svg)](http://opensource.org/licenses/apache-2.0)
910

1011
[![Built with Maven](http://maven.apache.org/images/logos/maven-feather.png)](http://maven.org/)

javamoney-parent.iml

Lines changed: 0 additions & 209 deletions
This file was deleted.

0 commit comments

Comments
 (0)