Skip to content

Commit 5ae50f5

Browse files
ctruedenctrueden
authored
Merge pull request #282 from scijava/scijava-monorepo-components
Add SciJava monorepo components
2 parents aa393a1 + ad61b4c commit 5ae50f5

File tree

2 files changed

+189
-11
lines changed

2 files changed

+189
-11
lines changed

‎pom.xml‎

Lines changed: 156 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>pom-scijava</artifactId>
14-
<version>43.0.1-SNAPSHOT</version>
14+
<version>43.1.0-SNAPSHOT</version>
1515
<packaging>pom</packaging>
1616

1717
<name>SciJava Parent POM</name>
@@ -305,6 +305,48 @@
305305

306306
<!-- SciJava - https://github.com/scijava -->
307307

308+
<!-- SciJava Core - https://github.com/scijava/scijava -->
309+
<scijava-collections.version>1.0.0</scijava-collections.version>
310+
<scijava-common3.version>1.0.0</scijava-common3.version>
311+
<scijava-concurrent.version>1.0.0</scijava-concurrent.version>
312+
<scijava-discovery.version>1.0.0</scijava-discovery.version>
313+
<scijava-function.version>1.0.0</scijava-function.version>
314+
<scijava-legacy.version>1.0.0</scijava-legacy.version>
315+
<scijava-meta.version>1.0.0</scijava-meta.version>
316+
<scijava-ops-api.version>1.0.0</scijava-ops-api.version>
317+
<scijava-ops-engine.version>1.0.0</scijava-ops-engine.version>
318+
<scijava-ops-flim.version>1.0.0</scijava-ops-flim.version>
319+
<scijava-ops-image.version>1.0.0</scijava-ops-image.version>
320+
<scijava-ops-indexer.version>1.0.0</scijava-ops-indexer.version>
321+
<scijava-ops-opencv.version>1.0.0</scijava-ops-opencv.version>
322+
<scijava-ops-spi.version>1.0.0</scijava-ops-spi.version>
323+
<scijava-priority.version>1.0.0</scijava-priority.version>
324+
<scijava-progress.version>1.0.0</scijava-progress.version>
325+
<scijava-struct.version>1.0.0</scijava-struct.version>
326+
<scijava-taglets.version>1.0.0</scijava-taglets.version>
327+
<scijava-testutil.version>1.0.0</scijava-testutil.version>
328+
<scijava-types.version>1.0.0</scijava-types.version>
329+
<org.scijava.scijava-collections.version>${scijava-collections.version}</org.scijava.scijava-collections.version>
330+
<org.scijava.scijava-common3.version>${scijava-common3.version}</org.scijava.scijava-common3.version>
331+
<org.scijava.scijava-concurrent.version>${scijava-concurrent.version}</org.scijava.scijava-concurrent.version>
332+
<org.scijava.scijava-discovery.version>${scijava-discovery.version}</org.scijava.scijava-discovery.version>
333+
<org.scijava.scijava-function.version>${scijava-function.version}</org.scijava.scijava-function.version>
334+
<org.scijava.scijava-legacy.version>${scijava-legacy.version}</org.scijava.scijava-legacy.version>
335+
<org.scijava.scijava-meta.version>${scijava-meta.version}</org.scijava.scijava-meta.version>
336+
<org.scijava.scijava-ops-api.version>${scijava-ops-api.version}</org.scijava.scijava-ops-api.version>
337+
<org.scijava.scijava-ops-engine.version>${scijava-ops-engine.version}</org.scijava.scijava-ops-engine.version>
338+
<org.scijava.scijava-ops-flim.version>${scijava-ops-flim.version}</org.scijava.scijava-ops-flim.version>
339+
<org.scijava.scijava-ops-image.version>${scijava-ops-image.version}</org.scijava.scijava-ops-image.version>
340+
<org.scijava.scijava-ops-indexer.version>${scijava-ops-indexer.version}</org.scijava.scijava-ops-indexer.version>
341+
<org.scijava.scijava-ops-opencv.version>${scijava-ops-opencv.version}</org.scijava.scijava-ops-opencv.version>
342+
<org.scijava.scijava-ops-spi.version>${scijava-ops-spi.version}</org.scijava.scijava-ops-spi.version>
343+
<org.scijava.scijava-priority.version>${scijava-priority.version}</org.scijava.scijava-priority.version>
344+
<org.scijava.scijava-progress.version>${scijava-progress.version}</org.scijava.scijava-progress.version>
345+
<org.scijava.scijava-struct.version>${scijava-struct.version}</org.scijava.scijava-struct.version>
346+
<org.scijava.scijava-taglets.version>${scijava-taglets.version}</org.scijava.scijava-taglets.version>
347+
<org.scijava.scijava-testutil.version>${scijava-testutil.version}</org.scijava.scijava-testutil.version>
348+
<org.scijava.scijava-types.version>${scijava-types.version}</org.scijava.scijava-types.version>
349+
308350
<!-- App Launcher - https://github.com/scijava/app-launcher -->
309351
<app-launcher.version>2.3.1</app-launcher.version>
310352
<org.scijava.app-launcher.version>${app-launcher.version}</org.scijava.app-launcher.version>
@@ -2125,8 +2167,7 @@
21252167
<jogamp-java3d.version>1.7.2</jogamp-java3d.version>
21262168
<java3d-core.version>${jogamp-java3d.version}</java3d-core.version>
21272169
<java3d-utils.version>${jogamp-java3d.version}</java3d-utils.version>
2128-
<!-- TEMP: Avoid short name clash with org.scijava:vecmath. -->
2129-
<!--<vecmath.version>${jogamp-java3d.version}</vecmath.version>-->
2170+
<vecmath.version>${jogamp-java3d.version}</vecmath.version>
21302171
<org.jogamp.java3d.java3d-core.version>${java3d-core.version}</org.jogamp.java3d.java3d-core.version>
21312172
<org.jogamp.java3d.java3d-utils.version>${java3d-utils.version}</org.jogamp.java3d.java3d-utils.version>
21322173
<org.jogamp.java3d.vecmath.version>${jogamp-java3d.version}</org.jogamp.java3d.vecmath.version>
@@ -2422,6 +2463,118 @@
24222463
<dependencies>
24232464
<!-- SciJava - https://github.com/scijava -->
24242465

