Update maven.imagej.net -> maven.scijava.org

Author: ctrueden

maven-helper.sh

@@ -1,22 +1,22 @@
 #!/bin/sh
 
-# This script uses the ImageJ Maven repository at http://maven.imagej.net/
+# This script uses the SciJava Maven repository at https://maven.scijava.org/
 # to fetch an artifact, or to determine the state of it.
 
 # error out whenever a command fails
 set -e
 
 root_url () {
 	test snapshots != "$2" || {
-		if curl -fs http://maven.imagej.net/service/local/repositories/sonatype-snapshots/content/"$1"/maven-metadata.xml > /dev/null 2>&1
+		if curl -fs https://maven.scijava.org/service/local/repositories/sonatype-snapshots/content/"$1"/maven-metadata.xml > /dev/null 2>&1
 		then
-			echo http://maven.imagej.net/service/local/repositories/sonatype-snapshots/content
+			echo https://maven.scijava.org/service/local/repositories/sonatype-snapshots/content
 		else
-			echo http://maven.imagej.net/content/repositories/snapshots
+			echo https://maven.scijava.org/content/repositories/snapshots
 		fi
 		return
 	}
-	echo http://maven.imagej.net/service/local/repo_groups/public/content
+	echo https://maven.scijava.org/service/local/repo_groups/public/content
 }
 
 die () {
@@ -232,10 +232,10 @@ latest_version () {
 	echo "$latest"
 }
 
-# Given a GA parameter, invalidate the cache in ImageJ's Nexus' group/public
+# Given a GA parameter, invalidate the cache in SciJava's Nexus' group/public
 
-SONATYPE_DATA_CACHE_URL=http://maven.imagej.net/service/local/data_cache/repositories/sonatype/content
-SONATYPE_SNAPSHOTS_DATA_CACHE_URL=http://maven.imagej.net/service/local/data_cache/repositories/sonatype-snapshots/content
+SONATYPE_DATA_CACHE_URL=https://maven.scijava.org/service/local/data_cache/repositories/sonatype/content
+SONATYPE_SNAPSHOTS_DATA_CACHE_URL=https://maven.scijava.org/service/local/data_cache/repositories/sonatype-snapshots/content
 invalidate_cache () {
 	ga="$1"
 	artifactId="$(artifactId "$ga")"
@@ -531,9 +531,9 @@ latest-version <groupId>:<artifactId>[:<version>]
 	than the release one).
 
 invalidate-cache <groupId>:<artifactId>
-	Invalidates the version cached in the ImageJ Nexus from OSS Sonatype,
+	Invalidates the version cached in the SciJava Nexus from OSS Sonatype,
 	e.g. after releasing a new version to Sonatype. Requires appropriate
-	credentials in $HOME/.netrc for http://maven.imagej.net/.
+	credentials in $HOME/.netrc for https://maven.scijava.org/.
 
 parent-gav <groupId>:<artifactId>[:<version>]
 	Prints the GAV parameter of the parent project of the given artifact.

melting-pot.sh

@@ -222,14 +222,14 @@ parseArguments() {
 --== Example ==--
 
     sh melting-pot.sh net.imagej:imagej-common:0.15.1 \\
-        -r http://maven.imagej.net/content/groups/public \\
+        -r https://maven.scijava.org/content/groups/public \\
         -c org.scijava:scijava-common:2.44.2 \\
         -i 'org.scijava:*,net.imagej:*,net.imglib2:*,io.scif:*' \\
         -e net.imglib2:imglib2-roi \\
         -v -f -s
 
 This command tests net.imagej:imagej-common:0.15.1 along with all of its
-dependencies, pulled from its usual ImageJ Maven repository location.
+dependencies, pulled from its usual SciJava Maven repository location.
 
 The -c flag is used to override the org.scijava:scijava-common
 dependency to use version 2.44.2 instead of its declared version 2.42.0.

release-version.sh

@@ -29,7 +29,7 @@ verify_git_settings () {
 	fi
 }
 
-SCIJAVA_BASE_REPOSITORY=-DaltDeploymentRepository=imagej.releases::default::dav:https://maven.imagej.net/content/repositories
+SCIJAVA_BASE_REPOSITORY=-DaltDeploymentRepository=scijava.releases::default::dav:https://maven.scijava.org/content/repositories
 SCIJAVA_RELEASES_REPOSITORY=$SCIJAVA_BASE_REPOSITORY/releases
 SCIJAVA_THIRDPARTY_REPOSITORY=$SCIJAVA_BASE_REPOSITORY/thirdparty
 
@@ -41,7 +41,7 @@ TAG=
 DEV_VERSION=
 EXTRA_ARGS=
 ALT_REPOSITORY=
-PROFILE=-Pdeploy-to-imagej
+PROFILE=-Pdeploy-to-scijava
 DRY_RUN=
 while test $# -gt 0
 do
@@ -58,13 +58,13 @@ do
 		DEV_VERSION="-DdevelopmentVersion=${1#--*=}";;
 	--extra-arg=*|--extra-args=*)
 		EXTRA_ARGS="$EXTRA_ARGS ${1#--*=}";;
-	--alt-repository=imagej-releases)
+	--alt-repository=scijava-releases)
 		ALT_REPOSITORY=$SCIJAVA_RELEASES_REPOSITORY;;
