open modules to gson

mbari-org · Apr 5, 2021 · 41d5c51 · 41d5c51
1 parent a0268ae
commit 41d5c51
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,20 +3,20 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j</artifactId>
-    <version>4.4.0.jre11</version>
+    <version>4.4.1.jre11</version>
     <packaging>pom</packaging>
     <name>vcr4j</name>
     <url>https://github.com/hohonuuli/vcr4j</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <gson.version>2.8.6</gson.version>
         <java.version>11</java.version>
-        <javafx.version>14</javafx.version>
+        <javafx.version>16</javafx.version>
         <jeromq.version>0.5.2</jeromq.version>
-        <junit.version>4.13</junit.version>
+        <junit.version>4.13.2</junit.version>
         <logback.version>1.3.0-alpha4</logback.version>
         <mbarix4j.version>2.0.5.jre11</mbarix4j.version>
-        <rx.version>2.2.18</rx.version>
+        <rx.version>2.2.21</rx.version>
         <slf4j.version>2.0.0-alpha1</slf4j.version>
     </properties>
     <dependencies>
@@ -166,19 +166,19 @@
         </repository>
     </distributionManagement>
     <repositories>
-        <repository>
+        <!-- <repository>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
             <id>bintray-hohonuuli-maven</id>
             <name>bintray</name>
             <url>http://dl.bintray.com/org-mbari/maven</url>
-        </repository>
+        </repository> -->
         <repository>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-            <id>githumb-hohonuuli-maven</id>
+            <id>github</id>
             <name>github</name>
             <url>https://maven.pkg.github.com/mbari-org/maven</url>
         </repository>

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>4.4.0.jre11</version>
+    <version>4.4.1.jre11</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>4.4.0.jre11</version>
+        <version>4.4.1.jre11</version>
     </parent>
     <artifactId>vcr4j-examples</artifactId>
     <name>vcr4j-examples</name>

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>4.4.0.jre11</version>
+        <version>4.4.1.jre11</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>4.4.0.jre11</version>
+        <version>4.4.1.jre11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.fazecast</groupId>
             <artifactId>jSerialComm</artifactId>
-            <version>2.6.0</version>
+            <version>2.6.2</version>
         </dependency>
         <!--<dependency>-->
             <!--<groupId>com.fazecast</groupId>-->

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>4.4.0.jre11</version>
+    <version>4.4.1.jre11</version>
   </parent>
   <artifactId>vcr4j-jssc</artifactId>
   <name>vcr4j-jssc</name>

diff --git a/vcr4j-kipro/pom.xml b/vcr4j-kipro/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.mbari.vcr4j</groupId>
         <artifactId>vcr4j</artifactId>
-        <version>4.4.0.jre11</version>
+        <version>4.4.1.jre11</version>
     </parent>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j-kipro</artifactId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.12</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20190722</version>
+            <version>20210307</version>
         </dependency>
     </dependencies>
 </project>
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>4.4.0.jre11</version>
+        <version>4.4.1.jre11</version>
     </parent>
     <artifactId>vcr4j-purejavacomm</artifactId>
     <name>vcr4j-purejavacomm</name>

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>4.4.0.jre11</version>
+    <version>4.4.1.jre11</version>
   </parent>
   <artifactId>vcr4j-rs422</artifactId>
   <name>vcr4j-rs422</name>

diff --git a/vcr4j-rxtx/pom.xml b/vcr4j-rxtx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.mbari.vcr4j</groupId>
         <artifactId>vcr4j</artifactId>
-        <version>4.4.0.jre11</version>
+        <version>4.4.1.jre11</version>
     </parent>
     <artifactId>vcr4j-rxtx</artifactId>
     <name>vcr4j-rxtx</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>4.4.0.jre11</version>
+    <version>4.4.1.jre11</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
@@ -10,6 +10,10 @@
     requires javafx.base;
     requires vcr4j.core;
     requires java.prefs;
+
+    opens org.mbari.vcr4j.sharktopoda.client.localization to com.google.gson;
+    opens org.mbari.vcr4j.sharktopoda.client.model to com.google.gson;
+
     exports org.mbari.vcr4j.sharktopoda.client;
     exports org.mbari.vcr4j.sharktopoda.client.localization;
     exports org.mbari.vcr4j.sharktopoda.client.decorators;

diff --git a/vcr4j-sharktopoda/pom.xml b/vcr4j-sharktopoda/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>vcr4j</artifactId>
         <groupId>org.mbari.vcr4j</groupId>
-        <version>4.4.0.jre11</version>
+        <version>4.4.1.jre11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/vcr4j-sharktopoda/src/main/java/module-info.java b/vcr4j-sharktopoda/src/main/java/module-info.java
@@ -3,14 +3,21 @@
  * @since 2020-03-12T11:22:00
  */
 module vcr4j.sharktopoda {
+    requires com.google.gson;
+    requires io.reactivex.rxjava2;
+    requires org.slf4j;
+    requires vcr4j.core;
+
+    opens org.mbari.vcr4j.sharktopoda.commands to com.google.gson;
+    opens org.mbari.vcr4j.sharktopoda.model to com.google.gson;
+    opens org.mbari.vcr4j.sharktopoda.model.request to com.google.gson;
+    opens org.mbari.vcr4j.sharktopoda.model.response to com.google.gson;
+
     exports org.mbari.vcr4j.sharktopoda.commands;
     exports org.mbari.vcr4j.sharktopoda.model.request;
     exports org.mbari.vcr4j.sharktopoda.model.response;
     exports org.mbari.vcr4j.sharktopoda.decorators;
     exports org.mbari.vcr4j.sharktopoda.model;
     exports org.mbari.vcr4j.sharktopoda;
-    requires com.google.gson;
-    requires io.reactivex.rxjava2;
-    requires org.slf4j;
-    requires vcr4j.core;
+
 }
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>4.4.0.jre11</version>
+    <version>4.4.1.jre11</version>
   </parent>
   <artifactId>vcr4j-udp</artifactId>
   <name>vcr4j-udp</name>

diff --git a/vcr4j-ui/pom.xml b/vcr4j-ui/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>vcr4j</artifactId>
         <groupId>org.mbari.vcr4j</groupId>
-        <version>4.4.0.jre11</version>
+        <version>4.4.1.jre11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/vcr4j-v2-adapter/pom.xml b/vcr4j-v2-adapter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.mbari.vcr4j</groupId>
     <artifactId>vcr4j</artifactId>
-    <version>4.4.0.jre11</version>
+    <version>4.4.1.jre11</version>
   </parent>
   <artifactId>vcr4j-v2-adapter</artifactId>
   <name>vcr4j-v2-adapter</name>

diff --git a/vcr4j-vlc-http/pom.xml b/vcr4j-vlc-http/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>vcr4j</artifactId>
     <groupId>org.mbari.vcr4j</groupId>
-    <version>4.4.0.jre11</version>
+    <version>4.4.1.jre11</version>
   </parent>
   <artifactId>vcr4j-vlc-http</artifactId>
   <name>vcr4j-vlc-http</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.2.2</version>
+      <version>4.9.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>