Skip to content

Commit f6df62f

Browse files
gselzerctrueden
authored andcommitted
scijava-ops: depend on scijava-struct
This commit removes the org.scijava.struct package, since it was moved to its own module. scijava-ops now depends on scijava-struct
1 parent 94f6c96 commit f6df62f

File tree

12 files changed

+7
-371
lines changed

12 files changed

+7
-371
lines changed

β€Žscijava/scijava-ops/pom.xmlβ€Ž

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@
121121
<groupId>org.scijava</groupId>
122122
<artifactId>scijava-common</artifactId>
123123
</dependency>
124+
<dependency>
125+
<groupId>org.scijava</groupId>
126+
<artifactId>scijava-struct</artifactId>
127+
<version>${project.version}</version>
128+
</dependency>
124129
<dependency>
125130
<groupId>org.scijava</groupId>
126131
<artifactId>scijava-types</artifactId>

β€Žscijava/scijava-ops/src/main/java/module-info.javaβ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
exports org.scijava.ops.provenance;
1717
// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
1818
exports org.scijava.ops.util; // contains OpWrapper interface
19-
exports org.scijava.struct;
2019
exports org.scijava.param;
2120

2221
opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
@@ -35,7 +34,6 @@
3534
opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
3635
opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
3736
opens org.scijava.ops.util to therapi.runtime.javadoc;
38-
opens org.scijava.struct to therapi.runtime.javadoc;
3937
opens org.scijava.ops.matcher to therapi.runtime.javadoc;
4038
opens org.scijava.ops.simplify to therapi.runtime.javadoc;
4139
opens org.scijava.ops.stats to therapi.runtime.javadoc;
@@ -50,6 +48,7 @@
5048

5149
requires org.scijava;
5250
requires org.scijava.function;
51+
requires org.scijava.struct;
5352
requires org.scijava.types;
5453
requires javassist;
5554
requires java.compiler;

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/DefaultStructInstance.javaβ€Ž

Lines changed: 0 additions & 43 deletions
This file was deleted.

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/ItemIO.javaβ€Ž

Lines changed: 0 additions & 80 deletions
This file was deleted.

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/Member.javaβ€Ž

Lines changed: 0 additions & 66 deletions
This file was deleted.

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/MemberInstance.javaβ€Ž

Lines changed: 0 additions & 39 deletions
This file was deleted.

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/Struct.javaβ€Ž

Lines changed: 0 additions & 24 deletions
This file was deleted.

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/StructInstance.javaβ€Ž

Lines changed: 0 additions & 32 deletions
This file was deleted.

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/Structs.javaβ€Ž

Lines changed: 0 additions & 23 deletions
This file was deleted.

β€Žscijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessible.javaβ€Ž

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
Β (0)