Skip to content

Commit a8b0a06

Browse files
committed
Use scijava.platform for platform-related props
Should have done this before releasing 7.0.0. But better now than later.
1 parent 769eb00 commit a8b0a06

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

pom.xml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.scijava</groupId>
66
<artifactId>pom-scijava-base</artifactId>
7-
<version>7.0.1-SNAPSHOT</version>
7+
<version>8.0.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<name>SciJava Base POM</name>
@@ -185,7 +185,7 @@
185185
Classifier name for referencing platform-specific artifacts.
186186
By default, this matches the scijava/native-lib-loader naming scheme.
187187
-->
188-
<scijava.natives.classifier>natives-${scijava.natives.family.medium}_${scijava.natives.bits}</scijava.natives.classifier>
188+
<scijava.natives.classifier>natives-${scijava.platform.family.medium}_${scijava.platform.bits}</scijava.natives.classifier>
189189

190190
<!-- Additional configuration -->
191191

@@ -1948,88 +1948,88 @@
19481948
</profile>
19491949

19501950
<!--
1951-
The following profiles set the scijava.natives.classifier system property
1952-
to match the detected architecture. The main intended use case is for
1951+
The following profiles set the scijava.platform system properties to
1952+
match the detected architecture. The main intended use case is for
19531953
platform-specific natives artifacts, so that they can be depended on using
19541954
<classifier>${scijava.natives.classifier}</classifier> in the dependency.
19551955
See https://github.com/slim-curve/slim-curve-ops for an example.
19561956
-->
19571957

19581958
<profile>
1959-
<id>scijava-natives-windows</id>
1959+
<id>scijava-platform-windows</id>
19601960
<activation>
19611961
<os>
19621962
<family>windows</family>
19631963
</os>
19641964
</activation>
19651965
<properties>
1966-
<scijava.natives.family.short>win</scijava.natives.family.short>
1967-
<scijava.natives.family.medium>windows</scijava.natives.family.medium>
1968-
<scijava.natives.family.long>windows</scijava.natives.family.long>
1969-
<scijava.natives.family.longest>windows</scijava.natives.family.longest>
1966+
<scijava.platform.family.short>win</scijava.platform.family.short>
1967+
<scijava.platform.family.medium>windows</scijava.platform.family.medium>
1968+
<scijava.platform.family.long>windows</scijava.platform.family.long>
1969+
<scijava.platform.family.longest>windows</scijava.platform.family.longest>
19701970
</properties>
19711971
</profile>
19721972
<profile>
1973-
<id>scijava-natives-macos</id>
1973+
<id>scijava-platform-macos</id>
19741974
<activation>
19751975
<os>
19761976
<family>mac</family>
19771977
</os>
19781978
</activation>
19791979
<properties>
1980-
<scijava.natives.family.short>mac</scijava.natives.family.short>
1981-
<scijava.natives.family.medium>osx</scijava.natives.family.medium>
1982-
<scijava.natives.family.long>macos</scijava.natives.family.long>
1983-
<scijava.natives.family.longest>macosx</scijava.natives.family.longest>
1980+
<scijava.platform.family.short>mac</scijava.platform.family.short>
1981+
<scijava.platform.family.medium>osx</scijava.platform.family.medium>
1982+
<scijava.platform.family.long>macos</scijava.platform.family.long>
1983+
<scijava.platform.family.longest>macosx</scijava.platform.family.longest>
19841984
</properties>
19851985
</profile>
19861986
<profile>
1987-
<id>scijava-natives-linux</id>
1987+
<id>scijava-platform-linux</id>
19881988
<activation>
19891989
<os>
19901990
<family>unix</family>
19911991
<name>Linux</name>
19921992
</os>
19931993
</activation>
19941994
<properties>
1995-
<scijava.natives.family.short>linux</scijava.natives.family.short>
1996-
<scijava.natives.family.medium>linux</scijava.natives.family.medium>
1997-
<scijava.natives.family.long>linux</scijava.natives.family.long>
1998-
<scijava.natives.family.longest>linux</scijava.natives.family.longest>
1995+
<scijava.platform.family.short>linux</scijava.platform.family.short>
1996+
<scijava.platform.family.medium>linux</scijava.platform.family.medium>
1997+
<scijava.platform.family.long>linux</scijava.platform.family.long>
1998+
<scijava.platform.family.longest>linux</scijava.platform.family.longest>
19991999
</properties>
20002000
</profile>
20012001

20022002
<profile>
2003-
<id>scijava-natives-amd64</id>
2003+
<id>scijava-platform-amd64</id>
20042004
<activation>
20052005
<os>
20062006
<arch>amd64</arch>
20072007
</os>
20082008
</activation>
20092009
<properties>
2010-
<scijava.natives.bits>64</scijava.natives.bits>
2010+
<scijava.platform.bits>64</scijava.platform.bits>
20112011
</properties>
20122012
</profile>
20132013
<profile>
2014-
<id>scijava-natives-x86_64</id>
2014+
<id>scijava-platform-x86_64</id>
20152015
<activation>
20162016
<os>
20172017
<arch>x86_64</arch>
20182018
</os>
20192019
</activation>
20202020
<properties>
2021-
<scijava.natives.bits>64</scijava.natives.bits>
2021+
<scijava.platform.bits>64</scijava.platform.bits>
20222022
</properties>
20232023
</profile>
20242024
<profile>
2025-
<id>scijava-natives-x86</id>
2025+
<id>scijava-platform-x86</id>
20262026
<activation>
20272027
<os>
20282028
<arch>x86</arch>
20292029
</os>
20302030
</activation>
20312031
<properties>
2032-
<scijava.natives.bits>32</scijava.natives.bits>
2032+
<scijava.platform.bits>32</scijava.platform.bits>
20332033
</properties>
20342034
</profile>
20352035
</profiles>

0 commit comments

Comments
 (0)