Merge remote-tracking branch 'upstream/master' into use-named-beans

JMRI · Jun 16, 2019 · 2c484c8 · 2c484c8
2 parents 73444b9 + 3ec4082
commit 2c484c8
Show file tree

Hide file tree

Showing 245 changed files with 6,924 additions and 2,543 deletions.
diff --git a/.classpath b/.classpath
@@ -122,17 +122,21 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/cucumber-core-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/cucumber-java-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/cucumber-java8-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/cucumber-junit-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/cucumber-core-4.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/cucumber-java-4.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/cucumber-java8-4.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/cucumber-junit-4.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/cucumber-html-4.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/cucumber-jvm-deps-1.0.6.jar"/>
-	<classpathentry kind="lib" path="lib/cucumber-picocontainer-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/gherkin-4.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/cucumber-picocontainer-4.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/cucumber-expressions-6.2.2.jar"/>
+	<classpathentry kind="lib" path="lib/gherkin-5.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/gherkin-jvm-deps-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/picocontainer-2.15.jar"/>
-	<classpathentry kind="lib" path="lib/tag-expressions-1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/tag-expressions-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/typetools-0.5.0.jar"/>
+	<classpathentry kind="lib" path="lib/datatable-1.1.12.jar"/>
+	<classpathentry kind="lib" path="lib/datatable-dependencies-1.1.12.jar"/>
 	<classpathentry kind="lib" path="lib/webdrivermanager-3.4.0.jar"/>
 	<classpathentry kind="lib" path="lib/jarchivelib-1.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/mqtt-client-0.4.0.jar"/>

diff --git a/.idea/JMRI.iml b/.idea/JMRI.iml
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ addons:
     - dbus-x11
     - tidy
   firefox: latest
-  chrome: stable
+  chrome: beta 
 
 before_install:
   # ensure no unwanted defaults are set
@@ -50,9 +50,9 @@ env:
   # see http://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#runOrder for valid values
   - RUN_ORDER=filesystem
   matrix:
-  - HEADLESS=true STATIC=true
-  - HEADLESS=true STATIC=false
   - HEADLESS=false STATIC=false
+  - HEADLESS=true STATIC=false
+  - HEADLESS=true STATIC=true
 
 matrix:
   exclude:

diff --git a/build.xml b/build.xml
@@ -273,17 +273,21 @@
         <pathelement location="${libdir}/jemmy-22-00c9f753cd0a.jar"/>
         <pathelement location="${libdir}/system-rules-1.16.0.jar"/>
         <!-- cucumber and it's dependencies -->
-        <pathelement location="${libdir}/cucumber-core-2.0.1.jar"/>
-        <pathelement location="${libdir}/cucumber-java-2.0.1.jar"/>
-        <pathelement location="${libdir}/cucumber-java8-2.0.1.jar"/>
-        <pathelement location="${libdir}/cucumber-junit-2.0.1.jar"/>
+        <pathelement location="${libdir}/cucumber-core-4.3.1.jar"/>
+        <pathelement location="${libdir}/cucumber-java-4.3.1.jar"/>
+        <pathelement location="${libdir}/cucumber-java8-4.3.1.jar"/>
+        <pathelement location="${libdir}/cucumber-junit-4.3.1.jar"/>
         <pathelement location="${libdir}/cucumber-jvm-deps-1.0.6.jar"/>
-        <pathelement location="${libdir}/cucumber-picocontainer-2.0.1.jar"/>
-        <pathelement location="${libdir}/gherkin-4.1.3.jar"/>
+        <pathelement location="${libdir}/cucumber-picocontainer-4.3.1.jar"/>
+        <pathelement location="${libdir}/cucumber-html-0.2.7.jar"/>
+        <pathelement location="${libdir}/cucumber-expressions-6.2.2.jar"/>
+        <pathelement location="${libdir}/gherkin-5.1.0.jar"/>
         <pathelement location="${libdir}/gherkin-jvm-deps-1.0.4.jar"/>
         <pathelement location="${libdir}/picocontainer-2.15.jar"/>
-        <pathelement location="${libdir}/tag-expressions-1.0.1.jar"/>
+        <pathelement location="${libdir}/tag-expressions-1.1.1.jar"/>
         <pathelement location="${libdir}/typetools-0.5.0.jar"/>
+        <pathelement location="${libdir}/datatable-1.1.12.jar"/>
+        <pathelement location="${libdir}/datatable-dependencies-1.1.12.jar"/>
         <!-- Selenium and it's dependencies -->
         <pathelement location="${libdir}/selenium-server-standalone-3.6.0.jar"/>
         <pathelement location="${libdir}/webdrivermanager-3.4.0.jar"/>
@@ -1347,6 +1351,7 @@
             <sysproperty key="log4j.ignoreTCL" path="true/"/>
             <sysproperty key="java.library.path" path=".:${libdir}:${arch.lib.path}"/>
             <sysproperty key="jmri.prefsdir" path="${tempdir}"/>
+            <sysproperty key="cucumber.options" value="--tags 'not @Ignore' --tags 'not @headed'"/>
             <sysproperty key="jinput.plugins" path="net.bobis.jinput.hidraw.HidRawEnvironmentPlugin"/>
 
             <sysproperty key="java.awt.headless" value="true"/>
@@ -1397,6 +1402,7 @@
             <sysproperty key="log4j.ignoreTCL" path="true/"/>
             <sysproperty key="java.library.path" path=".:${libdir}:${arch.lib.path}"/>
             <sysproperty key="jmri.prefsdir" path="${tempdir}"/>
+            <sysproperty key="cucumber.options" value="--tags 'not @Ignore' --tags 'not @headed'"/>
             <sysproperty key="jinput.plugins" path="net.bobis.jinput.hidraw.HidRawEnvironmentPlugin"/>
 
             <sysproperty key="java.awt.headless" value="true"/>