Switch order of family and arch platform profiles

By putting families below arches, we can have the macosx profile set the
arch to "universal" in cases where the convention is a universal binary;
see next commit.

This commit is best viewed with "git diff --patience".

Author: ctrueden

pom.xml

@@ -2089,126 +2089,124 @@
 		<classifier>${scijava.natives.classifier}</classifier> in the dependency.
 		See https://github.com/flimlib/flimj-ops for an example.
 		-->
-
 		<profile>
-			<id>scijava-platform-windows</id>
+			<id>scijava-platform-x86</id>
 			<activation>
 				<os>
-					<family>windows</family>
+					<arch>x86</arch>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.family.short>win</scijava.platform.family.short>
-				<scijava.platform.family.medium>windows</scijava.platform.family.medium>
-				<scijava.platform.family.long>windows</scijava.platform.family.long>
-				<scijava.platform.family.longest>windows</scijava.platform.family.longest>
+				<scijava.platform.arch>32</scijava.platform.arch>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-macos</id>
+			<id>scijava-platform-i386</id>
 			<activation>
 				<os>
-					<family>mac</family>
+					<arch>i386</arch>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.family.short>mac</scijava.platform.family.short>
-				<scijava.platform.family.medium>osx</scijava.platform.family.medium>
-				<scijava.platform.family.long>macos</scijava.platform.family.long>
-				<scijava.platform.family.longest>macosx</scijava.platform.family.longest>
+				<scijava.platform.arch>32</scijava.platform.arch>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-linux</id>
+			<id>scijava-platform-i486</id>
 			<activation>
 				<os>
-					<family>unix</family>
-					<name>Linux</name>
+					<arch>i486</arch>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.family.short>linux</scijava.platform.family.short>
-				<scijava.platform.family.medium>linux</scijava.platform.family.medium>
-				<scijava.platform.family.long>linux</scijava.platform.family.long>
-				<scijava.platform.family.longest>linux</scijava.platform.family.longest>
+				<scijava.platform.arch>32</scijava.platform.arch>
 			</properties>
 		</profile>
-
 		<profile>
-			<id>scijava-platform-x86</id>
+			<id>scijava-platform-i586</id>
 			<activation>
 				<os>
-					<arch>x86</arch>
+					<arch>i586</arch>
 				</os>
 			</activation>
 			<properties>
 				<scijava.platform.arch>32</scijava.platform.arch>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-i386</id>
+			<id>scijava-platform-i686</id>
 			<activation>
 				<os>
-					<arch>i386</arch>
+					<arch>i686</arch>
 				</os>
 			</activation>
 			<properties>
 				<scijava.platform.arch>32</scijava.platform.arch>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-i486</id>
+			<id>scijava-platform-amd64</id>
 			<activation>
 				<os>
-					<arch>i486</arch>
+					<arch>amd64</arch>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.arch>32</scijava.platform.arch>
+				<scijava.platform.arch>64</scijava.platform.arch>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-i586</id>
+			<id>scijava-platform-x86_64</id>
 			<activation>
 				<os>
-					<arch>i586</arch>
+					<arch>x86_64</arch>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.arch>32</scijava.platform.arch>
+				<scijava.platform.arch>64</scijava.platform.arch>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-i686</id>
+			<id>scijava-platform-windows</id>
 			<activation>
 				<os>
-					<arch>i686</arch>
+					<family>windows</family>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.arch>32</scijava.platform.arch>
+				<scijava.platform.family.short>win</scijava.platform.family.short>
+				<scijava.platform.family.medium>windows</scijava.platform.family.medium>
+				<scijava.platform.family.long>windows</scijava.platform.family.long>
+				<scijava.platform.family.longest>windows</scijava.platform.family.longest>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-amd64</id>
+			<id>scijava-platform-macos</id>
 			<activation>
 				<os>
-					<arch>amd64</arch>
+					<family>mac</family>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.arch>64</scijava.platform.arch>
+				<scijava.platform.family.short>mac</scijava.platform.family.short>
+				<scijava.platform.family.medium>osx</scijava.platform.family.medium>
+				<scijava.platform.family.long>macos</scijava.platform.family.long>
+				<scijava.platform.family.longest>macosx</scijava.platform.family.longest>
 			</properties>
 		</profile>
 		<profile>
-			<id>scijava-platform-x86_64</id>
+			<id>scijava-platform-linux</id>
 			<activation>
 				<os>
-					<arch>x86_64</arch>
+					<family>unix</family>
+					<name>Linux</name>
 				</os>
 			</activation>
 			<properties>
-				<scijava.platform.arch>64</scijava.platform.arch>
+				<scijava.platform.family.short>linux</scijava.platform.family.short>
+				<scijava.platform.family.medium>linux</scijava.platform.family.medium>
+				<scijava.platform.family.long>linux</scijava.platform.family.long>
+				<scijava.platform.family.longest>linux</scijava.platform.family.longest>
 			</properties>
 		</profile>
 	</profiles>