Skip to content

Commit aeb9f68

Browse files
hinermhinerm
committed
scijava-ops-opencv: clean up dependencies
Remove unused deps, move what we can to runtime/test scope, and add undeclared imglib2 dep.
1 parent 4b32c88 commit aeb9f68

File tree

2 files changed

+21
-55
lines changed

2 files changed

+21
-55
lines changed

‎scijava-ops-opencv/pom.xml‎

Lines changed: 21 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -222,54 +222,7 @@
222222

223223
<dependencies>
224224

225-
<!-- SciJava dependencies -->
226-
<dependency>
227-
<groupId>org.scijava</groupId>
228-
<artifactId>scijava-collections</artifactId>
229-
<version>${project.version}</version>
230-
</dependency>
231-
<dependency>
232-
<groupId>org.scijava</groupId>
233-
<artifactId>scijava-concurrent</artifactId>
234-
<version>${project.version}</version>
235-
</dependency>
236-
<dependency>
237-
<groupId>org.scijava</groupId>
238-
<artifactId>scijava-function</artifactId>
239-
<version>${project.version}</version>
240-
</dependency>
241-
<dependency>
242-
<groupId>org.scijava</groupId>
243-
<artifactId>scijava-meta</artifactId>
244-
<version>${project.version}</version>
245-
</dependency>
246-
<dependency>
247-
<groupId>org.scijava</groupId>
248-
<artifactId>scijava-ops-api</artifactId>
249-
<version>${project.version}</version>
250-
</dependency>
251-
<dependency>
252-
<groupId>org.scijava</groupId>
253-
<artifactId>scijava-ops-spi</artifactId>
254-
<version>${project.version}</version>
255-
</dependency>
256-
<dependency>
257-
<groupId>org.scijava</groupId>
258-
<artifactId>scijava-types</artifactId>
259-
<version>${project.version}</version>
260-
</dependency>
261-
262-
<!-- ImageJ dependencies -->
263-
<dependency>
264-
<groupId>net.imagej</groupId>
265-
<artifactId>imagej-opencv</artifactId>
266-
</dependency>
267-
268225
<!-- OpenCV dependencies -->
269-
<dependency>
270-
<groupId>org.bytedeco</groupId>
271-
<artifactId>openblas</artifactId>
272-
</dependency>
273226
<dependency>
274227
<groupId>org.bytedeco</groupId>
275228
<artifactId>opencv</artifactId>
@@ -280,6 +233,11 @@
280233
</dependency>
281234

282235
<!-- OpenCV runtime native dependencies -->
236+
<dependency>
237+
<groupId>org.bytedeco</groupId>
238+
<artifactId>openblas</artifactId>
239+
<scope>runtime</scope>
240+
</dependency>
283241
<dependency>
284242
<groupId>org.bytedeco</groupId>
285243
<artifactId>openblas</artifactId>
@@ -294,6 +252,16 @@
294252
</dependency>
295253

296254
<!-- Test scope dependencies -->
255+
<dependency>
256+
<groupId>net.imagej</groupId>
257+
<artifactId>imagej-opencv</artifactId>
258+
<scope>test</scope>
259+
</dependency>
260+
<dependency>
261+
<groupId>net.imglib2</groupId>
262+
<artifactId>imglib2</artifactId>
263+
<scope>test</scope>
264+
</dependency>
297265
<dependency>
298266
<groupId>org.junit.jupiter</groupId>
299267
<artifactId>junit-jupiter-api</artifactId>
@@ -304,6 +272,12 @@
304272
<artifactId>junit-jupiter-engine</artifactId>
305273
<scope>test</scope>
306274
</dependency>
275+
<dependency>
276+
<groupId>org.scijava</groupId>
277+
<artifactId>scijava-ops-api</artifactId>
278+
<version>${project.version}</version>
279+
<scope>test</scope>
280+
</dependency>
307281
<dependency>
308282
<groupId>org.scijava</groupId>
309283
<artifactId>scijava-ops-engine</artifactId>

‎scijava-ops-opencv/src/main/java/module-info.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@
3030
exports org.scijava.ops.opencv;
3131

3232
requires java.scripting;
33-
requires org.scijava.collections;
34-
requires org.scijava.concurrent;
35-
requires org.scijava.function;
36-
requires org.scijava.meta;
37-
requires org.scijava.ops.api;
38-
requires org.scijava.ops.spi;
39-
requires org.scijava.priority;
40-
requires org.scijava.types;
4133

4234
// FIXME: these module names derive from filenames and are thus unstable
4335
requires org.bytedeco.opencv;

0 commit comments

Comments
 (0)