Skip to content

Commit 1d300d3

Browse files
georgweissgeorgweiss
committed
Changes in this commit are primarily for Java 9 or newer.
The code was successfully built with Java 1.8, Java 9.0.4 and Java 10.0.1, using Maven 3.5.2 on Mac OS 10.12.6. Summary of changes: * Dependencies to Corba have been removed. This does imply a few API changes, but should have very limited impact. * Some pom files have been updated to fix an issue with the javadoc Maven plugin. * javadoc warnings eliminated. * Some html was changed due to the javadoc tool behavior in Java 9+, which treats self-closing elements as errors and hence aborts the Maven build. * Classes considered superfluous removed.
1 parent 6a4dd77 commit 1d300d3

27 files changed

Lines changed: 1118 additions & 2283 deletions

File tree

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ buildNumber.properties
99
.mvn/timing.properties
1010
nbactions.xml
1111
.settings
12-
.project
12+
.project
13+
14+
# For all you Mac OS users out there
15+
**/.DS_Store

‎bundleJava/pom.xml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -309,16 +309,16 @@
309309
<build>
310310
<plugins>
311311

312-
<plugin>
313-
<artifactId>maven-deploy-plugin</artifactId>
314-
<version>2.8.2</version>
315-
<dependencies>
316-
<dependency>
317-
<groupId>org.apache.maven.wagon</groupId>
318-
<artifactId>wagon-ssh</artifactId>
319-
<version>2.8</version>
320-
</dependency>
321-
</dependencies>
312+
<plugin>
313+
<artifactId>maven-deploy-plugin</artifactId>
314+
<version>2.8.2</version>
315+
<dependencies>
316+
<dependency>
317+
<groupId>org.apache.maven.wagon</groupId>
318+
<artifactId>wagon-ssh</artifactId>
319+
<version>2.8</version>
320+
</dependency>
321+
</dependencies>
322322
</plugin>
323323

324324
<plugin>
@@ -335,6 +335,7 @@
335335
<configuration>
336336
<finalName>${releaseName}</finalName>
337337
<appendAssemblyId>false</appendAssemblyId>
338+
<tarLongFileMode>posix</tarLongFileMode>
338339
<descriptors>
339340
<descriptor>src/assembly/distribution.xml</descriptor>
340341
</descriptors>
@@ -363,4 +364,4 @@
363364

364365
</plugins>
365366
</build>
366-
</project>
367+
</project>

‎exampleJava‎

Submodule exampleJava updated 22 files

‎normativeTypesJava/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/target/
22
documentation/html
3+
/bin/

‎pom.xml‎

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<epics-pvdatabase.version>4.3.0-SNAPSHOT</epics-pvdatabase.version>
2121
<jca.version>2.3.7-SNAPSHOT</jca.version>
2222
<!-- Versions of examples bundled with Core -->
23-
23+
2424
<!-- Name of javadoc overview page -->
2525
<mainpage.name>${project.name}</mainpage.name>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -110,6 +110,14 @@
110110
<role>developer</role>
111111
</roles>
112112
</developer>
113+
<developer>
114+
<name>Georg Weiss</name>
115+
<email>georgweiss@esss.se</email>
116+
<organization>European Spallation Source</organization>
117+
<roles>
118+
<role>developer</role>
119+
</roles>
120+
</developer>
113121
</developers>
114122

115123
<distributionManagement>
@@ -263,7 +271,7 @@
263271
<execution>
264272
<id>bundle-manifest</id>
265273
<phase>process-classes</phase>
266-
<goals>
274+
<goals>
267275
<goal>manifest</goal>
268276
</goals>
269277
</execution>
@@ -274,9 +282,9 @@
274282
<artifactId>maven-jar-plugin</artifactId>
275283
<version>3.0.2</version>
276284
<configuration>
277-
<archive>
285+
<archive>
278286
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
279-
</archive>
287+
</archive>
280288
</configuration>
281289
</plugin>
282290

