Skip to content

Commit 06074da

Browse files
gselzergselzer
committed
Bump scijava-ops-image version
This required changes to avoid using ${project.version} all over the place. Many of these version declarations, while not necessary right now, will result in fewer changes down the line
1 parent 603226c commit 06074da

10 files changed

Lines changed: 170 additions & 111 deletions

File tree

‎scijava-discovery-test/pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,18 @@
103103
-->
104104
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
105105
<scijava.jvm.version>11</scijava.jvm.version>
106+
107+
<!-- TEMP: Can be removed once present in pom-scijava -->
108+
<scijava-discovery.version>1.0.1-SNAPSHOT</scijava-discovery.version>
109+
<scijava-ops-spi.version>1.0.1-SNAPSHOT</scijava-ops-spi.version>
106110
</properties>
107111

108112
<dependencies>
109113
<!-- SciJava dependencies -->
110114
<dependency>
111115
<groupId>org.scijava</groupId>
112116
<artifactId>scijava-ops-spi</artifactId>
113-
<version>${project.version}</version>
117+
<version>${scijava-ops-spi.version}</version>
114118
</dependency>
115119

116120
<!-- Test scope dependencies -->
@@ -122,7 +126,7 @@
122126
<dependency>
123127
<groupId>org.scijava</groupId>
124128
<artifactId>scijava-discovery</artifactId>
125-
<version>${project.version}</version>
129+
<version>${scijava-discovery.version}</version>
126130
</dependency>
127131
</dependencies>
128132

‎scijava-legacy/pom.xml‎

Lines changed: 17 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -98,34 +98,44 @@
9898
-->
9999
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
100100
<scijava.jvm.version>11</scijava.jvm.version>
101+
102+
<!-- TEMP: Can be removed once present in pom-scijava -->
103+
<scijava-common3.version>1.0.1-SNAPSHOT</scijava-common3.version>
104+
<scijava-discovery.version>1.0.1-SNAPSHOT</scijava-discovery.version>
105+
<scijava-ops-api.version>1.0.1-SNAPSHOT</scijava-ops-api.version>
106+
<scijava-ops-engine.version>1.0.1-SNAPSHOT</scijava-ops-engine.version>
107+
<scijava-ops-spi.version>1.0.1-SNAPSHOT</scijava-ops-spi.version>
108+
<scijava-priority.version>1.0.1-SNAPSHOT</scijava-priority.version>
109+
<scijava-progress.version>1.0.1-SNAPSHOT</scijava-progress.version>
110+
<scijava-types.version>1.0.1-SNAPSHOT</scijava-types.version>
101111
</properties>
102112

103113
<dependencies>
104114
<!-- SciJava dependencies -->
105115
<dependency>
106116
<groupId>org.scijava</groupId>
107117
<artifactId>scijava-discovery</artifactId>
108-
<version>${project.version}</version>
118+
<version>${scijava-discovery.version}</version>
109119
</dependency>
110120
<dependency>
111121
<groupId>org.scijava</groupId>
112122
<artifactId>scijava-ops-api</artifactId>
113-
<version>${project.version}</version>
123+
<version>${scijava-ops-api.version}</version>
114124
</dependency>
115125
<dependency>
116126
<groupId>org.scijava</groupId>
117127
<artifactId>scijava-priority</artifactId>
118-
<version>${project.version}</version>
128+
<version>${scijava-priority.version}</version>
119129
</dependency>
120130
<dependency>
121131
<groupId>org.scijava</groupId>
122132
<artifactId>scijava-progress</artifactId>
123-
<version>${project.version}</version>
133+
<version>${scijava-progress.version}</version>
124134
</dependency>
125135
<dependency>
126136
<groupId>org.scijava</groupId>
127137
<artifactId>scijava-types</artifactId>
128-
<version>${project.version}</version>
138+
<version>${scijava-types.version}</version>
129139
</dependency>
130140

