Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 156 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>pom-scijava</artifactId>
<version>43.0.1-SNAPSHOT</version>
<version>43.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>SciJava Parent POM</name>
Expand Down Expand Up @@ -305,6 +305,48 @@

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

<!-- SciJava Core - https://github.com/scijava/scijava -->
<scijava-collections.version>1.0.0</scijava-collections.version>
<scijava-common3.version>1.0.0</scijava-common3.version>
<scijava-concurrent.version>1.0.0</scijava-concurrent.version>
<scijava-discovery.version>1.0.0</scijava-discovery.version>
<scijava-function.version>1.0.0</scijava-function.version>
<scijava-legacy.version>1.0.0</scijava-legacy.version>
<scijava-meta.version>1.0.0</scijava-meta.version>
<scijava-ops-api.version>1.0.0</scijava-ops-api.version>
<scijava-ops-engine.version>1.0.0</scijava-ops-engine.version>
<scijava-ops-flim.version>1.0.0</scijava-ops-flim.version>
<scijava-ops-image.version>1.0.0</scijava-ops-image.version>
<scijava-ops-indexer.version>1.0.0</scijava-ops-indexer.version>
<scijava-ops-opencv.version>1.0.0</scijava-ops-opencv.version>
<scijava-ops-spi.version>1.0.0</scijava-ops-spi.version>
<scijava-priority.version>1.0.0</scijava-priority.version>
<scijava-progress.version>1.0.0</scijava-progress.version>
<scijava-struct.version>1.0.0</scijava-struct.version>
<scijava-taglets.version>1.0.0</scijava-taglets.version>
<scijava-testutil.version>1.0.0</scijava-testutil.version>
<scijava-types.version>1.0.0</scijava-types.version>
<org.scijava.scijava-collections.version>${scijava-collections.version}</org.scijava.scijava-collections.version>
<org.scijava.scijava-common3.version>${scijava-common3.version}</org.scijava.scijava-common3.version>
<org.scijava.scijava-concurrent.version>${scijava-concurrent.version}</org.scijava.scijava-concurrent.version>
<org.scijava.scijava-discovery.version>${scijava-discovery.version}</org.scijava.scijava-discovery.version>
<org.scijava.scijava-function.version>${scijava-function.version}</org.scijava.scijava-function.version>
<org.scijava.scijava-legacy.version>${scijava-legacy.version}</org.scijava.scijava-legacy.version>
<org.scijava.scijava-meta.version>${scijava-meta.version}</org.scijava.scijava-meta.version>
<org.scijava.scijava-ops-api.version>${scijava-ops-api.version}</org.scijava.scijava-ops-api.version>
<org.scijava.scijava-ops-engine.version>${scijava-ops-engine.version}</org.scijava.scijava-ops-engine.version>
<org.scijava.scijava-ops-flim.version>${scijava-ops-flim.version}</org.scijava.scijava-ops-flim.version>
<org.scijava.scijava-ops-image.version>${scijava-ops-image.version}</org.scijava.scijava-ops-image.version>
<org.scijava.scijava-ops-indexer.version>${scijava-ops-indexer.version}</org.scijava.scijava-ops-indexer.version>
<org.scijava.scijava-ops-opencv.version>${scijava-ops-opencv.version}</org.scijava.scijava-ops-opencv.version>
<org.scijava.scijava-ops-spi.version>${scijava-ops-spi.version}</org.scijava.scijava-ops-spi.version>
<org.scijava.scijava-priority.version>${scijava-priority.version}</org.scijava.scijava-priority.version>
<org.scijava.scijava-progress.version>${scijava-progress.version}</org.scijava.scijava-progress.version>
<org.scijava.scijava-struct.version>${scijava-struct.version}</org.scijava.scijava-struct.version>
<org.scijava.scijava-taglets.version>${scijava-taglets.version}</org.scijava.scijava-taglets.version>
<org.scijava.scijava-testutil.version>${scijava-testutil.version}</org.scijava.scijava-testutil.version>
<org.scijava.scijava-types.version>${scijava-types.version}</org.scijava.scijava-types.version>

<!-- App Launcher - https://github.com/scijava/app-launcher -->
<app-launcher.version>2.3.1</app-launcher.version>
<org.scijava.app-launcher.version>${app-launcher.version}</org.scijava.app-launcher.version>
Expand Down Expand Up @@ -2125,8 +2167,7 @@
<jogamp-java3d.version>1.7.2</jogamp-java3d.version>
<java3d-core.version>${jogamp-java3d.version}</java3d-core.version>
<java3d-utils.version>${jogamp-java3d.version}</java3d-utils.version>
<!-- TEMP: Avoid short name clash with org.scijava:vecmath. -->
<!--<vecmath.version>${jogamp-java3d.version}</vecmath.version>-->
<vecmath.version>${jogamp-java3d.version}</vecmath.version>
<org.jogamp.java3d.java3d-core.version>${java3d-core.version}</org.jogamp.java3d.java3d-core.version>
<org.jogamp.java3d.java3d-utils.version>${java3d-utils.version}</org.jogamp.java3d.java3d-utils.version>
<org.jogamp.java3d.vecmath.version>${jogamp-java3d.version}</org.jogamp.java3d.vecmath.version>
Expand Down Expand Up @@ -2422,6 +2463,118 @@
<dependencies>
<!-- SciJava - https://github.com/scijava -->

