Skip to content

Commit a15e804

Browse files
authored
Merge pull request #40 from marksreeves/update-dependency-check-maven
Update dependencies
2 parents cd426e2 + 58daabf commit a15e804

File tree

3 files changed

+29
-17
lines changed

3 files changed

+29
-17
lines changed

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
11
# java-common
2+
23
Reusable build configuration for for BorderTech open source projects.
34

45
## Status
6+
57
[![Build Status](https://travis-ci.com/BorderTech/java-common.svg?branch=master)](https://travis-ci.com/BorderTech/java-common)
68
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/c7a2226acd574943af9ae966c54b05e6)](https://app.codacy.com/app/BorderTech/java-common?utm_source=github.com&utm_medium=referral&utm_content=BorderTech/java-common&utm_campaign=Badge_Grade_Dashboard)
79
[![Maven Central](https://img.shields.io/maven-central/v/com.github.bordertech.common/bordertech-parent.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.github.bordertech.common%22%20AND%20a:%22bordertech-parent%22)
810

911
## qa-parent
12+
1013
BorderTech java projects should generally use this as their parent POM.
1114

1215
It runs quality assurance checks on your java code using tools such as checkstyle, pmd and findbugs.
1316

1417
By default qa checks do not run, you must enable them on a per-module basis in the pom.xml like so:
1518

16-
```xml
19+
``` xml
1720
<properties>
18-
<!-- Set bt.qa.skip to false to run QA checks. -->
19-
<bt.qa.skip>false</bt.qa.skip>
21+
<!-- Set bt.qa.skip to false to run QA checks. -->
22+
<bt.qa.skip>false</bt.qa.skip>
2023
</properties>
2124
```
25+
2226
Refer to qa-parent's [pom.xml](https://github.com/BorderTech/java-common/blob/master/qa-parent/pom.xml) for other project properties.
2327

2428
The qa-parent inherits all of the release functionality from bordertech-parent, discussed below.
2529

2630
## bordertech-parent
31+
2732
This is the top-level pom.xml file.
2833
It configures the maven release plugin for open source BorderTech projects to release to Maven Central.
2934

3035
_Note that java projects should generally not consume this directly but instead should use qa-parent as a parent POM instead._
3136

3237
Projects using this must ensure the necessary POM sections are overriden - these are marked in the bordertech-parent pom, for example:
3338

34-
```xml
39+
``` xml
3540
<!--
36-
Descendants SHOULD override the url.
41+
Descendants SHOULD override the url.
3742
-->
3843
<url>https://github.com/bordertech/java-common/</url>
3944
```
4045

4146
Once you have configured your project and environment you can release to Maven Central. It may look a little something like the examples below.
4247

4348
### Releasing
49+
4450
The golden rule is ALWAYS do the release on a separate branch (it makes [backing out](https://github.com/BorderTech/java-common/wiki/Releasing#dealing-with-failure) much easier when problems arise).
4551

4652
Full documentation is available in the wiki under [Releasing](https://github.com/BorderTech/java-common/wiki/Releasing).
4753

4854
## build-tools
55+
4956
This is primarily a shared resources module used by qa-parent and potentially other BorderTech maven modules.

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@
195195
</goals>
196196
<configuration>
197197
<rules>
198+
<requireMavenVersion>
199+
<version>[3.3.9,)</version>
200+
</requireMavenVersion>
201+
<requireJavaVersion>
202+
<version>[1.8,)</version>
203+
</requireJavaVersion>
198204
<requirePropertyDiverges>
199205
<property>project.description</property>
200206
</requirePropertyDiverges>

qa-parent/pom.xml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@
6161
<dependency>
6262
<groupId>org.junit.jupiter</groupId>
6363
<artifactId>junit-jupiter-engine</artifactId>
64-
<version>5.3.2</version>
64+
<version>5.4.0</version>
6565
<scope>test</scope>
6666
</dependency>
6767
<!-- Junit 5 support for Junit 4 -->
6868
<dependency>
6969
<groupId>org.junit.vintage</groupId>
7070
<artifactId>junit-vintage-engine</artifactId>
7171
<scope>test</scope>
72-
<version>5.3.2</version>
72+
<version>5.4.0</version>
7373
</dependency>
7474
</dependencies>
7575
</dependencyManagement>
@@ -80,7 +80,7 @@
8080
<plugin>
8181
<groupId>org.jacoco</groupId>
8282
<artifactId>jacoco-maven-plugin</artifactId>
83-
<version>0.8.2</version>
83+
<version>0.8.3</version>
8484
<executions>
8585
<!-- Prepare Jacoco agent. -->
8686
<execution>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.puppycrawl.tools</groupId>
127127
<artifactId>checkstyle</artifactId>
128-
<version>8.16</version>
128+
<version>8.17</version>
129129
</dependency>
130130
<!-- Bordertech config -->
131131
<dependency>
@@ -168,22 +168,22 @@
168168
<dependency>
169169
<groupId>net.sourceforge.pmd</groupId>
170170
<artifactId>pmd-core</artifactId>
171-
<version>6.10.0</version>
171+
<version>6.11.0</version>
172172
</dependency>
173173
<dependency>
174174
<groupId>net.sourceforge.pmd</groupId>
175175
<artifactId>pmd-java</artifactId>
176-
<version>6.10.0</version>
176+
<version>6.11.0</version>
177177
</dependency>
178178
<dependency>
179179
<groupId>net.sourceforge.pmd</groupId>
180180
<artifactId>pmd-javascript</artifactId>
181-
<version>6.10.0</version>
181+
<version>6.11.0</version>
182182
</dependency>
183183
<dependency>
184184
<groupId>net.sourceforge.pmd</groupId>
185185
<artifactId>pmd-jsp</artifactId>
186-
<version>6.10.0</version>
186+
<version>6.11.0</version>
187187
</dependency>
188188
<!-- Bordertech config -->
189189
<dependency>
@@ -219,7 +219,7 @@
219219
<plugin>
220220
<groupId>com.github.spotbugs</groupId>
221221
<artifactId>spotbugs-maven-plugin</artifactId>
222-
<version>3.1.10</version>
222+
<version>3.1.11</version>
223223
<configuration>
224224
<effort>Max</effort>
225225
<failOnError>true</failOnError>
@@ -256,7 +256,7 @@
256256
<dependency>
257257
<groupId>com.github.spotbugs</groupId>
258258
<artifactId>spotbugs</artifactId>
259-
<version>3.1.10</version>
259+
<version>3.1.11</version>
260260
</dependency>
261261
<!-- Bordertech config. -->
262262
<dependency>
@@ -271,13 +271,12 @@
271271
<plugin>
272272
<groupId>org.owasp</groupId>
273273
<artifactId>dependency-check-maven</artifactId>
274-
<version>4.0.2</version>
274+
<version>5.0.0-M1</version>
275275
<configuration>
276276
<failBuildOnCVSS>${bt.owasp.fail.cvss.min}</failBuildOnCVSS>
277277
<failBuildOnAnyVulnerability>${bt.owasp.fail.any}</failBuildOnAnyVulnerability>
278278
<mavenSettingsProxyId>${bt.owasp.proxy.id}</mavenSettingsProxyId>
279279
<retireJsAnalyzerEnabled>false</retireJsAnalyzerEnabled><!-- see https://github.com/jeremylong/DependencyCheck/issues/1467 before turning this on -->
280-
<nspAnalyzerEnabled>false</nspAnalyzerEnabled>
281280
<nuspecAnalyzerEnabled>false</nuspecAnalyzerEnabled>
282281
<swiftPackageManagerAnalyzerEnabled>false</swiftPackageManagerAnalyzerEnabled>
283282
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>

0 commit comments

Comments
 (0)