melting-pot: order components consistently

ctrueden · ctrueden · commit 92f2ce34ada3 · 2015-07-30T18:15:06.000-04:00
This makes regression testing easier.
diff --git a/melting-pot.sh b/melting-pot.sh
@@ -355,7 +355,8 @@ retrieveSource() {
 deps() {
 	cd "$1"
 	debug "mvn dependency:list"
-	mvn dependency:list | grep '^\[INFO\]    [^ ]' | sed 's/\[INFO\]    //'
+	mvn dependency:list |
+		grep '^\[INFO\]    [^ ]' | sed 's/\[INFO\]    //' | sort
 	cd - > /dev/null
 }
 
diff --git a/tests/melting-pot-multi.t b/tests/melting-pot-multi.t
@@ -16,7 +16,7 @@ Test that recursive SCM retrieval and multi-module projects work:
   + xmllint --xpath "//*[local-name()='project']/*[local-name()='artifactId']" "sc.fiji/TrakEM2_/pom.xml"
   + xmllint --xpath "//*[local-name()='project']/*[local-name()='artifactId']" "sc.fiji/TrakEM2_/TrakEM2_/pom.xml"
   [INFO] Skipping the build; the command would have been:
-  [INFO] mvn -Denforcer.skip -Dnone.version= -Dmpicbg.version=1.0.1 -Djunit.version=4.11 -Dij.version=1.49p -Dhamcrest-core.version=1.3 -Dtools.version=1.4.2 -Djama.version=1.0.3 -Dmpicbg.version=1.0.1 -Dlegacy-imglib1.version=1.1.2-DEPRECATED -DFiji_Plugins.version=3.0.0 -Dlogback-core.version=1.1.1 -DVIB_.version=2.0.2 -Dmpicbg-trakem2.version=1.2.2 -Djoda-time.version=2.3 -D3D_Viewer.version=3.0.1 -Djama.version=1.0.3 -Dimglib2.version=2.2.1 -DLasso_and_Blow_Tool.version=2.0.1 -DSkeletonize3D_.version=1.0.1 -Dudunits.version=4.3.18 -Deventbus.version=1.4 -Dvecmath.version=1.5.2 -Dj3d-core-utils.version=1.5.2 -Dformats-common.version=5.0.7 -Dimagej-common.version=0.12.2 -Dgentyref.version=1.1.0 -Djai-codec.version=1.1.3 -Djgoodies-forms.version=1.7.2 -Dperf4j.version=0.9.13 -Dmpicbg_.version=1.0.1 -Dbatik.version=1.8 -Dnative-lib-loader.version=2.0.2 -Djai_imageio.version=5.0.7 -DVIB-lib.version=2.0.1 -Djgoodies-common.version=1.7.0 -Djfreechart.version=1.0.19 -Dij.version=1.49p -DbUnwarpJ_.version=2.6.2 -Dslf4j-api.version=1.7.6 -Dspecification.version=5.0.7 -Dformats-api.version=5.0.7 -Dpal-optimization.version=2.0.0 -DVectorString.version=1.0.2 -Dpostgresql.version=8.2-507.jdbc3 -Djcommon.version=1.0.23 -Dlogback-classic.version=1.1.1 -Dome-xml.version=5.0.7 -Dtools.version=1.4.2 -Dj3d-core.version=1.5.2 -DAnalyzeSkeleton_.version=2.0.4 -Djavassist.version=3.16.1-GA -DSimple_Neurite_Tracer.version=2.0.3 -Dformats-bsd.version=5.0.7 -Dfiji-lib.version=2.1.0 -Dimglib2-ij.version=2.0.0-beta-30 -Dscijava-common.version=2.39.0 -Dturbojpeg.version=5.0.7 -Dcommons-math3.version=3.4.1 -Dij1-patcher.version=0.12.0 -Dimglib2-roi.version=0.3.0 -Djython-shaded.version=2.5.3 -Dkryo.version=2.21 -Djai-core.version=1.1.3 -Dmines-jtk.version=20100113 -Dtrove4j.version=3.0.3 -Dlevel_sets.version=1.0.1 test
+  [INFO] mvn -Denforcer.skip -Dbatik.version=1.8 -Dlogback-classic.version=1.1.1 -Dlogback-core.version=1.1.1 -Dkryo.version=2.21 -Dgentyref.version=1.1.0 -Djgoodies-common.version=1.7.0 -Djgoodies-forms.version=1.7.2 -Djai-codec.version=1.1.3 -Dtools.version=1.4.2 -Dtools.version=1.4.2 -Dmines-jtk.version=20100113 -Dudunits.version=4.3.18 -Djama.version=1.0.3 -Djama.version=1.0.3 -Dj3d-core-utils.version=1.5.2 -Dj3d-core.version=1.5.2 -Dvecmath.version=1.5.2 -Djai-core.version=1.1.3 -Djoda-time.version=2.3 -Djunit.version=4.11 -Dmpicbg.version=1.0.1 -Dmpicbg.version=1.0.1 -Dmpicbg_.version=1.0.1 -Dij1-patcher.version=0.12.0 -Dij.version=1.49p -Dij.version=1.49p -Dimagej-common.version=0.12.2 -Dimglib2-ij.version=2.0.0-beta-30 -Dimglib2-roi.version=0.3.0 -Dimglib2.version=2.2.1 -Dtrove4j.version=3.0.3 -Dnone.version= -Dformats-api.version=5.0.7 -Dformats-bsd.version=5.0.7 -Dformats-common.version=5.0.7 -Djai_imageio.version=5.0.7 -Dome-xml.version=5.0.7 -Dspecification.version=5.0.7 -Dturbojpeg.version=5.0.7 -Dcommons-math3.version=3.4.1 -Deventbus.version=1.4 -Dhamcrest-core.version=1.3 -Djavassist.version=3.16.1-GA -Djcommon.version=1.0.23 -Djfreechart.version=1.0.19 -Dperf4j.version=0.9.13 -Djython-shaded.version=2.5.3 -Dnative-lib-loader.version=2.0.2 -Dscijava-common.version=2.39.0 -Dslf4j-api.version=1.7.6 -Dpostgresql.version=8.2-507.jdbc3 -D3D_Viewer.version=3.0.1 -DAnalyzeSkeleton_.version=2.0.4 -DFiji_Plugins.version=3.0.0 -DLasso_and_Blow_Tool.version=2.0.1 -DSimple_Neurite_Tracer.version=2.0.3 -DSkeletonize3D_.version=1.0.1 -DVIB-lib.version=2.0.1 -DVIB_.version=2.0.2 -DVectorString.version=1.0.2 -DbUnwarpJ_.version=2.6.2 -Dfiji-lib.version=2.1.0 -Dlegacy-imglib1.version=1.1.2-DEPRECATED -Dlevel_sets.version=1.0.1 -Dmpicbg-trakem2.version=1.2.2 -Dpal-optimization.version=2.0.0 test
   [INFO] sc.fiji:TrakEM2_:1.0f: complete
 
   $ find melting-pot -maxdepth 2 | sort
diff --git a/tests/melting-pot-prune.t b/tests/melting-pot-prune.t
@@ -14,7 +14,7 @@ Test that the '--prune' flag works as intended:
   [INFO] Pruning irrelevant component: net.imglib2/imglib2-roi
   [INFO] Generating aggregator POM
   [INFO] Skipping the build; the command would have been:
-  [INFO] mvn -Denforcer.skip -Dimglib2-roi.version=0.3.0 -Djunit.version=4.11 -Dhamcrest-core.version=1.3 -Dimglib2.version=2.2.1 -Dtrove4j.version=3.0.3 -Dgentyref.version=1.1.0 -Dudunits.version=4.3.18 -Deventbus.version=1.4 -Dscijava-common.version=2.44.2 test
+  [INFO] mvn -Denforcer.skip -Dgentyref.version=1.1.0 -Dudunits.version=4.3.18 -Djunit.version=4.11 -Dimglib2-roi.version=0.3.0 -Dimglib2.version=2.2.1 -Dtrove4j.version=3.0.3 -Deventbus.version=1.4 -Dhamcrest-core.version=1.3 -Dscijava-common.version=2.44.2 test
   [INFO] net.imagej:imagej-common:0.15.1: complete
 
   $ find melting-pot -maxdepth 2 | sort
diff --git a/tests/melting-pot-simple.t b/tests/melting-pot-simple.t
@@ -8,7 +8,7 @@ Down-the-middle test of a relatively simply project:
   [INFO] net.imagej:imagej-common:0.15.1: processing changed components
   [INFO] Generating aggregator POM
   [INFO] Skipping the build; the command would have been:
-  [INFO] mvn -Denforcer.skip -Dimglib2-roi.version=0.3.0 -Djunit.version=4.11 -Dhamcrest-core.version=1.3 -Dimglib2.version=2.2.1 -Dtrove4j.version=3.0.3 -Dgentyref.version=1.1.0 -Dudunits.version=4.3.18 -Deventbus.version=1.4 -Dscijava-common.version=2.44.2 test
+  [INFO] mvn -Denforcer.skip -Dgentyref.version=1.1.0 -Dudunits.version=4.3.18 -Djunit.version=4.11 -Dimglib2-roi.version=0.3.0 -Dimglib2.version=2.2.1 -Dtrove4j.version=3.0.3 -Deventbus.version=1.4 -Dhamcrest-core.version=1.3 -Dscijava-common.version=2.44.2 test
   [INFO] net.imagej:imagej-common:0.15.1: complete
 
   $ find melting-pot -maxdepth 2 | sort

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,8 @@ retrieveSource() {`
`355`	`355`	`deps() {`
`356`	`356`	`cd "$1"`
`357`	`357`	`debug "mvn dependency:list"`
`358`		`- mvn dependency:list \| grep '^\[INFO\] [^ ]' \| sed 's/\[INFO\] //'`
	`358`	`+ mvn dependency:list \|`
	`359`	`+ grep '^\[INFO\] [^ ]' \| sed 's/\[INFO\] //' \| sort`
`359`	`360`	`cd - > /dev/null`
`360`	`361`	`}`
`361`	`362`