<!-- SciJava Core - https://github.com/scijava/scijava -->
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-collections</artifactId>
<version>${org.scijava.scijava-collections.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-common3</artifactId>
<version>${org.scijava.scijava-common3.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-concurrent</artifactId>
<version>${org.scijava.scijava-concurrent.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-discovery</artifactId>
<version>${org.scijava.scijava-discovery.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-function</artifactId>
<version>${org.scijava.scijava-function.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-legacy</artifactId>
<version>${org.scijava.scijava-legacy.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-meta</artifactId>
<version>${org.scijava.scijava-meta.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-ops-api</artifactId>
<version>${org.scijava.scijava-ops-api.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-ops-engine</artifactId>
<version>${org.scijava.scijava-ops-engine.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-ops-flim</artifactId>
<version>${org.scijava.scijava-ops-flim.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-ops-image</artifactId>
<version>${org.scijava.scijava-ops-image.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-ops-indexer</artifactId>
<version>${org.scijava.scijava-ops-indexer.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-ops-opencv</artifactId>
<version>${org.scijava.scijava-ops-opencv.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-ops-spi</artifactId>
<version>${org.scijava.scijava-ops-spi.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-priority</artifactId>
<version>${org.scijava.scijava-priority.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-progress</artifactId>
<version>${org.scijava.scijava-progress.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-struct</artifactId>
<version>${org.scijava.scijava-struct.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-taglets</artifactId>
<version>${org.scijava.scijava-taglets.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-testutil</artifactId>
<version>${org.scijava.scijava-testutil.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-taglets</artifactId>
<version>${org.scijava.scijava-taglets.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-testutil</artifactId>
<version>${org.scijava.scijava-testutil.version}</version>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-types</artifactId>
<version>${org.scijava.scijava-types.version}</version>
</dependency>

<!-- App Launcher - https://github.com/scijava/app-launcher -->
<dependency>
<groupId>org.scijava</groupId>
Expand Down
41 changes: 33 additions & 8 deletions tests/generate-mega-melt.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,44 @@ def child(node, tag):

# Artifacts to exclude from the mega melt.
ignoredArtifacts = [
# TEMP: The SNT project needs a new release without the
# obsolete scijava-plugins-io-table dependency.
'SNT',

# TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone.
'hdf5',
# TEMP: The original ImageJ requires Java 9+ to compile,
# because it has a module-info.java, so skip it until the
# component collection is updated from Java 8 to Java 11.
'ij',
# TEMP: The original ImageJ introduced changes in
# 1.54m/1.54n/1.54p that breaks some downstream tests.
# Disable them till we have time to address the issue.
'ij1-patcher', 'imagej-legacy',
# TEMP: Skip components within multi-module reactors.
# Neither melting-pot.sh nor release-version.sh understand
# multi-module repositories; release-version.sh needs to learn
# how to tag and release individual components from multi-module
# repos, so that when melting-pot.sh shallow clones the repo at
# that tag and invokes a build, it will be building only the
# released component as it does with single-component repos.
'scijava-collections',
'scijava-common3',
'scijava-concurrent',
'scijava-discovery-test',
'scijava-discovery',
'scijava-function',
'scijava-legacy',
'scijava-meta',
'scijava-ops-api',
'scijava-ops-benchmarks',
'scijava-ops-engine',
'scijava-ops-ext-parser',
'scijava-ops-flim',
'scijava-ops-image',
'scijava-ops-indexer',
'scijava-ops-opencv',
'scijava-ops-spi',
'scijava-ops-tutorial',
'scijava-priority',
'scijava-progress',
'scijava-struct',
'scijava-taglets',
'scijava-testutil',
'scijava-types',
'mpicbg', 'mpicbg_',
# NB: Skip artifacts requiring minimum Java version >8.
'algart-tiff',
'javafx-base',
Expand All @@ -44,6 +68,7 @@ def child(node, tag):
'javafx-media',
'javafx-swing',
'javafx-web',
'SNT',
# NB: Skip closed-source artifacts.
'bonej-plus',
# NB: The following artifacts have messy dependency trees.
Expand Down