8000 Update maven.imagej.net -> maven.scijava.org · oeway/scijava-scripts@cf34a79 · GitHub
[go: up one dir, main page]
Skip to content

Commit cf34a79

Browse files
ctruedenctrueden
committed
Update maven.imagej.net -> maven.scijava.org
1 parent ae9acde commit cf34a79

9 files changed

+31
-31
lines changed

‎maven-helper.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#!/bin/sh
22

3-
# This script uses the ImageJ Maven repository at http://maven.imagej.net/
3+
# This script uses the SciJava Maven repository at https://maven.scijava.org/
44
# to fetch an artifact, or to determine the state of it.
55

66
# error out whenever a command fails
77
set -e
88

99
root_url () {
1010
test snapshots != "$2" || {
11-
if curl -fs http://maven.imagej.net/service/local/repositories/sonatype-snapshots/content/"$1"/maven-metadata.xml > /dev/null 2>&1
11+
if curl -fs https://maven.scijava.org/service/local/repositories/sonatype-snapshots/content/"$1"/maven-metadata.xml > /dev/null 2>&1
1212
then
13-
echo http://maven.imagej.net/service/local/repositories/sonatype-snapshots/content
13+
echo https://maven.scijava.org/service/local/repositories/sonatype-snapshots/content
1414
else
15-
echo http://maven.imagej.net/content/repositories/snapshots
15+
echo https://maven.scijava.org/content/repositories/snapshots
1616
fi
1717
return
1818
}
19-
echo http://maven.imagej.net/service/local/repo_groups/public/content
19+
echo https://maven.scijava.org/service/local/repo_groups/public/content
2020
}
2121

2222
die () {
@@ -232,10 +232,10 @@ latest_version () {
232232
echo "$latest"
233233
}
234234

235-
# Given a GA parameter, invalidate the cache in ImageJ's Nexus' group/public
235+
# Given a GA parameter, invalidate the cache in SciJava's Nexus' group/public
236236

237-
SONATYPE_DATA_CACHE_URL=http://maven.imagej.net/service/local/data_cache/repositories/sonatype/content
238-
SONATYPE_SNAPSHOTS_DATA_CACHE_URL=http://maven.imagej.net/service/local/data_cache/repositories/sonatype-snapshots/content
237+
SONATYPE_DATA_CACHE_URL=https://maven.scijava.org/service/local/data_cache/repositories/sonatype/content
238+
SONATYPE_SNAPSHOTS_DATA_CACHE_URL=https://maven.scijava.org/service/local/data_cache/repositories/sonatype-snapshots/content
239239
invalidate_cache () {
240240
ga="$1"
241241
artifactId="$(artifactId "$ga")"
@@ -531,9 +531,9 @@ latest-version <groupId>:<artifactId>[:<version>]
531531
than the release one).
532532
533533
invalidate-cache <groupId>:<artifactId>
534-
Invalidates the version cached in the ImageJ Nexus from OSS Sonatype,
534+
Invalidates the version cached in the SciJava Nexus from OSS Sonatype,
535535
e.g. after releasing a new version to Sonatype. Requires appropriate
536-
credentials in $HOME/.netrc for http://maven.imagej.net/.
536+
credentials in $HOME/.netrc for https://maven.scijava.org/.
537537
538538
parent-gav <groupId>:<artifactId>[:<version>]
539539
Prints the GAV parameter of the parent project of the given artifact.

‎melting-pot.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,14 @@ parseArguments() {
222222
--== Example ==--
223223
224224
sh melting-pot.sh net.imagej:imagej-common:0.15.1 \\
225-
-r http://maven.imagej.net/content/groups/public \\
225+
-r https://maven.scijava.org/content/groups/public \\
226226
-c org.scijava:scijava-common:2.44.2 \\
227227
-i 'org.scijava:*,net.imagej:*,net.imglib2:*,io.scif:*' \\
228228
-e net.imglib2:imglib2-roi \\
229229
-v -f -s
230230
231231
This command tests net.imagej:imagej-common:0.15.1 along with all of its
232-
dependencies, pulled from its usual ImageJ Maven repository location.
232+
dependencies, pulled from its usual SciJava Maven repository location.
233233
234234
The -c flag is used to override the org.scijava:scijava-common
235235
dependency to use version 2.44.2 instead of its declared version 2.42.0.

‎release-version.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ verify_git_settings () {
2929
fi
3030
}
3131

32-
SCIJAVA_BASE_REPOSITORY=-DaltDeploymentRepository=imagej.releases::default::dav:https://maven.imagej.net/content/repositories
32+
SCIJAVA_BASE_REPOSITORY=-DaltDeploymentRepository=scijava.releases::default::dav:https://maven.scijava.org/content/repositories
3333
SCIJAVA_RELEASES_REPOSITORY=$SCIJAVA_BASE_REPOSITORY/releases
3434
SCIJAVA_THIRDPARTY_REPOSITORY=$SCIJAVA_BASE_REPOSITORY/thirdparty
3535

@@ -41,7 +41,7 @@ TAG=
4141
DEV_VERSION=
4242
EXTRA_ARGS=
4343
ALT_REPOSITORY=
44-
PROFILE=-Pdeploy-to-imagej
44+
PROFILE=-Pdeploy-to-scijava
4545
DRY_RUN=
4646
while test $# -gt 0
4747
do
@@ -58,13 +58,13 @@ do
5858
DEV_VERSION="-DdevelopmentVersion=${1#--*=}";;
5959
--extra-arg=*|--extra-args=*)
6060
EXTRA_ARGS="$EXTRA_ARGS ${1#--*=}";;
61-
--alt-repository=imagej-releases)
61+
--alt-repository=scijava-releases)
6262
ALT_REPOSITORY=$SCIJAVA_RELEASES_REPOSITORY;;
63-
--alt-repository=imagej-thirdparty)
63+
--alt-repository=scijava-thirdparty)
6464
ALT_REPOSITORY=$SCIJAVA_THIRDPARTY_REPOSITORY;;
6565
--alt-repository=*|--alt-deployment-repository=*)
6666
ALT_REPOSITORY="${1#--*=}";;
67-
--thirdparty=imagej)
67+
--thirdparty=scijava)
6868
BATCH_MODE=
6969
SKIP_PUSH=t
7070
ALT_REPOSITORY=$SCIJAVA_THIRDPARTY_REPOSITORY;;
@@ -90,7 +90,7 @@ test $# = 1 || test ! -t 0 || {
9090
}
9191

