Skip to content

Commit 4c9d92f

Browse files
committed
Merge branch 'develop'
2 parents 1692d4e + 0101067 commit 4c9d92f

File tree

92 files changed

+41
-4970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+41
-4970
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
hs_err_pid*
2323

2424
# build artifacts
25-
*/target/*
25+
target

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jdk:
88
- openjdk7
99

1010
install: mvn install -DskipTests=true -q
11-
script: mvn verify -B -q
11+
script: mvn verify snyk:monitor -B -q

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# ZAP Java Integration
22

3-
[![Build Status](https://travis-ci.org/ContinuousSecurityTooling/zap-java.svg?branch=master)](https://travis-ci.org/ContinuousSecurityTooling/zap-java)
3+
[![Build Status](https://travis-ci.org/ContinuousSecurityTooling/zap-java.svg?branch=master)](https://travis-ci.org/ContinuousSecurityTooling/zap-java)
4+
[![Known Vulnerabilities](https://snyk.io/test/github/ContinuousSecurityTooling/zap-java/badge.svg)](https://snyk.io/test/github/ContinuousSecurityTooling/zap-java)

pom.xml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>net.continuous-security-tools</groupId>
66
<artifactId>zap-java-integration</artifactId>
7-
<version>0.2.0-SNAPSHOT</version>
7+
<version>0.2.0</version>
88
<packaging>pom</packaging>
99

1010
<name>ZAP Maven Plugin Parent</name>
@@ -85,6 +85,7 @@
8585
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
8686
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
8787
<maven-plugin.gitflow.version>1.8.0</maven-plugin.gitflow.version>
88+
<maven-snyk-plugin.version>1.1.1</maven-snyk-plugin.version>
8889

8990
<!-- Dependencies versions -->
9091
<zap-api-java.version>1.5.0</zap-api-java.version>
@@ -161,12 +162,12 @@
161162

162163
<!-- Project modules version -->
163164
<dependency>
164-
<groupId>com.hyper2k</groupId>
165+
<groupId>net.continuous-security-tools</groupId>
165166
<artifactId>zap-utils</artifactId>
166167
<version>${project.version}</version>
167168
</dependency>
168169
<dependency>
169-
<groupId>com.hyper2k</groupId>
170+
<groupId>net.continuous-security-tools</groupId>
170171
<artifactId>zap-client-api</artifactId>
171172
<version>${project.version}</version>
172173
</dependency>
@@ -188,6 +189,35 @@
188189
</configuration>
189190
</plugin>
190191

192+
<!-- -->
193+
194+
<plugin>
195+
<groupId>io.snyk</groupId>
196+
<artifactId>snyk-maven-plugin</artifactId>
197+
<version>${maven-snyk-plugin.version}</version>
198+
<executions>
199+
<execution>
200+
<id>snyk-test</id>
201+
<phase>test</phase>
202+
<goals>
203+
<goal>test</goal>
204+
</goals>
205+
</execution>
206+
<execution>
207+
<id>snyk-monitor</id>
208+
<phase>install</phase>
209+
<goals>
210+
<goal>monitor</goal>
211+
</goals>
212+
</execution>
213+
</executions>
214+
<configuration>
215+
<apiToken>${SNYK_API_TOKEN}</apiToken>
216+
<failOnSeverity>medium</failOnSeverity>
217+
<org></org>
218+
</configuration>
219+
</plugin>
220+
191221
<!-- Attach Javadoc and source -->
192222
<plugin>
193223
<groupId>org.apache.maven.plugins</groupId>
@@ -259,7 +289,7 @@
259289
<releaseBranchPrefix>release/</releaseBranchPrefix>
260290
<hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
261291
<supportBranchPrefix>support/</supportBranchPrefix>
262-
<versionPrefix>v</versionPrefix>
292+
<versionTagPrefix>v</versionTagPrefix>
263293
<origin>origin</origin>
264294
</gitFlowConfig>
265295
<keepBranch>false</keepBranch>

zap-client-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>net.continuous-security-tools</groupId>
77
<artifactId>zap-java-integration</artifactId>
8-
<version>0.2.0-SNAPSHOT</version>
8+
<version>0.2.0</version>
99
<relativePath>../</relativePath>
1010
</parent>
1111

zap-client-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

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

zap-client-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

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

zap-client-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

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

zap-client-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

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

0 commit comments

Comments
 (0)