From 10cfc8f09f31a97ebf2e626ecc540a27be35734b Mon Sep 17 00:00:00 2001 From: Brian Schlining Date: Thu, 30 May 2024 12:23:10 -0700 Subject: [PATCH] removing sharktopoda stuff --- pom.xml | 18 +++++++++--------- vcr4j-core/pom.xml | 2 +- vcr4j-examples/pom.xml | 12 ++++++------ .../vcr4j/examples/remote/MultiOpenDemo1.java | 8 ++++---- ...est.java => FrameAdvanceTest.java.original} | 0 ...est.java => FramecaptureTest.java.original} | 0 ...mo01.java => MultiOpenDemo01.java.original} | 0 ...{PauseTest.java => PauseTest.java.original} | 0 ....java => SeekElapsedTimeTest.java.original} | 0 ...eDemo01.java => SimpleDemo01.java.original} | 0 ...eDemo02.java => SimpleDemo02.java.original} | 0 ...01.java => SingleVideoDemo01.java.original} | 0 ...ARSDemo01.java => VARSDemo01.java.original} | 0 ...ARSDemo02.java => VARSDemo02.java.original} | 0 ...foTest.java => VideoInfoTest.java.original} | 0 vcr4j-javafx/pom.xml | 2 +- vcr4j-jserialcomm/pom.xml | 2 +- vcr4j-jssc/pom.xml | 2 +- vcr4j-purejavacomm/pom.xml | 2 +- vcr4j-remote/pom.xml | 2 +- vcr4j-rs422/pom.xml | 2 +- vcr4j-sharktopoda-client/pom.xml | 2 +- .../src/main/java/module-info.java | 2 +- .../src/test/java/module-info.java | 2 +- vcr4j-sharktopoda/pom.xml | 2 +- vcr4j-udp/pom.xml | 2 +- 26 files changed, 31 insertions(+), 31 deletions(-) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{FrameAdvanceTest.java => FrameAdvanceTest.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{FramecaptureTest.java => FramecaptureTest.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{MultiOpenDemo01.java => MultiOpenDemo01.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{PauseTest.java => PauseTest.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{SeekElapsedTimeTest.java => SeekElapsedTimeTest.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{SimpleDemo01.java => SimpleDemo01.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{SimpleDemo02.java => SimpleDemo02.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{SingleVideoDemo01.java => SingleVideoDemo01.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{VARSDemo01.java => VARSDemo01.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{VARSDemo02.java => VARSDemo02.java.original} (100%) rename vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/{VideoInfoTest.java => VideoInfoTest.java.original} (100%) diff --git a/pom.xml b/pom.xml index fc28b23..1005bd3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.mbari.vcr4j vcr4j - 5.2.0 + 5.3.0 pom vcr4j Java API for communicating with video devices, both real and virtual. @@ -31,17 +31,17 @@ UTF-8 - 2.10 + 2.10.1 17 - 19 - 0.5.3 + 21.0.1 + 0.5.4 2.9.3 2.8.0 4.13.2 - 1.4.5 + 1.4.14 1.0.3 - 3.1.5 - 2.0.6 + 3.1.8 + 2.0.12 @@ -77,8 +77,8 @@ vcr4j-core vcr4j-udp - vcr4j-sharktopoda - vcr4j-sharktopoda-client + + vcr4j-remote vcr4j-javafx vcr4j-rs422 diff --git a/vcr4j-core/pom.xml b/vcr4j-core/pom.xml index f39b653..2bcbb2b 100644 --- a/vcr4j-core/pom.xml +++ b/vcr4j-core/pom.xml @@ -5,7 +5,7 @@ org.mbari.vcr4j vcr4j - 5.2.0 + 5.3.0 vcr4j-core vcr4j-core diff --git a/vcr4j-examples/pom.xml b/vcr4j-examples/pom.xml index dbd331e..6df4e41 100644 --- a/vcr4j-examples/pom.xml +++ b/vcr4j-examples/pom.xml @@ -5,7 +5,7 @@ org.mbari.vcr4j vcr4j - 5.2.0 + 5.3.0 vcr4j-examples vcr4j-examples @@ -18,11 +18,11 @@ vcr4j-udp ${project.version} - - org.mbari.vcr4j - vcr4j-sharktopoda - ${project.version} - + + + + + org.mbari.vcr4j vcr4j-remote diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/remote/MultiOpenDemo1.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/remote/MultiOpenDemo1.java index 15414e3..7a34708 100644 --- a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/remote/MultiOpenDemo1.java +++ b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/remote/MultiOpenDemo1.java @@ -2,8 +2,8 @@ import org.docopt.Docopt; import org.mbari.vcr4j.commands.VideoCommands; -import org.mbari.vcr4j.examples.sharktopoda.MultiOpenDemo01; -import org.mbari.vcr4j.examples.sharktopoda.VideoInfoTest; +//import org.mbari.vcr4j.examples.sharktopoda.MultiOpenDemo01; +//import org.mbari.vcr4j.examples.sharktopoda.VideoInfoTest; import org.mbari.vcr4j.remote.control.RVideoIO; import org.mbari.vcr4j.remote.control.commands.*; import org.slf4j.Logger; @@ -20,9 +20,9 @@ public class MultiOpenDemo1 { public static void main(String[] args) { - Logger log = LoggerFactory.getLogger(VideoInfoTest.class); + Logger log = LoggerFactory.getLogger(MultiOpenDemo1.class); - String prog = MultiOpenDemo01.class.getName(); + String prog = MultiOpenDemo1.class.getName(); String doc = "Usage: " + prog + " ...\n" + "Options:\n" + " -h, --help"; diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FrameAdvanceTest.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FrameAdvanceTest.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FrameAdvanceTest.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FrameAdvanceTest.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FramecaptureTest.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FramecaptureTest.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FramecaptureTest.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/FramecaptureTest.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/MultiOpenDemo01.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/MultiOpenDemo01.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/MultiOpenDemo01.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/MultiOpenDemo01.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/PauseTest.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/PauseTest.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/PauseTest.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/PauseTest.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SeekElapsedTimeTest.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SeekElapsedTimeTest.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SeekElapsedTimeTest.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SeekElapsedTimeTest.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo01.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo01.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo01.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo01.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo02.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo02.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo02.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SimpleDemo02.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SingleVideoDemo01.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SingleVideoDemo01.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SingleVideoDemo01.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/SingleVideoDemo01.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo01.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo01.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo01.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo01.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo02.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo02.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo02.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VARSDemo02.java.original diff --git a/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VideoInfoTest.java b/vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VideoInfoTest.java.original similarity index 100% rename from vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VideoInfoTest.java rename to vcr4j-examples/src/main/java/org/mbari/vcr4j/examples/sharktopoda/VideoInfoTest.java.original diff --git a/vcr4j-javafx/pom.xml b/vcr4j-javafx/pom.xml index 9a6e2b7..6e2655c 100644 --- a/vcr4j-javafx/pom.xml +++ b/vcr4j-javafx/pom.xml @@ -5,7 +5,7 @@ vcr4j org.mbari.vcr4j - 5.2.0 + 5.3.0 4.0.0 diff --git a/vcr4j-jserialcomm/pom.xml b/vcr4j-jserialcomm/pom.xml index bf8075b..6125296 100644 --- a/vcr4j-jserialcomm/pom.xml +++ b/vcr4j-jserialcomm/pom.xml @@ -5,7 +5,7 @@ vcr4j org.mbari.vcr4j - 5.2.0 + 5.3.0 4.0.0 diff --git a/vcr4j-jssc/pom.xml b/vcr4j-jssc/pom.xml index b119751..9ca74cb 100644 --- a/vcr4j-jssc/pom.xml +++ b/vcr4j-jssc/pom.xml @@ -5,7 +5,7 @@ org.mbari.vcr4j vcr4j - 5.2.0 + 5.3.0 vcr4j-jssc vcr4j-jssc diff --git a/vcr4j-purejavacomm/pom.xml b/vcr4j-purejavacomm/pom.xml index 85a8745..89e0ff9 100644 --- a/vcr4j-purejavacomm/pom.xml +++ b/vcr4j-purejavacomm/pom.xml @@ -5,7 +5,7 @@ org.mbari.vcr4j vcr4j - 5.2.0 + 5.3.0 vcr4j-purejavacomm vcr4j-purejavacomm diff --git a/vcr4j-remote/pom.xml b/vcr4j-remote/pom.xml index cf3e4fb..be20418 100644 --- a/vcr4j-remote/pom.xml +++ b/vcr4j-remote/pom.xml @@ -3,7 +3,7 @@ vcr4j org.mbari.vcr4j - 5.2.0 + 5.3.0 4.0.0 diff --git a/vcr4j-rs422/pom.xml b/vcr4j-rs422/pom.xml index 279346f..0c580c0 100644 --- a/vcr4j-rs422/pom.xml +++ b/vcr4j-rs422/pom.xml @@ -5,7 +5,7 @@ org.mbari.vcr4j vcr4j - 5.2.0 + 5.3.0 vcr4j-rs422 vcr4j-rs422 diff --git a/vcr4j-sharktopoda-client/pom.xml b/vcr4j-sharktopoda-client/pom.xml index 2b613db..155875c 100644 --- a/vcr4j-sharktopoda-client/pom.xml +++ b/vcr4j-sharktopoda-client/pom.xml @@ -3,7 +3,7 @@ vcr4j org.mbari.vcr4j - 5.2.0 + 5.3.0 4.0.0 diff --git a/vcr4j-sharktopoda-client/src/main/java/module-info.java b/vcr4j-sharktopoda-client/src/main/java/module-info.java index 320e530..6382e8c 100644 --- a/vcr4j-sharktopoda-client/src/main/java/module-info.java +++ b/vcr4j-sharktopoda-client/src/main/java/module-info.java @@ -5,7 +5,7 @@ module vcr4j.sharktopoda.client { requires io.reactivex.rxjava3; requires com.google.gson; - requires jeromq; +// requires jeromq; requires javafx.base; requires vcr4j.core; requires java.prefs; diff --git a/vcr4j-sharktopoda-client/src/test/java/module-info.java b/vcr4j-sharktopoda-client/src/test/java/module-info.java index 7f49579..22ba0f0 100644 --- a/vcr4j-sharktopoda-client/src/test/java/module-info.java +++ b/vcr4j-sharktopoda-client/src/test/java/module-info.java @@ -6,7 +6,7 @@ requires io.reactivex.rxjava3; requires com.google.gson; requires org.slf4j; - requires jeromq; +// requires jeromq; requires javafx.base; requires vcr4j.core; requires java.prefs; diff --git a/vcr4j-sharktopoda/pom.xml b/vcr4j-sharktopoda/pom.xml index 76184f8..e6b349e 100644 --- a/vcr4j-sharktopoda/pom.xml +++ b/vcr4j-sharktopoda/pom.xml @@ -3,7 +3,7 @@ vcr4j org.mbari.vcr4j - 5.2.0 + 5.3.0 4.0.0 diff --git a/vcr4j-udp/pom.xml b/vcr4j-udp/pom.xml index e5e4ff1..4ccdca4 100644 --- a/vcr4j-udp/pom.xml +++ b/vcr4j-udp/pom.xml @@ -5,7 +5,7 @@ org.mbari.vcr4j vcr4j - 5.2.0 + 5.3.0 vcr4j-udp vcr4j-udp