131141
<!-- ImgLib2 dependencies -->
@@ -153,7 +163,7 @@
153163
<dependency>
154164
<groupId>org.scijava</groupId>
155165
<artifactId>scijava-common3</artifactId>
156-
<version>${project.version}</version>
166+
<version>${scijava-common3.version}</version>
157167
<!--
158168
NB: Scope is compile because it is a transitive compile-time dependency,
159169
and overriding it to test scope here would cause the main build to fail
@@ -163,7 +173,7 @@
163173
<dependency>
164174
<groupId>org.scijava</groupId>
165175
<artifactId>scijava-ops-engine</artifactId>
166-
<version>${project.version}</version>
176+
<version>${scijava-ops-engine.version}</version>
167177
<scope>test</scope>
168178
</dependency>
169179
</dependencies>
@@ -181,49 +191,12 @@
181191
<artifactId>maven-compiler-plugin</artifactId>
182192
<configuration>
183193
<annotationProcessorPaths>
184-
<path>
185-
<groupId>org.scijava</groupId>
186-
<artifactId>scijava-ops-indexer</artifactId>
187-
<version>${project.version}</version>
188-
</path>
189194
<path>
190195
<groupId>org.scijava</groupId>
191196
<artifactId>scijava-common</artifactId>
192197
<version>${scijava-common.version}</version>
193198
</path>
194199
</annotationProcessorPaths>
195-
<fork>true</fork>
196-
<compilerArgs>
197-
<arg>-Ascijava.ops.parse="${scijava.ops.parse}"</arg>
198-
<arg>-Ascijava.ops.opVersion="${project.version}"</arg>
199-
</compilerArgs>
200-
</configuration>
201-
</plugin>
202-
<plugin>
203-
<artifactId>maven-javadoc-plugin</artifactId>
204-
<configuration>
205-
<links>
206-
<link>https://javadoc.scijava.org/Java11/</link>
207-
<link>https://javadoc.scijava.org/ImageJ2/</link>
208-
<link>https://javadoc.scijava.org/ImgLib2/</link>
209-
<link>https://javadoc.scijava.org/SciJava/</link>
210-
<link>https://javadoc.scijava.org/Guava/</link>
211-
<link>https://javadoc.scijava.org/JAMA/</link>
212-
</links>
213-
<tagletArtifacts>
214-
<tagletArtifact>
215-
<groupId>org.scijava</groupId>
216-
<artifactId>scijava-taglets</artifactId>
217-
<version>${project.version}</version>
218-
</tagletArtifact>
219-
</tagletArtifacts>
220-
<tags>
221-
<tag>
222-
<name>implNote</name>
223-
<placement>a</placement>
224-
<head>Implementation Note:</head>
225-
</tag>
226-
</tags>
227200
</configuration>
228201
</plugin>
229202
<plugin>

‎scijava-ops-api/pom.xml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,39 +108,48 @@
108108
-->
109109
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
110110
<scijava.jvm.version>11</scijava.jvm.version>
111+
112+
<!-- TEMP: Can be removed once present in pom-scijava -->
113+
<scijava-common3.version>1.0.1-SNAPSHOT</scijava-common3.version>
114+
<scijava-discovery.version>1.0.1-SNAPSHOT</scijava-discovery.version>
115+
<scijava-function.version>1.0.1-SNAPSHOT</scijava-function.version>
116+
<scijava-priority.version>1.0.1-SNAPSHOT</scijava-priority.version>
117+
<scijava-struct.version>1.0.1-SNAPSHOT</scijava-struct.version>
118+
<scijava-types.version>1.0.1-SNAPSHOT</scijava-types.version>
119+
111120
</properties>
112121

113122
<dependencies>
114123
<!-- SciJava dependencies -->
115124
<dependency>
116125
<groupId>org.scijava</groupId>
117126
<artifactId>scijava-common3</artifactId>
118-
<version>${project.version}</version>
127+
<version>${scijava-common3.version}</version>
119128
</dependency>
120129
<dependency>
121130
<groupId>org.scijava</groupId>
122131
<artifactId>scijava-discovery</artifactId>
123-
<version>${project.version}</version>
132+
<version>${scijava-discovery.version}</version>
124133
</dependency>
125134
<dependency>
126135
<groupId>org.scijava</groupId>
127136
<artifactId>scijava-function</artifactId>
128-
<version>${project.version}</version>
137+
<version>${scijava-function.version}</version>
129138
</dependency>
130139
<dependency>
131140
<groupId>org.scijava</groupId>
132141
<artifactId>scijava-priority</artifactId>
133-
<version>${project.version}</version>
142+
<version>${scijava-priority.version}</version>
134143
</dependency>
135144
<dependency>
136145
<groupId>org.scijava</groupId>
137146
<artifactId>scijava-struct</artifactId>
138-
<version>${project.version}</version>
147+
<version>${scijava-struct.version}</version>
139148
</dependency>
140149
<dependency>
141150
<groupId>org.scijava</groupId>
142151
<artifactId>scijava-types</artifactId>
143-
<version>${project.version}</version>
152+
<version>${scijava-types.version}</version>
144153
</dependency>
145154
</dependencies>
146155

