Skip to content

Commit 3d1ec12

Browse files
ralphlangeralphlange
authored
Merge pull request #62 from shroffk/7.0.3
OpenJDK 11 related changes (preparing 7.0.3)
2 parents 1714e53 + 8af35bf commit 3d1ec12

File tree

6 files changed

+66
-33
lines changed

6 files changed

+66
-33
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
sudo: required
22
language: java
3-
jdk:
4-
- oraclejdk8
5-
- oraclejdk9
63

74
matrix:
85
include:
96
- jdk: openjdk8
107
before_install:
118
- export MVN_OPT='--projects "!gpclient/gpclient-javafx"'
12-
- jdk: openjdk10
13-
before_install:
14-
- rm "${JAVA_HOME}/lib/security/cacerts"
15-
- ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
16-
- export MVN_OPT='--projects "!gpclient/gpclient-javafx"'
9+
- jdk: openjdk11
10+
1711
env:
1812
- EPICS_PVA_ADDR_LIST=127.255.255.255
1913

‎epics-util/src/main/java/org/epics/util/array/ListBoolean.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract class ListBoolean {
1818
* @param index position of the element to return
1919
* @return the element at the specified position in this list
2020
* @throws IndexOutOfBoundsException if the index is out of range
21-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
21+
* (<code>index &lt; 0 || index &gt;= size()</code>)
2222
*/
2323
public abstract boolean getBoolean(int index);
2424

@@ -28,7 +28,7 @@ public abstract class ListBoolean {
2828
* @param index position of the element to change
2929
* @param value the new value
3030
* @throws IndexOutOfBoundsException if the index is out of range
31-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
31+
* (<code>index &lt; 0 || index &gt;= size()</code>)
3232
*/
3333
public abstract void setBoolean(int index, boolean value);
3434

‎epics-util/src/main/java/org/epics/util/array/ListNumber.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface ListNumber extends CollectionNumber {
2020
* @param index position of the element to return
2121
* @return the element at the specified position in this list
2222
* @throws IndexOutOfBoundsException if the index is out of range
23-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
23+
* (<code>index &lt; 0 || index &gt;= size()</code>)
2424
*/
2525
double getDouble(int index);
2626

@@ -30,7 +30,7 @@ public interface ListNumber extends CollectionNumber {
3030
* @param index position of the element to return
3131
* @return the element at the specified position in this list
3232
* @throws IndexOutOfBoundsException if the index is out of range
33-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
33+
* (<code>index &lt; 0 || index &gt;= size()</code>)
3434
*/
3535
float getFloat(int index);
3636

@@ -40,7 +40,7 @@ public interface ListNumber extends CollectionNumber {
4040
* @param index position of the element to return
4141
* @return the element at the specified position in this list
4242
* @throws IndexOutOfBoundsException if the index is out of range
43-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
43+
* (<code>index &lt; 0 || index &gt;= size()</code>)
4444
*/
4545
long getLong(int index);
4646

@@ -50,7 +50,7 @@ public interface ListNumber extends CollectionNumber {
5050
* @param index position of the element to return
5151
* @return the element at the specified position in this list
5252
* @throws IndexOutOfBoundsException if the index is out of range
53-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
53+
* (<code>index &lt; 0 || index &gt;= size()</code>)
5454
*/
5555
int getInt(int index);
5656

@@ -60,7 +60,7 @@ public interface ListNumber extends CollectionNumber {
6060
* @param index position of the element to return
6161
* @return the element at the specified position in this list
6262
* @throws IndexOutOfBoundsException if the index is out of range
63-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
63+
* (<code>index &lt; 0 || index &gt;= size()</code>)
6464
*/
6565
short getShort(int index);
6666

@@ -70,7 +70,7 @@ public interface ListNumber extends CollectionNumber {
7070
* @param index position of the element to return
7171
* @return the element at the specified position in this list
7272
* @throws IndexOutOfBoundsException if the index is out of range
73-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
73+
* (<code>index &lt; 0 || index &gt;= size()</code>)
7474
*/
7575
byte getByte(int index);
7676

@@ -81,7 +81,7 @@ public interface ListNumber extends CollectionNumber {
8181
* @param index position of the element to change
8282
* @param value the new value
8383
* @throws IndexOutOfBoundsException if the index is out of range
84-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
84+
* (<code>index &lt; 0 || index &gt;= size()</code>)
8585
*/
8686
void setDouble(int index, double value);
8787

@@ -92,7 +92,7 @@ public interface ListNumber extends CollectionNumber {
9292
* @param index position of the element to change
9393
* @param value the new value
9494
* @throws IndexOutOfBoundsException if the index is out of range
95-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
95+
* (<code>index &lt; 0 || index &gt;= size()</code>)
9696
*/
9797
void setFloat(int index, float value);
9898

@@ -103,7 +103,7 @@ public interface ListNumber extends CollectionNumber {
103103
* @param index position of the element to change
104104
* @param value the new value
105105
* @throws IndexOutOfBoundsException if the index is out of range
106-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
106+
* (<code>index &lt; 0 || index &gt;= size()</code>)
107107
*/
108108
void setLong(int index, long value);
109109

@@ -114,7 +114,7 @@ public interface ListNumber extends CollectionNumber {
114114
* @param index position of the element to change
115115
* @param value the new value
116116
* @throws IndexOutOfBoundsException if the index is out of range
117-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
117+
* (<code>index &lt; 0 || index &gt;= size()</code>)
118118
*/
119119
void setInt(int index, int value);
120120

@@ -125,7 +125,7 @@ public interface ListNumber extends CollectionNumber {
125125
* @param index position of the element to change
126126
* @param value the new value
127127
* @throws IndexOutOfBoundsException if the index is out of range
128-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
128+
* (<code>index &lt; 0 || index &gt;= size()</code>)
129129
*/
130130
void setShort(int index, short value);
131131

@@ -136,7 +136,7 @@ public interface ListNumber extends CollectionNumber {
136136
* @param index position of the element to change
137137
* @param value the new value
138138
* @throws IndexOutOfBoundsException if the index is out of range
139-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
139+
* (<code>index &lt; 0 || index &gt;= size()</code>)
140140
*/
141141
void setByte(int index, byte value);
142142

@@ -147,21 +147,21 @@ public interface ListNumber extends CollectionNumber {
147147
* @param index position of the first element to change
148148
* @param list the new values
149149
* @throws IndexOutOfBoundsException if the index is out of range
150-
* (<tt>index &lt; 0 || index &gt;= size()</tt>) or if this
150+
* (<code>index &lt; 0 || index &gt;= size()</code>) or if this
151151
* list is too short to hold the data.
152152
*/
153153
void setAll(int index, ListNumber list);
154154

155155
/**
156156
* Returns a view of the portion of this list between the specified
157-
* <tt>fromIndex</tt>, inclusive, and <tt>toIndex</tt>, exclusive.
157+
* <var>fromIndex</var>, inclusive, and <var>toIndex</var>, exclusive.
158158
*
159159
* @param fromIndex low endpoint (inclusive) of the subList
160160
* @param toIndex high endpoint (exclusive) of the subList
161161
* @return a view of the specified range within this list
162162
* @throws IndexOutOfBoundsException for an illegal endpoint index value
163-
* (<tt>fromIndex &lt; 0 || toIndex &gt; size ||
164-
* fromIndex &gt; toIndex</tt>)
163+
* (<code>fromIndex &lt; 0 || toIndex &gt; size ||
164+
* fromIndex &gt; toIndex</code>)
165165
*/
166166
ListNumber subList(int fromIndex, int toIndex);
167167

‎gpclient/gpclient-javafx/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,26 @@
3636
<artifactId>gpclient-loc</artifactId>
3737
<version>${project.version}</version>
3838
</dependency>
39+
<!-- JavaFX, since JDK 11 a separate module -->
40+
<dependency>
41+
<groupId>org.openjfx</groupId>
42+
<artifactId>javafx-controls</artifactId>
43+
<version>11.0.2</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.openjfx</groupId>
47+
<artifactId>javafx-web</artifactId>
48+
<version>11.0.2</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.openjfx</groupId>
52+
<artifactId>javafx-swing</artifactId>
53+
<version>11.0.2</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.openjfx</groupId>
57+
<artifactId>javafx-fxml</artifactId>
58+
<version>11.0.2</version>
59+
</dependency>
3960
</dependencies>
4061
</project>

‎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)