Merge branch 'developer-profiles'

dscho · dscho · commit afcae7fc9e07 · 2014-04-18T12:23:29.000-05:00
This topic branch teaches bump-pom-scijava to update the developer
profiles, too.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/bump-pom-scijava.sh b/bump-pom-scijava.sh
@@ -107,6 +107,7 @@ set imagej1.version --latest \
 	imagej-launcher.version --latest \
 	imagej-maven-plugin.version --latest \
 	imglib2.version --latest \
+	imglib2-ij.version --latest \
 	junit-benchmarks.version --latest \
 	minimaven.version --latest \
 	nar.version --latest \
@@ -171,8 +172,8 @@ else
 			imagej-maven-plugin.version)
 				ga=net.imagej:imagej-maven-plugin
 				;;
-			imglib2.version)
-				ga=net.imglib2:imglib2
+			imglib2.version|imglib2-ij.version)
+				ga=net.imglib2:${property%.version}
 				;;
 			junit-benchmarks.version)
 				ga=org.scijava:junit-benchmarks
@@ -208,8 +209,9 @@ else
 
 		p="$(sed_quote "$property")"
 		v="$(sed_quote "$value")"
+		# Set the primary property version
 		sed \
-		 -e "/<properties>/,/<\/properties>/s/\(<$p>\)[^<]*\(<\/$p>\)/\1$v\2/" \
+		 -e "/^	<properties>/,/^	<\/properties>/s/\(<$p>\)[^<]*\(<\/$p>\)/\1$v\2/" \
 		  $pom > $pom.new &&
 		if ! cmp $pom $pom.new
 		then
@@ -222,6 +224,22 @@ else
 		mv $pom.new $pom ||
 		die "Failed to set property $property = $value"
 
+		# Set the profile snapshot version
+		value="$(sh "$maven_helper" latest-version "$ga:SNAPSHOT")"
+		v="$(sed_quote "$value")"
+		sed -e "/<profiles>/,/<\/profiles>/s/\(<$p>\)[^<]*\(<\/$p>\)/\1$v\2/" \
+		  $pom > $pom.new &&
+		if ! cmp $pom $pom.new
+		then
+			message="$(printf '%s\n\t%s = %s%s' \
+				"$message" "$property" "$value" "$latest_message")"
+		elif test -n "$must_change"
+		then
+			die "Profile property $property not found in $pom"
+		fi &&
+		mv $pom.new $pom ||
+		die "Failed to set profile property $property = $value"
+
 		shift
 		shift
 	done
diff --git a/maven-helper.sh b/maven-helper.sh
@@ -8,7 +8,12 @@ set -e
 
 root_url () {
 	test snapshots != "$2" || {
-		echo http://maven.imagej.net/content/repositories/snapshots
+		if curl -fs http://maven.imagej.net/content/repositories/snapshots/"$1"/ > /dev/null 2>&1
+		then
+			echo http://maven.imagej.net/content/repositories/snapshots
+		else
+			echo http://maven.imagej.net/content/repositories/sonatype-snapshots
+		fi
 		return
 	}
 	echo http://maven.imagej.net/content/groups/public
@@ -108,17 +113,17 @@ project_url () {
 	version="$(version "$gav")"
 	case "$version" in
 	*SNAPSHOT)
-		echo "$(root_url $artifactId snapshots)/$infix"
+		echo "$(root_url $infix snapshots)/$infix"
 		;;
 	*)
 		# Release could be in either releases or thirdparty; try releases first
-		project_url="$(root_url $artifactId releases)/$infix"
+		project_url="$(root_url $infix releases)/$infix"
 		header=$(curl -Is "$project_url/")
 		case "$header" in
 		HTTP/1.?" 200 OK"*)
 			;;
 		*)
-			project_url="$(root_url $artifactId thirdparty)/$infix"
+			project_url="$(root_url $infix thirdparty)/$infix"
 			;;
 		esac
 		echo "$project_url"
@@ -135,15 +140,15 @@ jar_url () {
 	infix="$(groupId "$gav" | tr . /)/$artifactId/$version"
 	case "$version" in
 	*-SNAPSHOT)
-		url="$(root_url $artifactId snapshots)/$infix/maven-metadata.xml"
+		url="$(root_url $infix snapshots)/$infix/maven-metadata.xml"
 		metadata="$(curl -s "$url")"
 		timestamp="$(extract_tag timestamp "$metadata")"
 		buildNumber="$(extract_tag buildNumber "$metadata")"
 		version=${version%-SNAPSHOT}-$timestamp-$buildNumber
-		echo "$(root_url $artifactId snapshots)/$infix/$artifactId-$version.jar"
+		echo "$(root_url $infix snapshots)/$infix/$artifactId-$version.jar"
 		;;
 	*)
-		echo "$(root_url $artifactId releases)/$infix/$artifactId-$version.jar"
+		echo "$(root_url $infix releases)/$infix/$artifactId-$version.jar"
 		;;
 	esac
 }
