Merge pull request #742 from henrypinkard/refactor_zmq

Refactor python-java bridge into seperate project
micro-manager · Apr 2, 2024 · bcbc754 · bcbc754
2 parents 6f03251 + 53d4c40
commit bcbc754
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 2,769 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.pycro-manager</groupId>
     <artifactId>PycroManagerJava</artifactId>
-     <version>0.44.9</version>
+     <version>0.45.0</version>
     <packaging>jar</packaging>
     <name>Pycro-Manager Java</name>
     <description>The Java components of Pycro-Manager</description>
@@ -41,11 +41,12 @@
    </licenses>
 
    <dependencies>
-      <dependency>
-         <groupId>org.zeromq</groupId>
-         <artifactId>jeromq</artifactId>
-         <version>0.5.1</version>
+     <dependency>
+        <groupId>org.micro-manager.pyjavaz</groupId>
+        <artifactId>PyJavaZ</artifactId>
+        <version>1.0.0</version>
       </dependency>
+
       <dependency>
          <groupId>org.micro-manager.mmcorej</groupId>
          <artifactId>MMCoreJ</artifactId>

diff --git a/java/src/main/java/org/micromanager/internal/zmq/SerializableObject.java b/java/src/main/java/org/micromanager/internal/zmq/SerializableObject.java
diff --git a/java/src/main/java/org/micromanager/internal/zmq/ZMQClient.java b/java/src/main/java/org/micromanager/internal/zmq/ZMQClient.java
diff --git a/java/src/main/java/org/micromanager/internal/zmq/ZMQPullSocket.java b/java/src/main/java/org/micromanager/internal/zmq/ZMQPullSocket.java
diff --git a/java/src/main/java/org/micromanager/internal/zmq/ZMQPushSocket.java b/java/src/main/java/org/micromanager/internal/zmq/ZMQPushSocket.java