removing sharktopoda stuff

mbari-org · May 30, 2024 · 10cfc8f · 10cfc8f
1 parent 479f4ba
commit 10cfc8f
Show file tree

Hide file tree

Showing 26 changed files with 31 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
     <packaging>pom</packaging>
     <name>vcr4j</name>
     <description>Java API for communicating with video devices, both real and virtual.</description>
@@ -31,17 +31,17 @@
     </scm>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <gson.version>2.10</gson.version>
+        <gson.version>2.10.1</gson.version>
         <java.version>17</java.version>
-        <javafx.version>19</javafx.version>
-        <jeromq.version>0.5.3</jeromq.version>
+        <javafx.version>21.0.1</javafx.version>
+        <jeromq.version>0.5.4</jeromq.version>
         <jserialcomm.version>2.9.3</jserialcomm.version>
         <jssc.version>2.8.0</jssc.version>
         <junit.version>4.13.2</junit.version>
-        <logback.version>1.4.5</logback.version>
+        <logback.version>1.4.14</logback.version>
         <purejavacomm.version>1.0.3</purejavacomm.version>
-        <rx.version>3.1.5</rx.version>
-        <slf4j.version>2.0.6</slf4j.version>
+        <rx.version>3.1.8</rx.version>
+        <slf4j.version>2.0.12</slf4j.version>
     </properties>
     <dependencies>
         <dependency>
@@ -77,8 +77,8 @@
     <modules>
         <module>vcr4j-core</module>
         <module>vcr4j-udp</module>
-        <module>vcr4j-sharktopoda</module>
-        <module>vcr4j-sharktopoda-client</module>
+<!--        <module>vcr4j-sharktopoda</module>-->
+<!--        <module>vcr4j-sharktopoda-client</module>-->
         <module>vcr4j-remote</module>
         <module>vcr4j-javafx</module>
         <module>vcr4j-rs422</module>

diff --git a/vcr4j-core/pom.xml b/vcr4j-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
   </parent>
   <artifactId>vcr4j-core</artifactId>
   <name>vcr4j-core</name>

diff --git a/vcr4j-examples/pom.xml b/vcr4j-examples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.mbari.vcr4j</groupId>
         <artifactId>vcr4j</artifactId>
-        <version>5.2.0</version>
+        <version>5.3.0</version>
     </parent>
     <artifactId>vcr4j-examples</artifactId>
     <name>vcr4j-examples</name>
@@ -18,11 +18,11 @@
             <artifactId>vcr4j-udp</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.mbari.vcr4j</groupId>
-            <artifactId>vcr4j-sharktopoda</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.mbari.vcr4j</groupId>-->
+<!--            <artifactId>vcr4j-sharktopoda</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.mbari.vcr4j</groupId>
             <artifactId>vcr4j-remote</artifactId>

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
@@ -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 + " <port> <url>...\n" +
                 "Options:\n" +
                 "  -h, --help";

diff --git a/...xamples/sharktopoda/FrameAdvanceTest.java → ...harktopoda/FrameAdvanceTest.java.original b/...xamples/sharktopoda/FrameAdvanceTest.java → ...harktopoda/FrameAdvanceTest.java.original
diff --git a/...xamples/sharktopoda/FramecaptureTest.java → ...harktopoda/FramecaptureTest.java.original b/...xamples/sharktopoda/FramecaptureTest.java → ...harktopoda/FramecaptureTest.java.original
diff --git a/...examples/sharktopoda/MultiOpenDemo01.java → ...sharktopoda/MultiOpenDemo01.java.original b/...examples/sharktopoda/MultiOpenDemo01.java → ...sharktopoda/MultiOpenDemo01.java.original
diff --git a/...vcr4j/examples/sharktopoda/PauseTest.java → ...mples/sharktopoda/PauseTest.java.original b/...vcr4j/examples/sharktopoda/PauseTest.java → ...mples/sharktopoda/PauseTest.java.original
diff --git a/...ples/sharktopoda/SeekElapsedTimeTest.java → ...ktopoda/SeekElapsedTimeTest.java.original b/...ples/sharktopoda/SeekElapsedTimeTest.java → ...ktopoda/SeekElapsedTimeTest.java.original
diff --git a/...4j/examples/sharktopoda/SimpleDemo01.java → ...es/sharktopoda/SimpleDemo01.java.original b/...4j/examples/sharktopoda/SimpleDemo01.java → ...es/sharktopoda/SimpleDemo01.java.original
diff --git a/...4j/examples/sharktopoda/SimpleDemo02.java → ...es/sharktopoda/SimpleDemo02.java.original b/...4j/examples/sharktopoda/SimpleDemo02.java → ...es/sharktopoda/SimpleDemo02.java.original
diff --git a/...amples/sharktopoda/SingleVideoDemo01.java → ...arktopoda/SingleVideoDemo01.java.original b/...amples/sharktopoda/SingleVideoDemo01.java → ...arktopoda/SingleVideoDemo01.java.original
diff --git a/...cr4j/examples/sharktopoda/VARSDemo01.java → ...ples/sharktopoda/VARSDemo01.java.original b/...cr4j/examples/sharktopoda/VARSDemo01.java → ...ples/sharktopoda/VARSDemo01.java.original
diff --git a/...cr4j/examples/sharktopoda/VARSDemo02.java → ...ples/sharktopoda/VARSDemo02.java.original b/...cr4j/examples/sharktopoda/VARSDemo02.java → ...ples/sharktopoda/VARSDemo02.java.original
diff --git a/...j/examples/sharktopoda/VideoInfoTest.java → ...s/sharktopoda/VideoInfoTest.java.original b/...j/examples/sharktopoda/VideoInfoTest.java → ...s/sharktopoda/VideoInfoTest.java.original
diff --git a/vcr4j-javafx/pom.xml b/vcr4j-javafx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>vcr4j</artifactId>
         <groupId>org.mbari.vcr4j</groupId>
-        <version>5.2.0</version>
+        <version>5.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/vcr4j-jserialcomm/pom.xml b/vcr4j-jserialcomm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>vcr4j</artifactId>
         <groupId>org.mbari.vcr4j</groupId>
-        <version>5.2.0</version>
+        <version>5.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/vcr4j-jssc/pom.xml b/vcr4j-jssc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
   </parent>
   <artifactId>vcr4j-jssc</artifactId>
   <name>vcr4j-jssc</name>

diff --git a/vcr4j-purejavacomm/pom.xml b/vcr4j-purejavacomm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.mbari.vcr4j</groupId>
         <artifactId>vcr4j</artifactId>
-        <version>5.2.0</version>
+        <version>5.3.0</version>
     </parent>
     <artifactId>vcr4j-purejavacomm</artifactId>
     <name>vcr4j-purejavacomm</name>

diff --git a/vcr4j-remote/pom.xml b/vcr4j-remote/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vcr4j</artifactId>
     <groupId>org.mbari.vcr4j</groupId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/vcr4j-rs422/pom.xml b/vcr4j-rs422/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
   </parent>
   <artifactId>vcr4j-rs422</artifactId>
   <name>vcr4j-rs422</name>

diff --git a/vcr4j-sharktopoda-client/pom.xml b/vcr4j-sharktopoda-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vcr4j</artifactId>
     <groupId>org.mbari.vcr4j</groupId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git 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
@@ -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
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>vcr4j</artifactId>
         <groupId>org.mbari.vcr4j</groupId>
-        <version>5.2.0</version>
+        <version>5.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/vcr4j-udp/pom.xml b/vcr4j-udp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
   </parent>
   <artifactId>vcr4j-udp</artifactId>
   <name>vcr4j-udp</name>