-	--alt-repository=imagej-thirdparty)
+	--alt-repository=scijava-thirdparty)
 		ALT_REPOSITORY=$SCIJAVA_THIRDPARTY_REPOSITORY;;
 	--alt-repository=*|--alt-deployment-repository=*)
 		ALT_REPOSITORY="${1#--*=}";;
-	--thirdparty=imagej)
+	--thirdparty=scijava)
 		BATCH_MODE=
 		SKIP_PUSH=t
 		ALT_REPOSITORY=$SCIJAVA_THIRDPARTY_REPOSITORY;;
@@ -90,7 +90,7 @@ test $# = 1 || test ! -t 0 || {
 }
 
 test $# = 1 && test "a$1" = "a${1#-}" ||
-die "Usage: $0 [--no-batch-mode] [--skip-push] [--alt-repository=<repository>] [--thirdparty=imagej] [--skip-gpg] [--extra-arg=<args>] <release-version>"
+die "Usage: $0 [--no-batch-mode] [--skip-push] [--alt-repository=<repository>] [--thirdparty=scijava] [--skip-gpg] [--extra-arg=<args>] <release-version>"
 
 VERSION="$1"
 REMOTE="${REMOTE:-origin}"

sj-version.sh

@@ -9,7 +9,7 @@
 version="$1"
 diff="$2"
 
