From 2e4222c86a4d528294f9d29bc6265d755101a638 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 20 May 2024 09:25:05 -0500 Subject: [PATCH 1/2] Ensure taglets and indexer built first --- .github/build.sh | 5 ----- pom.xml | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index 95387ff8b..523abeb87 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,8 +1,3 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh - -# NB: These two components must be pre-built before the project as a whole, -# because they are used as helpers during the project build itself. -mvn -Djavadoc.skip -pl scijava-taglets,scijava-ops-indexer -am clean install - sh ci-build.sh diff --git a/pom.xml b/pom.xml index 10cd223e6..f767807fd 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,10 @@ + + scijava-ops-indexer + scijava-taglets + scijava-collections scijava-common3 scijava-concurrent @@ -57,7 +61,6 @@ scijava-ops-flim scijava-ops-image scijava-ops-legacy - scijava-ops-indexer scijava-ops-opencv scijava-ops-ext-parser scijava-ops-spi @@ -65,7 +68,6 @@ scijava-priority scijava-progress scijava-struct - scijava-taglets scijava-testutil scijava-types From 80ac372d06016940e75a1b1604dae9193779ba7e Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 20 May 2024 09:38:00 -0500 Subject: [PATCH 2/2] Rename SciJava parent POM --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f767807fd..2dd642ee4 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ 0-SNAPSHOT pom - SciJava Incubator - A wonderful bag of cats. + SciJava Parent + The parent module of the core SciJava suite. https://github.com/scijava/scijava 2020