Skip to content

Commit 9ea40aa

Browse files
ctruedenctrueden
committed
Clean up dependencies
1 parent 7fb9298 commit 9ea40aa

File tree

25 files changed

+140
-180
lines changed

25 files changed

+140
-180
lines changed

‎scijava-collections/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,6 @@
8787
</properties>
8888

8989
<dependencies>
90-
<!-- SciJava dependencies -->
91-
<dependency>
92-
<groupId>org.scijava</groupId>
93-
<artifactId>scijava-common3</artifactId>
94-
<version>${project.version}</version>
95-
</dependency>
96-
9790
<!-- Test scope dependencies -->
9891
<dependency>
9992
<groupId>org.junit.jupiter</groupId>

‎scijava-discovery-test/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,23 @@
104104
</properties>
105105

106106
<dependencies>
107-
<dependency>
108-
<groupId>org.scijava</groupId>
109-
<artifactId>scijava-discovery</artifactId>
110-
<version>${project.version}</version>
111-
</dependency>
107+
<!-- SciJava dependencies -->
112108
<dependency>
113109
<groupId>org.scijava</groupId>
114110
<artifactId>scijava-ops-spi</artifactId>
115111
<version>${project.version}</version>
116112
</dependency>
117113

118-
<!-- Test Scope Dependencies -->
114+
<!-- Test scope dependencies -->
119115
<dependency>
120116
<groupId>org.junit.jupiter</groupId>
121117
<artifactId>junit-jupiter-api</artifactId>
122118
<scope>test</scope>
123119
</dependency>
120+
<dependency>
121+
<groupId>org.scijava</groupId>
122+
<artifactId>scijava-discovery</artifactId>
123+
<version>${project.version}</version>
124+
</dependency>
124125
</dependencies>
125126
</project>

‎scijava-function/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,4 @@
9090
<license.licenseName>bsd_2</license.licenseName>
9191
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
9292
</properties>
93-
94-
<dependencies>
95-
</dependencies>
9693
</project>

‎scijava-ops-api/pom.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,16 @@
105105

106106
<dependencies>
107107
<!-- SciJava dependencies -->
108+
<dependency>
109+
<groupId>org.scijava</groupId>
110+
<artifactId>scijava-common3</artifactId>
111+
<version>${project.version}</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.scijava</groupId>
115+
<artifactId>scijava-discovery</artifactId>
116+
<version>${project.version}</version>
117+
</dependency>
108118
<dependency>
109119
<groupId>org.scijava</groupId>
110120
<artifactId>scijava-function</artifactId>
@@ -125,7 +135,5 @@
125135
<artifactId>scijava-types</artifactId>
126136
<version>${project.version}</version>
127137
</dependency>
128-
129-
<!-- Test scope dependencies -->
130138
</dependencies>
131139
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
requires org.scijava.common3;
3434
requires org.scijava.function;
35-
requires org.scijava.priority;
35+
requires transitive org.scijava.priority;
3636
requires transitive org.scijava.struct;
3737
requires org.scijava.types;
3838

‎scijava-ops-benchmarks/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
</build>
134134

135135
<dependencies>
136-
<dependency>
137-
<groupId>net.imagej</groupId>
138-
<artifactId>imagej-ops</artifactId>
139-
</dependency>
140-
141136
<!-- SciJava dependencies -->
142137
<dependency>
143138
<groupId>org.scijava</groupId>
@@ -167,12 +162,18 @@
167162
<scope>runtime</scope>
168163
</dependency>
169164

165+
<!-- Legacy ImageJ2 dependencies -->
166+
<dependency>
167+
<groupId>net.imagej</groupId>
168+
<artifactId>imagej-ops</artifactId>
169+
</dependency>
170+
170171
<!-- JMH dependencies -->
171172
<dependency>
172173
<groupId>org.openjdk.jmh</groupId>
173174
<artifactId>jmh-core</artifactId>
174175
<version>${jmh.version}</version>
175-
<!--NB: Must override inherited test scope-->
176+
<!-- NB: Override inherited test scope. -->
176177
<scope>compile</scope>
177178
</dependency>
178179
<dependency>

‎scijava-ops-engine/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@
105105

106106
<dependencies>
107107
<!-- SciJava dependencies -->
108+
<dependency>
109+
<groupId>org.scijava</groupId>
110+
<artifactId>parsington</artifactId>
111+
</dependency>
108112
<dependency>
109113
<groupId>org.scijava</groupId>
110114
<artifactId>scijava-collections</artifactId>
@@ -136,8 +140,9 @@
136140
<version>${project.version}</version>
137141
</dependency>
138142
<dependency>
139-
<groupId>org.scijava</groupId>
140-
<artifactId>parsington</artifactId>
143+
<groupId> org.scijava</groupId>
144+
<artifactId>scijava-function</artifactId>
145+
<version>${project.version}</version>
141146
</dependency>
142147
<dependency>
143148
<groupId>org.scijava</groupId>
@@ -159,11 +164,7 @@
159164
<artifactId>scijava-types</artifactId>
160165
<version>${project.version}</version>
161166
</dependency>
162-
<dependency>
163-
<groupId> org.scijava</groupId>
164-
<artifactId>scijava-function</artifactId>
165-
<version>${project.version}</version>
166-
</dependency>
167+
167168
<!-- Third-party dependencies -->
168169
<dependency>
169170
<groupId>com.google.guava</groupId>

‎scijava-ops-engine/src/it/test-ops-api/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
<dependency>
139139
<groupId>org.junit.jupiter</groupId>
140140
<artifactId>junit-jupiter-api</artifactId>
141+
<!-- NB: Override inherited test scope. -->
141142
<scope>compile</scope>
142143
</dependency>
143144
</dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
requires org.scijava.priority;
4545
requires org.scijava.progress;
4646
requires org.scijava.struct;
47-
requires transitive org.scijava.ops.api;
47+
requires org.scijava.ops.api;
4848
requires org.scijava.ops.spi;
4949
requires org.scijava.types;
5050

‎scijava-ops-ext-parser/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
</properties>
101101

102102
<dependencies>
103-
104103
<!-- Third party dependencies -->
105104
<dependency>
106105
<groupId>org.yaml</groupId>

0 commit comments

Comments
 (0)