Make scijava-types guava dependency non-transitive

ctrueden · ctrueden · commit ed2356d5aa1f · 2024-05-30T18:33:44.000-05:00
AFAIK, scijava-types does not leak any Guava types in its API.
diff --git a/scijava-ops-engine/src/main/java/module-info.java b/scijava-ops-engine/src/main/java/module-info.java
@@ -48,6 +48,7 @@
 	requires org.scijava.ops.spi;
 	requires org.scijava.types;
 
+	requires com.google.common;
 	requires org.javassist;
 	requires org.slf4j;
 	requires org.yaml.snakeyaml;
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -95,8 +95,7 @@ public class DefaultOpEnvironment implements OpEnvironment {
 	 * search size for any Op request to the number of known Ops with the name
 	 * given in the request.
 	 */
-	private final TreeMultimap<String, OpInfo> opDirectory = TreeMultimap
-		.create();
+	private final TreeMultimap<String, OpInfo> opDirectory = TreeMultimap.create();
 
 	/**
 	 * Data structure storing all known Ops, discoverable using their id.
diff --git a/scijava-ops-ext-parser/src/main/java/module-info.java b/scijava-ops-ext-parser/src/main/java/module-info.java
@@ -29,6 +29,6 @@
 
 module org.scijava.ops.parser {
 	requires java.compiler;
-	requires org.yaml.snakeyaml;
 	requires com.google.common;
+	requires org.yaml.snakeyaml;
 }
diff --git a/scijava-ops-opencv/pom.xml b/scijava-ops-opencv/pom.xml
@@ -183,7 +183,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<argLine>--add-reads org.scijava.ops.opencv=org.scijava.ops.api</argLine>
+					<argLine>--add-reads org.scijava.ops.opencv=org.scijava.ops.api,net.imglib2</argLine>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/scijava-types/src/main/java/module-info.java b/scijava-types/src/main/java/module-info.java
@@ -36,11 +36,11 @@
 	opens org.scijava.types.extract;
 	exports org.scijava.types.extract;
 
-	requires transitive com.google.common;
 	requires transitive org.scijava.common3;
 	requires transitive org.scijava.discovery;
 	requires org.scijava.priority;
 
+	requires com.google.common;
 	requires org.slf4j;
 
 	uses org.scijava.types.extract.TypeExtractor;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@`
`29`	`29`
`30`	`30`	`module org.scijava.ops.parser {`
`31`	`31`	`requires java.compiler;`
`32`		`- requires org.yaml.snakeyaml;`
`33`	`32`	`requires com.google.common;`
	`33`	`+ requires org.yaml.snakeyaml;`
`34`	`34`	`}`