upgrade dependencies

MarginallyClever · Jan 13, 2025 · 7f529a4 · 7f529a4
1 parent 4c953f8
commit 7f529a4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.marginallyclever</groupId>
 	<artifactId>Makelangelo</artifactId>
-	<version>7.62.0</version>
+	<version>7.62.1</version>
 	<name>Makelangelo</name>
 	<description>Makelangelo Software is a Java program that prepares art for CNC plotters.  It is especially designed for the Makelangelo Robot.
 It pairs really well with Marlin-polargraph, the code in the brain of the robot that receives instructions and moves the motors.</description>
@@ -553,14 +553,14 @@ It pairs really well with Marlin-polargraph, the code in the brain of the robot
 		</dependency>
 
 		<dependency>
-			<groupId>org.marginallyclever</groupId>
-			<artifactId>donatello</artifactId>
-			<version>1.2</version>
+			<groupId>com.marginallyclever</groupId>
+			<artifactId>nodegraphcore</artifactId>
+			<version>1.0.23</version>
 		</dependency>
 		<dependency>
 			<groupId>com.marginallyclever</groupId>
-			<artifactId>nodegraphcore</artifactId>
-			<version>1.0.22</version>
+			<artifactId>donatello</artifactId>
+			<version>1.2.2</version>
 		</dependency>
 
 		<!-- dockable windows -->

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -29,17 +29,24 @@
     exports com.marginallyclever.makelangelo.donatelloimpl to com.marginallyclever.nodegraphcore;
     exports com.marginallyclever.makelangelo.donatelloimpl.nodes to com.marginallyclever.nodegraphcore;
     exports com.marginallyclever.makelangelo.donatelloimpl.nodes.shapes to com.marginallyclever.nodegraphcore;
-
     exports com.marginallyclever.convenience.log to ch.qos.logback.core;
 
+    opens com.marginallyclever.convenience;
+    opens com.marginallyclever.makelangelo.turtle;
+    opens com.marginallyclever.makelangelo;
+    opens com.marginallyclever.makelangelo.makeart.io;
+
+    // A Java module that wants to implement a service interface from a service interface module must:
+    // - Require the service interface module in its own module descriptor.
+    // - Implement the service interface with a Java class.
+    // - Declare the service interface implementation in its module descriptor.
+    // In order to use the service, the client module must declare in its module descriptor that it uses the service.
+    // http://tutorials.jenkov.com/java/modules.html
+    uses com.marginallyclever.nodegraphcore.NodeRegistry;
     provides com.marginallyclever.nodegraphcore.NodeRegistry with
             com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry;
 
+    uses com.marginallyclever.nodegraphcore.DAORegistry;
     provides com.marginallyclever.nodegraphcore.DAORegistry with
             com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry;
-
-    opens com.marginallyclever.convenience;
-    opens com.marginallyclever.makelangelo.turtle;
-    opens com.marginallyclever.makelangelo;
-    opens com.marginallyclever.makelangelo.makeart.io;
 }
diff --git a/src/main/resources/META-INF/services/com.marginallyclever.nodegraphcore.DAORegistry b/src/main/resources/META-INF/services/com.marginallyclever.nodegraphcore.DAORegistry
@@ -1 +1 @@
-com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry
+com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry
diff --git a/src/main/resources/META-INF/services/com.marginallyclever.nodegraphcore.NodeRegistry b/src/main/resources/META-INF/services/com.marginallyclever.nodegraphcore.NodeRegistry
@@ -1 +1 @@
-com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry
+com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry
		com.marginallyclever.makelangelo.donatelloimpl.DonatelloRegistry