Merge branch 'master' into release/7.0

Conflicts:
	.travis.yml
	gpclient/pom.xml
	pom.xml

Author: shroffk

.travis.yml

@@ -3,15 +3,16 @@ language: java
 
 matrix:
   include:
-#    - jdk: openjdk8
+    - jdk: openjdk8
+      before_install:
+        - export MVN_OPT='--projects "!gpclient/gpclient-javafx"'
     - jdk: openjdk11
-
 env:
   - EPICS_PVA_ADDR_LIST=127.255.255.255
 
 install: true
 script:
-  - mvn clean verify ${MVN_OPT} -B
+  - mvn clean verify -B
 
 after_failure:
  - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat

epics-util/pom.xml

@@ -41,19 +41,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>

epics-vtype/pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <version>2.0.2-beta</version>
             <scope>test</scope>
         </dependency>
         <dependency>