Skip to content

Commit 5ac7c3d

Browse files
authored
Merge pull request #50 from jeffgbutler/master
Updates for Java 10
2 parents 3dbb762 + 864049b commit 5ac7c3d

File tree

4 files changed

+40
-15
lines changed

4 files changed

+40
-15
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ buildNumber.properties
1313
/.vscode/
1414
/bin/
1515
.mvn/wrapper/maven-wrapper.jar
16+
.DS_Store

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
language: java
22
sudo: false
33

4-
before_install:
5-
- chmod +x mvnw
6-
74
jdk:
85
- oraclejdk9
96
- oraclejdk8

mvnw

100644100755
File mode changed.

pom.xml

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<plugin>
4646
<groupId>org.jacoco</groupId>
4747
<artifactId>jacoco-maven-plugin</artifactId>
48+
<version>0.8.1</version>
4849
<reportSets>
4950
<reportSet>
5051
<reports>
@@ -56,17 +57,54 @@
5657
</reportSet>
5758
</reportSets>
5859
</plugin>
60+
<plugin> <!-- JDK 10 -->
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-javadoc-plugin</artifactId>
63+
<version>3.0.1</version>
64+
</plugin>
5965
<plugin>
6066
<groupId>org.apache.maven.plugins</groupId>
6167
<artifactId>maven-checkstyle-plugin</artifactId>
6268
<configuration>
6369
<configLocation>checkstyle-override.xml</configLocation>
6470
</configuration>
6571
</plugin>
72+
<!-- Added for JDK 10 -->
73+
<plugin>
74+
<groupId>com.github.spotbugs</groupId>
75+
<artifactId>spotbugs-maven-plugin</artifactId>
76+
<version>3.1.5</version>
77+
</plugin>
6678
</plugins>
6779
</reporting>
6880

6981
<build>
82+
<pluginManagement>
83+
<!-- Added for JDK 10 -->
84+
<plugins>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-javadoc-plugin</artifactId>
88+
<version>3.0.1</version>
89+
</plugin>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-surefire-plugin</artifactId>
93+
<version>2.22.0</version>
94+
</plugin>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-site-plugin</artifactId>
98+
<version>3.7.1</version>
99+
</plugin>
100+
<plugin>
101+
<groupId>org.jacoco</groupId>
102+
<artifactId>jacoco-maven-plugin</artifactId>
103+
<version>0.8.1</version>
104+
</plugin>
105+
</plugins>
106+
</pluginManagement>
107+
70108
<plugins>
71109
<plugin>
72110
<groupId>org.codehaus.mojo</groupId>
@@ -88,17 +126,6 @@
88126
</execution>
89127
</executions>
90128
</plugin>
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-surefire-plugin</artifactId>
94-
<dependencies>
95-
<dependency>
96-
<groupId>org.junit.platform</groupId>
97-
<artifactId>junit-platform-surefire-provider</artifactId>
98-
<version>${junit.platform.version}</version>
99-
</dependency>
100-
</dependencies>
101-
</plugin>
102129
</plugins>
103130
</build>
104131

@@ -143,7 +170,7 @@
143170
<dependency>
144171
<groupId>org.springframework</groupId>
145172
<artifactId>spring-jdbc</artifactId>
146-
<version>5.0.6.RELEASE</version>
173+
<version>5.0.7.RELEASE</version>
147174
<scope>test</scope>
148175
</dependency>
149176
<dependency>

0 commit comments

Comments
 (0)