@@ -308,7 +316,7 @@
308316
<plugin>
309317
<groupId>org.apache.maven.plugins</groupId>
310318
<artifactId>maven-javadoc-plugin</artifactId>
311-
<version>3.0.0-M1</version>
319+
<version>3.0.1</version>
312320
<configuration>
313321
<overview>documentation/${mainpage.name}.html</overview>
314322
</configuration>
@@ -322,16 +330,16 @@
322330
</executions>
323331
</plugin>
324332

325-
<plugin>
326-
<artifactId>maven-deploy-plugin</artifactId>
327-
<version>2.8.2</version>
328-
<dependencies>
329-
<dependency>
330-
<groupId>org.apache.maven.wagon</groupId>
331-
<artifactId>wagon-ssh</artifactId>
332-
<version>2.8</version>
333-
</dependency>
334-
</dependencies>
333+
<plugin>
334+
<artifactId>maven-deploy-plugin</artifactId>
335+
<version>2.8.2</version>
336+
<dependencies>
337+
<dependency>
338+
<groupId>org.apache.maven.wagon</groupId>
339+
<artifactId>wagon-ssh</artifactId>
340+
<version>2.8</version>
341+
</dependency>
342+
</dependencies>
335343
</plugin>
336344

337345
<plugin>
@@ -351,7 +359,7 @@
351359

352360
<profiles>
353361

354-
<profile>
362+
<profile>
355363
<id>with-examples</id>
356364
<activation>
357365
<activeByDefault>true</activeByDefault>
@@ -384,6 +392,46 @@
384392
</build>
385393
</profile>
386394

395+
<profile>
396+
<id>java-9+</id>
397+
<activation>
398+
<jdk>[9,)</jdk>
399+
</activation>
400+
<modules>
401+
<module>directoryService</module>
402+
<module>exampleJava</module>
403+
<module>bundleJava</module>
404+
</modules>
405+
<build>
406+
<plugins>
407+
<plugin>
408+
<groupId>org.apache.maven.plugins</groupId>
409+
<artifactId>maven-javadoc-plugin</artifactId>
410+
<configuration>
411+
<overview>documentation/${mainpage.name}.html</overview>
412+
</configuration>
413+
<dependencies>
414+
<dependency>
415+
<groupId>org.apache.commons</groupId>
416+
<artifactId>commons-lang3</artifactId>
417+
<version>3.7</version>
418+
</dependency>
419+
</dependencies>
420+
<executions>
421+
<execution>
422+
<id>attach-javadocs</id>
423+
<goals>
424+
<goal>jar</goal>
425+
</goals>
426+
<configuration>
427+
<additionalOptions>-html5</additionalOptions>
428+
</configuration>
429+
</execution>
430+
</executions>
431+
</plugin>
432+
</plugins>
433+
</build>
434+
</profile>
387435
</profiles>
388436

389437
</project>

‎pvAccessJava/documentation/pvAccessJava.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ <h1>EPICS pvAccessJava</h1>
4040
<h2 class="nocount">Release 4.0.2, 10-Nov-2014</h2>
4141
<dl>
4242
<dt>Editors:</dt>
43-
<dd>Marty Kraimer, BNL<br />
43+
<dd>Marty Kraimer, BNL<br>
4444
Matej Sekoranja, CosyLab</dd>
4545
</dl>
4646

4747
<h2 class="nocount">Abstract</h2>
4848

4949
<p>pvAccessJava is the Java implementation of pvAccess, which is one of a
50-
related set of products:<br />
50+
related set of products:<br>
5151
<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
5252
</p>
5353

@@ -304,7 +304,7 @@ <h4>Implementation of ChannelGetRequester:</h4>
304304
The implementation above issues actual get request on success by calling
305305
"channelGet.get()".
306306
User can always destroy a request by calling
307-
"channelGet.destroy()".<br />
307+
"channelGet.destroy()".<br>
308308
ChannelGetRequester.getDone gets called on get operation completion.
309309
On success indicated by status parameter, pvStructure holds the latest data.</p>
310310

0 commit comments

Comments
 (0)