github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 18:11:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Jeremy Long
2018-01-27 09:17:30 -05:00
parent 3ba68d8a34 00a7197f12
commit dda33932e1
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -62,7 +62,7 @@ after_failure:
deploy: deploy:
- provider: script - 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 skip_cleanup: true
on: on:
branch: master branch: master

10
pom.xml
View File

@@ -330,6 +330,16 @@ Copyright (c) 2012 - Jeremy Long
<plugin> <plugin>
<groupId>org.codehaus.gmavenplus</groupId> <groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId> <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> <executions>
<execution> <execution>
<id>add-dynamic-properties-clean</id> <id>add-dynamic-properties-clean</id>