-repo="http://maven.imagej.net/content/groups/public"
+repo="https://maven.scijava.org/content/groups/public"
 
 props() {
 	if [ -e "$1" ]

tests/melting-pot-multi.t

@@ -1,6 +1,6 @@
 Test that recursive SCM retrieval and multi-module projects work:
 
-  $ sh "$TESTDIR/../melting-pot.sh" sc.fiji:TrakEM2_:1.0f -r http://maven.imagej.net/content/groups/public -i 'sc.fiji:TrakEM2_' -v -s -d -f
+  $ sh "$TESTDIR/../melting-pot.sh" sc.fiji:TrakEM2_:1.0f -r https://maven.scijava.org/content/groups/public -i 'sc.fiji:TrakEM2_' -v -s -d -f
   [INFO] sc.fiji:TrakEM2_:1.0f: fetching project source
   \+ xmllint --xpath ".*'project'.*'scm'.*'connection'.*" ".*/sc/fiji/TrakEM2_/1.0f/TrakEM2_-1.0f.pom" (re)
   \+ xmllint --xpath ".*'project'.*'parent'.*'groupId'.*" ".*/sc/fiji/TrakEM2_/1.0f/TrakEM2_-1.0f.pom" (re)

tests/melting-pot-prune.t

@@ -1,6 +1,6 @@
 Test that the '--prune' flag works as intended:
 
-  $ sh "$TESTDIR/../melting-pot.sh" net.imagej:imagej-common:0.15.1 -r http://maven.imagej.net/content/groups/public -c org.scijava:scijava-common:2.44.2 -i 'org.scijava:*,net.imagej:*,net.imglib2:*' -p -v -f -s
+  $ sh "$TESTDIR/../melting-pot.sh" net.imagej:imagej-common:0.15.1 -r https://maven.scijava.org/content/groups/public -c org.scijava:scijava-common:2.44.2 -i 'org.scijava:*,net.imagej:*,net.imglib2:*' -p -v -f -s
   [INFO] net.imagej:imagej-common:0.15.1: fetching project source
   [INFO] net.imagej:imagej-common:0.15.1: determining project dependencies
   [INFO] net.imagej:imagej-common:0.15.1: processing project dependencies

tests/melting-pot-simple.t

@@ -1,6 +1,6 @@
 Down-the-middle test of a relatively simply project:
 
-  $ sh "$TESTDIR/../melting-pot.sh" net.imagej:imagej-common:0.15.1 -r http://maven.imagej.net/content/groups/public -c org.scijava:scijava-common:2.44.2 -i 'org.scijava:*,net.imagej:*,net.imglib2:*,io.scif:*' -e net.imglib2:imglib2-roi -v -f -s
+  $ sh "$TESTDIR/../melting-pot.sh" net.imagej:imagej-common:0.15.1 -r https://maven.scijava.org/content/groups/public -c org.scijava:scijava-common:2.44.2 -i 'org.scijava:*,net.imagej:*,net.imglib2:*,io.scif:*' -e net.imglib2:imglib2-roi -v -f -s
   [INFO] net.imagej:imagej-common:0.15.1: fetching project source
   [INFO] net.imagej:imagej-common:0.15.1: determining project dependencies
   [INFO] net.imagej:imagej-common:0.15.1: processing project dependencies

travis-javadoc.sh

@@ -53,17 +53,17 @@ then
 	then
 		cp "$customSettings" "$settingsFile"
 	else
-		# NB: Use maven.imagej.net as sole mirror if defined in <repositories>.
+		# NB: Use maven.scijava.org as sole mirror if defined in <repositories>.
 		# This hopefully avoids intermittent "ReasonPhrase:Forbidden" errors
 		# when the Travis build pings Maven Central; see travis-ci/travis-ci#6593.
-		test -f pom.xml && grep -A 2 '<repository>' pom.xml | grep -q 'maven.imagej.net' &&
+		test -f pom.xml && grep -A 2 '<repository>' pom.xml | grep -q 'maven.scijava.org' &&
 			cat >"$settingsFile" <<EOL
 <settings>
 	<mirrors>
 		<mirror>
-			<id>imagej-mirror</id>
-			<name>ImageJ mirror</name>
-			<url>https://maven.imagej.net/content/groups/public/</url>
+			<id>scijava-mirror</id>
+			<name>SciJava mirror</name>
+			<url>https://maven.scijava.org/content/groups/public/</url>
 			<mirrorOf>*</mirrorOf>
 		</mirror>
 	</mirrors>

travisify.sh

@@ -145,7 +145,7 @@ EOL
 	fi
 	if [ -f "$travisNotifyScript" ]
 	then
-		info "Removing obsolete $travisNotifyScript (ImageJ Jenkins is going away)"
+		info "Removing obsolete $travisNotifyScript (ImageJ Jenkins is dead)"
 		$EXEC git rm -f "$travisNotifyScript"
 	fi
 	$EXEC git diff-index --quiet HEAD -- || $EXEC git ci -m "Travis: remove obsolete files"
@@ -169,13 +169,13 @@ EOL
 	releaseProfile=$(grep '<releaseProfiles>' pom.xml 2>/dev/null | sed 's/[^>]*>//' | sed 's/<.*//')
 	if [ "$releaseProfile" ]
 	then
-		test "$releaseProfile" = 'deploy-to-imagej' ||
+		test "$releaseProfile" = 'deploy-to-scijava' ||
 			warn "Unknown release profile: $releaseProfile"
 	else
 		info 'Adding <releaseProfiles> property'
 		cp pom.xml "$tmpFile"
-		perl -0777 -i -pe 's/(\n\t<\/properties>\n)/\n\n\t\t<!-- NB: Deploy releases to the ImageJ Maven repository. -->\n\t\t<releaseProfiles>deploy-to-imagej<\/releaseProfiles>\1/igs' "$tmpFile"
-		update pom.xml 'POM: deploy releases to the ImageJ repository'
+		perl -0777 -i -pe 's/(\n\t<\/properties>\n)/\n\n\t\t<!-- NB: Deploy releases to the SciJava Maven repository. -->\n\t\t<releaseProfiles>deploy-to-scijava<\/releaseProfiles>\1/igs' "$tmpFile"
+		update pom.xml 'POM: deploy releases to the SciJava repository'
 	fi
 
 	# update the README