2466+
<!-- SciJava Core - https://github.com/scijava/scijava -->
2467+
<dependency>
2468+
<groupId>org.scijava</groupId>
2469+
<artifactId>scijava-collections</artifactId>
2470+
<version>${org.scijava.scijava-collections.version}</version>
2471+
</dependency>
2472+
<dependency>
2473+
<groupId>org.scijava</groupId>
2474+
<artifactId>scijava-common3</artifactId>
2475+
<version>${org.scijava.scijava-common3.version}</version>
2476+
</dependency>
2477+
<dependency>
2478+
<groupId>org.scijava</groupId>
2479+
<artifactId>scijava-concurrent</artifactId>
2480+
<version>${org.scijava.scijava-concurrent.version}</version>
2481+
</dependency>
2482+
<dependency>
2483+
<groupId>org.scijava</groupId>
2484+
<artifactId>scijava-discovery</artifactId>
2485+
<version>${org.scijava.scijava-discovery.version}</version>
2486+
</dependency>
2487+
<dependency>
2488+
<groupId>org.scijava</groupId>
2489+
<artifactId>scijava-function</artifactId>
2490+
<version>${org.scijava.scijava-function.version}</version>
2491+
</dependency>
2492+
<dependency>
2493+
<groupId>org.scijava</groupId>
2494+
<artifactId>scijava-legacy</artifactId>
2495+
<version>${org.scijava.scijava-legacy.version}</version>
2496+
</dependency>
2497+
<dependency>
2498+
<groupId>org.scijava</groupId>
2499+
<artifactId>scijava-meta</artifactId>
2500+
<version>${org.scijava.scijava-meta.version}</version>
2501+
</dependency>
2502+
<dependency>
2503+
<groupId>org.scijava</groupId>
2504+
<artifactId>scijava-ops-api</artifactId>
2505+
<version>${org.scijava.scijava-ops-api.version}</version>
2506+
</dependency>
2507+
<dependency>
2508+
<groupId>org.scijava</groupId>
2509+
<artifactId>scijava-ops-engine</artifactId>
2510+
<version>${org.scijava.scijava-ops-engine.version}</version>
2511+
</dependency>
2512+
<dependency>
2513+
<groupId>org.scijava</groupId>
2514+
<artifactId>scijava-ops-flim</artifactId>
2515+
<version>${org.scijava.scijava-ops-flim.version}</version>
2516+
</dependency>
2517+
<dependency>
2518+
<groupId>org.scijava</groupId>
2519+
<artifactId>scijava-ops-image</artifactId>
2520+
<version>${org.scijava.scijava-ops-image.version}</version>
2521+
</dependency>
2522+
<dependency>
2523+
<groupId>org.scijava</groupId>
2524+
<artifactId>scijava-ops-indexer</artifactId>
2525+
<version>${org.scijava.scijava-ops-indexer.version}</version>
2526+
</dependency>
2527+
<dependency>
2528+
<groupId>org.scijava</groupId>
2529+
<artifactId>scijava-ops-opencv</artifactId>
2530+
<version>${org.scijava.scijava-ops-opencv.version}</version>
2531+
</dependency>
2532+
<dependency>
2533+
<groupId>org.scijava</groupId>
2534+
<artifactId>scijava-ops-spi</artifactId>
2535+
<version>${org.scijava.scijava-ops-spi.version}</version>
2536+
</dependency>
2537+
<dependency>
2538+
<groupId>org.scijava</groupId>
2539+
<artifactId>scijava-priority</artifactId>
2540+
<version>${org.scijava.scijava-priority.version}</version>
2541+
</dependency>
2542+
<dependency>
2543+
<groupId>org.scijava</groupId>
2544+
<artifactId>scijava-progress</artifactId>
2545+
<version>${org.scijava.scijava-progress.version}</version>
2546+
</dependency>
2547+
<dependency>
2548+
<groupId>org.scijava</groupId>
2549+
<artifactId>scijava-struct</artifactId>
2550+
<version>${org.scijava.scijava-struct.version}</version>
2551+
</dependency>
2552+
<dependency>
2553+
<groupId>org.scijava</groupId>
2554+
<artifactId>scijava-taglets</artifactId>
2555+
<version>${org.scijava.scijava-taglets.version}</version>
2556+
</dependency>
2557+
<dependency>
2558+
<groupId>org.scijava</groupId>
2559+
<artifactId>scijava-testutil</artifactId>
2560+
<version>${org.scijava.scijava-testutil.version}</version>
2561+
</dependency>
2562+
<dependency>
2563+
<groupId>org.scijava</groupId>
2564+
<artifactId>scijava-taglets</artifactId>
2565+
<version>${org.scijava.scijava-taglets.version}</version>
2566+
</dependency>
2567+
<dependency>
2568+
<groupId>org.scijava</groupId>
2569+
<artifactId>scijava-testutil</artifactId>
2570+
<version>${org.scijava.scijava-testutil.version}</version>
2571+
</dependency>
2572+
<dependency>
2573+
<groupId>org.scijava</groupId>
2574+
<artifactId>scijava-types</artifactId>
2575+
<version>${org.scijava.scijava-types.version}</version>
2576+
</dependency>
2577+
24252578
<!-- App Launcher - https://github.com/scijava/app-launcher -->
24262579
<dependency>
24272580
<groupId>org.scijava</groupId>

