Skip to content

Commit 477260c

Browse files
committed
update the mockito and javadoc plugins for java 11
1 parent c6fcf6d commit 477260c

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

gpclient/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<dependency>
109109
<groupId>org.mockito</groupId>
110110
<artifactId>mockito-core</artifactId>
111-
<version>2.13.0</version>
111+
<version>2.22.0</version>
112112
<scope>test</scope>
113113
</dependency>
114114
<dependency>

pom.xml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<!-- Name of javadoc overview page -->
2222
<mainpage.name>${project.name}</mainpage.name>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
<asm.version>7.0</asm.version>
2425
</properties>
2526

2627
<modules>
@@ -50,7 +51,6 @@
5051
<connection>scm:git:https://github.com/epics-base/epicsCoreJava.git</connection>
5152
<developerConnection>scm:git:https://github.com/epics-base/epicsCoreJava.git</developerConnection>
5253
<url>https://github.com/epics-base/epicsCoreJava</url>
53-
<tag>epics-parent-7.0.2</tag>
5454
</scm>
5555

5656
<!-- Project developers (alphabetically) taken from SCM logs -->
@@ -217,18 +217,18 @@
217217
<dependency>
218218
<groupId>org.epics</groupId>
219219
<artifactId>jca</artifactId>
220-
<version>2.4.3-SNAPSHOT</version>
220+
<version>${jca.version}</version>
221221
</dependency>
222222
<dependency>
223223
<groupId>org.epics</groupId>
224224
<artifactId>jca</artifactId>
225-
<version>2.4.3-SNAPSHOT</version>
225+
<version>${jca.version}</version>
226226
<classifier>sources</classifier>
227227
</dependency>
228228
<dependency>
229229
<groupId>org.epics</groupId>
230230
<artifactId>jca</artifactId>
231-
<version>2.4.3-SNAPSHOT</version>
231+
<version>${jca.version}</version>
232232
<classifier>javadoc</classifier>
233233
</dependency>
234234

@@ -274,8 +274,8 @@
274274
<artifactId>maven-compiler-plugin</artifactId>
275275
<version>3.7.0</version>
276276
<configuration>
277-
<source>1.7</source>
278-
<target>1.7</target>
277+
<source>1.8</source>
278+
<target>1.8</target>
279279
</configuration>
280280
</plugin>
281281

@@ -307,6 +307,17 @@
307307
<additionalOptions>
308308
<additionalOption>${javadoc.opts}</additionalOption>
309309
</additionalOptions>
310+
<detectJavaApiLink>true</detectJavaApiLink>
311+
<detectLinks>false</detectLinks>
312+
<detectOfflineLinks>true</detectOfflineLinks>
313+
<docfilessubdirs>true</docfilessubdirs>
314+
<isOffline>false</isOffline>
315+
<!-- Hardcoding the java 8 docs since 11.0.2 and maven javadoc
316+
plugin hit the following jdk bug https://bugs.openjdk.java.net/browse/JDK-8212233 -->
317+
<links>
318+
<link>https://docs.oracle.com/javase/8/docs/api/</link>
319+
</links>
320+
<source>8</source>
310321
</configuration>
311322
<executions>
312323
<execution>
@@ -316,6 +327,13 @@
316327
</goals>
317328
</execution>
318329
</executions>
330+
<dependencies>
331+
<dependency>
332+
<groupId>org.ow2.asm</groupId>
333+
<artifactId>asm</artifactId>
334+
<version>${asm.version}</version>
335+
</dependency>
336+
</dependencies>
319337
</plugin>
320338

321339
<plugin>

0 commit comments

Comments
 (0)