Skip to content

Commit 579319b

Browse files
authored
Merge pull request #16 from rleigh-codelibre/java9-build
build: Update maven plugin versions
2 parents fd0a6a2 + 3f2b0d5 commit 579319b

File tree

3 files changed

+46
-32
lines changed

3 files changed

+46
-32
lines changed

.appveyor.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
environment:
2+
AV_PROJECTS: 'c:\projects'
3+
AV_OME_M2: 'c:\projects\m2'
4+
AV_OME_SOURCE: 'c:\projects\source'
5+
6+
# Note that only Oracle JDK is provided.
7+
matrix:
8+
- java: 9
9+
- java: 1.8
10+
- java: 1.7
11+
12+
cache:
13+
- '%AV_OME_M2% -> appveyor.yml'
14+
- '%AV_OME_PYTHON% -> appveyor.yml'
15+
16+
os: 'Visual Studio 2015'
17+
clone_folder: '%AV_OME_SOURCE%'
18+
clone_depth: 5
19+
platform: x64
20+
21+
init:
22+
- git config --global core.autocrlf input
23+
- refreshenv
24+
- 'if [%java%] == [1.7] set "JAVA_HOME=C:\Program Files\Java\jdk1.7.0"'
25+
- 'if [%java%] == [1.8] set "JAVA_HOME=C:\Program Files\Java\jdk1.8.0"'
26+
- 'if [%java%] == [9] set "JAVA_HOME=C:\Program Files\Java\jdk9"'
27+
- PATH=%JAVA_HOME%\bin;%PATH%
28+
- 'set "MAVEN_OPTS=-Dmaven.repo.local=%AV_OME_M2%"'
29+
30+
build_script:
31+
- mvn install

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cache:
88
- $HOME/.m2
99

1010
jdk:
11+
- oraclejdk9
1112
- oraclejdk8
1213
- openjdk7
1314

pom.xml

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</mailingLists>
7373

7474
<prerequisites>
75-
<maven>3.0</maven>
75+
<maven>3.0.5</maven>
7676
</prerequisites>
7777

7878
<scm>
@@ -187,7 +187,7 @@
187187
<plugin>
188188
<groupId>org.apache.maven.plugins</groupId>
189189
<artifactId>maven-compiler-plugin</artifactId>
190-
<version>3.5.1</version>
190+
<version>3.7.0</version>
191191
<!-- Require the Java 7 platform. -->
192192
<configuration>
193193
<source>1.7</source>
@@ -202,7 +202,7 @@
202202
<plugin>
203203
<groupId>org.codehaus.mojo</groupId>
204204
<artifactId>license-maven-plugin</artifactId>
205-
<version>1.9</version>
205+
<version>1.14</version>
206206
<configuration>
207207
<licenseName>bsd_2</licenseName>
208208
<organizationName>Open Microscopy Environment:
@@ -228,7 +228,7 @@
228228
<plugin>
229229
<groupId>org.apache.maven.plugins</groupId>
230230
<artifactId>maven-surefire-plugin</artifactId>
231-
<version>2.19.1</version>
231+
<version>2.20.1</version>
232232
<configuration>
233233
<suiteXmlFiles>
234234
<suiteXmlFile>src/test/java/loci/common/utests/testng-template.xml</suiteXmlFile>
@@ -238,7 +238,7 @@
238238

239239
<plugin>
240240
<artifactId>maven-assembly-plugin</artifactId>
241-
<version>2.6</version>
241+
<version>3.1.0</version>
242242
</plugin>
243243

244244
<plugin>
@@ -248,7 +248,7 @@
248248

249249
<plugin>
250250
<artifactId>maven-dependency-plugin</artifactId>
251-
<version>2.10</version>
251+
<version>3.0.2</version>
252252
</plugin>
253253

254254
<plugin>
@@ -294,7 +294,7 @@
294294
<artifactId>maven-javadoc-plugin</artifactId>
295295
<!-- NB: The same version declaration and configuration block also
296296
appears in the <reporting> section, and must be kept in sync. -->
297-
<version>2.10.4</version>
297+
<version>3.0.0</version>
298298
<configuration>
299299
<failOnError>false</failOnError>
300300
<links>
@@ -330,12 +330,12 @@
330330

331331
<plugin>
332332
<artifactId>maven-resources-plugin</artifactId>
333-
<version>3.0.1</version>
333+
<version>3.0.2</version>
334334
</plugin>
335335

336336
<plugin>
337337
<artifactId>maven-site-plugin</artifactId>
338-
<version>3.5.1</version>
338+
<version>3.7</version>
339339
</plugin>
340340

341341
<!-- Create -sources.jar when building. -->
@@ -383,31 +383,13 @@
383383
<plugin>
384384
<groupId>org.codehaus.mojo</groupId>
385385
<artifactId>versions-maven-plugin</artifactId>
386-
<version>2.3</version>
386+
<version>2.5</version>
387387
</plugin>
388+
388389
</plugins>
389390
</build>
390391

391392
<profiles>
392-
<profile>
393-
<id>doclint-java8-disable</id>
394-
<activation>
395-
<jdk>[1.8,)</jdk>
396-
</activation>
397-
398-
<build>
399-
<plugins>
400-
<plugin>
401-
<groupId>org.apache.maven.plugins</groupId>
402-
<artifactId>maven-javadoc-plugin</artifactId>
403-
<version>2.9.1</version>
404-
<configuration>
405-
<additionalparam>-Xdoclint:none</additionalparam>
406-
</configuration>
407-
</plugin>
408-
</plugins>
409-
</build>
410-
</profile>
411393
<profile>
412394
<id>release</id>
413395
<build>
@@ -416,7 +398,7 @@
416398
<plugin>
417399
<groupId>org.sonatype.plugins</groupId>
418400
<artifactId>nexus-staging-maven-plugin</artifactId>
419-
<version>1.6.7</version>
401+
<version>1.6.8</version>
420402
<extensions>true</extensions>
421403
<configuration>
422404
<serverId>ossrh</serverId>
@@ -429,7 +411,7 @@
429411
<plugin>
430412
<groupId>org.apache.maven.plugins</groupId>
431413
<artifactId>maven-gpg-plugin</artifactId>
432-
<version>1.5</version>
414+
<version>1.6</version>
433415
<executions>
434416
<execution>
435417
<id>sign-artifacts</id>
@@ -451,7 +433,7 @@
451433
<plugin>
452434
<groupId>org.apache.maven.plugins</groupId>
453435
<artifactId>maven-javadoc-plugin</artifactId>
454-
<version>2.9.1</version>
436+
<version>3.0.0</version>
455437
<configuration>
456438
<failOnError>false</failOnError>
457439
<links>

0 commit comments

Comments
 (0)