fixed merge

This commit is contained in:
Jeremy Long
2018-01-27 09:17:30 -05:00
2 changed files with 11 additions and 1 deletions

View File

@@ -62,7 +62,7 @@ after_failure:
deploy:
- provider: script
script: mvn --settings .travis.settings.xml source:jar javadoc:jar package deploy -DskipTests=true -X
script: mvn --settings .travis.settings.xml source:jar javadoc:jar package deploy -DskipTests=true
skip_cleanup: true
on:
branch: master

10
pom.xml
View File

@@ -330,6 +330,16 @@ Copyright (c) 2012 - Jeremy Long
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<!-- upgrading beyond 1.5 will cause the build to fail on Java 7 -->
<version>1.5</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.12</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<executions>
<execution>
<id>add-dynamic-properties-clean</id>