‎scijava-ops-engine/pom.xml‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,22 @@
130130
org.scijava.ops.engine" to unnamed module @402e37bc
131131
-->
132132
<scijava.surefire.args>--add-exports org.scijava.ops.engine/org.scijava.ops.engine=ALL-UNNAMED</scijava.surefire.args>
133+
134+
<!-- TEMP: Can be removed once present in pom-scijava -->
135+
<scijava-collections.version>1.0.1-SNAPSHOT</scijava-collections.version>
136+
<scijava-common3.version>1.0.1-SNAPSHOT</scijava-common3.version>
137+
<scijava-discovery.version>1.0.1-SNAPSHOT</scijava-discovery.version>
138+
<scijava-function.version>1.0.1-SNAPSHOT</scijava-function.version>
139+
<scijava-indexer.version>1.0.1-SNAPSHOT</scijava-indexer.version>
140+
<scijava-meta.version>1.0.1-SNAPSHOT</scijava-meta.version>
141+
<scijava-ops-api.version>1.0.1-SNAPSHOT</scijava-ops-api.version>
142+
<scijava-ops-spi.version>1.0.1-SNAPSHOT</scijava-ops-spi.version>
143+
<scijava-priority.version>1.0.1-SNAPSHOT</scijava-priority.version>
144+
<scijava-progress.version>1.0.1-SNAPSHOT</scijava-progress.version>
145+
<scijava-struct.version>1.0.1-SNAPSHOT</scijava-struct.version>
146+
<scijava-taglets.version>1.0.1-SNAPSHOT</scijava-taglets.version>
147+
<scijava-testutil.version>1.0.1-SNAPSHOT</scijava-testutil.version>
148+
<scijava-types.version>1.0.1-SNAPSHOT</scijava-types.version>
133149
</properties>
134150

135151
<dependencies>
@@ -141,57 +157,57 @@
141157
<dependency>
142158
<groupId>org.scijava</groupId>
143159
<artifactId>scijava-collections</artifactId>
144-
<version>${project.version}</version>
160+
<version>${scijava-collections.version}</version>
145161
</dependency>
146162
<dependency>
147163
<groupId>org.scijava</groupId>
148164
<artifactId>scijava-common3</artifactId>
149-
<version>${project.version}</version>
165+
<version>${scijava-common3.version}</version>
150166
</dependency>
151167
<dependency>
152168
<groupId>org.scijava</groupId>
153169
<artifactId>scijava-meta</artifactId>
154-
<version>${project.version}</version>
170+
<version>${scijava-meta.version}</version>
155171
</dependency>
156172
<dependency>
157173
<groupId>org.scijava</groupId>
158174
<artifactId>scijava-ops-api</artifactId>
159-
<version>${project.version}</version>
175+
<version>${scijava-ops-api.version}</version>
160176
</dependency>
161177
<dependency>
162178
<groupId>org.scijava</groupId>
163179
<artifactId>scijava-ops-spi</artifactId>
164-
<version>${project.version}</version>
180+
<version>${scijava-ops-spi.version}</version>
165181
</dependency>
166182
<dependency>
167183
<groupId>org.scijava</groupId>
168184
<artifactId>scijava-discovery</artifactId>
169-
<version>${project.version}</version>
185+
<version>${scijava-discovery.version}</version>
170186
</dependency>
171187
<dependency>
172188
<groupId> org.scijava</groupId>
173189
<artifactId>scijava-function</artifactId>
174-
<version>${project.version}</version>
190+
<version>${scijava-function.version}</version>
175191
</dependency>
176192
<dependency>
177193
<groupId>org.scijava</groupId>
178194
<artifactId>scijava-priority</artifactId>
179-
<version>${project.version}</version>
195+
<version>${scijava-priority.version}</version>
180196
</dependency>
181197
<dependency>
182198
<groupId>org.scijava</groupId>
183199
<artifactId>scijava-progress</artifactId>
184-
<version>${project.version}</version>
200+
<version>${scijava-progress.version}</version>
185201
</dependency>
186202
<dependency>
187203
<groupId>org.scijava</groupId>
188204
<artifactId>scijava-struct</artifactId>
189-
<version>${project.version}</version>
205+
<version>${scijava-struct.version}</version>
190206
</dependency>
191207
<dependency>
192208
<groupId>org.scijava</groupId>
193209
<artifactId>scijava-types</artifactId>
194-
<version>${project.version}</version>
210+
<version>${scijava-types.version}</version>
195211
</dependency>
196212

197213
<!-- Third-party dependencies -->
@@ -221,7 +237,7 @@
221237
<dependency>
222238
<groupId>org.scijava</groupId>
223239
<artifactId>scijava-testutil</artifactId>
224-
<version>${project.version}</version>
240+
<version>${scijava-testutil.version}</version>
225241
<scope>test</scope>
226242
</dependency>
227243
</dependencies>
@@ -235,7 +251,7 @@
235251
<path>
236252
<groupId>org.scijava</groupId>
237253
<artifactId>scijava-ops-indexer</artifactId>
238-
<version>${project.version}</version>
254+
<version>${scijava-indexer.version}</version>
239255
</path>
240256
</annotationProcessorPaths>
241257
<fork>true</fork>
@@ -259,7 +275,7 @@
259275
<tagletArtifact>
260276
<groupId>org.scijava</groupId>
261277
<artifactId>scijava-taglets</artifactId>
262-
<version>${project.version}</version>
278+
<version>${scijava-taglets.version}</version>
263279
</tagletArtifact>
264280
</tagletArtifacts>
265281
<tags>

0 commit comments

Comments
 (0)