‎tests/generate-mega-melt.py‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,44 @@ def child(node, tag):
2121

2222
# Artifacts to exclude from the mega melt.
2323
ignoredArtifacts = [
24-
# TEMP: The SNT project needs a new release without the
25-
# obsolete scijava-plugins-io-table dependency.
26-
'SNT',
27-
2824
# TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone.
2925
'hdf5',
3026
# TEMP: The original ImageJ requires Java 9+ to compile,
3127
# because it has a module-info.java, so skip it until the
3228
# component collection is updated from Java 8 to Java 11.
3329
'ij',
34-
# TEMP: The original ImageJ introduced changes in
35-
# 1.54m/1.54n/1.54p that breaks some downstream tests.
36-
# Disable them till we have time to address the issue.
37-
'ij1-patcher', 'imagej-legacy',
30+
# TEMP: Skip components within multi-module reactors.
31+
# Neither melting-pot.sh nor release-version.sh understand
32+
# multi-module repositories; release-version.sh needs to learn
33+
# how to tag and release individual components from multi-module
34+
# repos, so that when melting-pot.sh shallow clones the repo at
35+
# that tag and invokes a build, it will be building only the
36+
# released component as it does with single-component repos.
37+
'scijava-collections',
38+
'scijava-common3',
39+
'scijava-concurrent',
40+
'scijava-discovery-test',
41+
'scijava-discovery',
42+
'scijava-function',
43+
'scijava-legacy',
44+
'scijava-meta',
45+
'scijava-ops-api',
46+
'scijava-ops-benchmarks',
47+
'scijava-ops-engine',
48+
'scijava-ops-ext-parser',
49+
'scijava-ops-flim',
50+
'scijava-ops-image',
51+
'scijava-ops-indexer',
52+
'scijava-ops-opencv',
53+
'scijava-ops-spi',
54+
'scijava-ops-tutorial',
55+
'scijava-priority',
56+
'scijava-progress',
57+
'scijava-struct',
58+
'scijava-taglets',
59+
'scijava-testutil',
60+
'scijava-types',
61+
'mpicbg', 'mpicbg_',
3862
# NB: Skip artifacts requiring minimum Java version >8.
3963
'algart-tiff',
4064
'javafx-base',
@@ -44,6 +68,7 @@ def child(node, tag):
4468
'javafx-media',
4569
'javafx-swing',
4670
'javafx-web',
71+
'SNT',
4772
# NB: Skip closed-source artifacts.
4873
'bonej-plus',
4974
# NB: The following artifacts have messy dependency trees.

0 commit comments

Comments
 (0)