9292
test $# = 1 && test "a$1" = "a${1#-}" ||
93-
die "Usage: $0 [--no-batch-mode] [--skip-push] [--alt-repository=<repository>] [--thirdparty=imagej] [--skip-gpg] [--extra-arg=<args>] <release-version>"
93+
die "Usage: $0 [--no-batch-mode] [--skip-push] [--alt-repository=<repository>] [--thirdparty=scijava] [--skip-gpg] [--extra-arg=<args>] <release-version>"
9494

9595
VERSION="$1"
9696
REMOTE="${REMOTE:-origin}"

‎sj-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
version="$1"
1010
diff="$2"
1111

12-
repo="http://maven.imagej.net/content/groups/public"
12+
repo="https://maven.scijava.org/content/groups/public"
1313

1414
props() {
1515
if [ -e "$1" ]

‎tests/melting-pot-multi.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Test that recursive SCM retrieval and multi-module projects work:
22

3-
$ 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
3+
$ 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
44
[INFO] sc.fiji:TrakEM2_:1.0f: fetching project source
55
\+ xmllint --xpath ".*'project'.*'scm'.*'connection'.*" ".*/sc/fiji/TrakEM2_/1.0f/TrakEM2_-1.0f.pom" (re)
66
\+ xmllint --xpath ".*'project'.*'parent'.*'groupId'.*" ".*/sc/fiji/TrakEM2_/1.0f/TrakEM2_-1.0f.pom" (re)

‎tests/melting-pot-prune.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Test that the '--prune' flag works as intended:
22

3-
$ 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
3+
$ 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
44
[INFO] net.imagej:imagej-common:0.15.1: fetching project source
55
[INFO] net.imagej:imagej-common:0.15.1: determining project dependencies
66
[INFO] net.imagej:imagej-common:0.15.1: processing project dependencies

‎tests/melting-pot-simple.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Down-the-middle test of a relatively simply project:
22

3-
$ 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
3+
$ 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
44
[INFO] net.imagej:imagej-common:0.15.1: fetching project source
55
[INFO] net.imagej:imagej-common:0.15.1: determining project dependencies
66
[INFO] net.imagej:imagej-common:0.15.1: processing project dependencies

‎travis-javadoc.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ then
5353
then
5454
cp "$customSettings" "$settingsFile"
5555
else
56-
# NB: Use maven.imagej.net as sole mirror if defined in <repositories>.
56+
# NB: Use maven.scijava.org as sole mirror if defined in <repositories>.
5757
# This hopefully avoids intermittent "ReasonPhrase:Forbidden" errors
5858
# when the Travis build pings Maven Central; see travis-ci/travis-ci#6593.
59-
test -f pom.xml && grep -A 2 '<repository>' pom.xml | grep -q 'maven.imagej.net' &&
59+
test -f pom.xml && grep -A 2 '<repository>' pom.xml | grep -q 'maven.scijava.org' &&
6060
cat >"$settingsFile" <<EOL
6161
<settings>
6262
<mirrors>
6363
<mirror>
64-
<id>imagej-mirror</id>
65-
<name>ImageJ mirror</name>
66-
<url>https://maven.imagej.net/content/groups/public/</url>
64+
<id>scijava-mirror</id>
65+
<name>SciJava mirror</name>
66+
<url>https://maven.scijava.org/content/groups/public/</url>
6767
<mirrorOf>*</mirrorOf>
6868
</mirror>
6969
</mirrors>

‎travisify.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ EOL
145145
fi
146146
if [ -f "$travisNotifyScript" ]
147147
then
148-
info "Removing obsolete $travisNotifyScript (ImageJ Jenkins is going away)"
148+
info "Removing obsolete $travisNotifyScript (ImageJ Jenkins is dead)"
149149
$EXEC git rm -f "$travisNotifyScript"
150150
fi
151151
$EXEC git diff-index --quiet HEAD -- || $EXEC git ci -m "Travis: remove obsolete files"
@@ -169,13 +169,13 @@ EOL
169169
releaseProfile=$(grep '<releaseProfiles>' pom.xml 2>/dev/null | sed 's/[^>]*>//' | sed 's/<.*//')
170170
if [ "$releaseProfile" ]
171171
then
172-
test "$releaseProfile" = 'deploy-to-imagej' ||
172+
test "$releaseProfile" = 'deploy-to-scijava' ||
173173
warn "Unknown release profile: $releaseProfile"
174174
else
175175
info 'Adding <releaseProfiles> property'
176176
cp pom.xml "$tmpFile"
177-
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"
178-
update pom.xml 'POM: deploy releases to the ImageJ repository'
177+
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"
178+
update pom.xml 'POM: deploy releases to the SciJava repository'
179179
fi
180180

181181
# update the README

0 commit comments

Comments
 (0)
0