From: Jakub Skoczen <jakub@indexdata.dk>
Date: Mon, 31 Mar 2014 12:22:25 +0000 (+0200)
Subject: Workaround for MNG-3328
X-Git-Tag: v1.4~4^2
X-Git-Url: http://git.indexdata.com/?p=yaz4j-moved-to-github.git;a=commitdiff_plain;h=e8d742a9988f62bf7413243ae28b1d4eafc2ffe5

Workaround for MNG-3328

Maven profile activation is buggy and evaluates criteria as an ORed list.
Thus it's impossible to match environment for jdk > 1.6 AND os.family = mac

This workaround uses the java.vm.vendor property which is 'Apple Inc.' only
for apple provided JDKs (mac only and jdk < 1.7).
---

diff --git a/pom.xml b/pom.xml
index 9306750..49e9ac9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,7 +251,7 @@
         </os>
       </activation>
       <properties>
-        <platform>linux</platform>
+        <platform>linux</platform> <!-- no solaris etc -->
         <packaging>so</packaging>
         <!-- yaz-config executable -->
         <yaz.config>yaz-config</yaz.config>
@@ -317,10 +317,9 @@
     </profile>
 
     <profile>
-      <!-- osx is both 'unix' and 'mac' -->
+      <!-- osx family is both 'unix' and 'mac' -->
       <id>osx</id>
       <activation>
-        <jdk>1.6</jdk>
         <os>
           <family>mac</family>
         </os>
@@ -328,8 +327,8 @@
       <properties>
         <platform>osx</platform>
         <packaging>dylib</packaging>
-        <javahOS>mac</javahOS>
-        <jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
+        <javahOS>darwin</javahOS>
+        <jdkIncludePath>${java.home}/../include</jdkIncludePath>
       </properties>
       <modules>
         <module>unix</module>
@@ -337,19 +336,16 @@
     </profile>
 
     <profile>
-      <!-- osx is both 'unix' and 'mac', oracle JDK has different layout -->
-      <id>osx-oracle</id>
+      <!-- Apple JDK has a different include layout -->
+      <id>apple-jdk</id>
       <activation>
-        <jdk>[1.7,)</jdk>
-        <os>
-          <family>mac</family>
-        </os>
+        <property>
+          <name>java.vendor</name>
+          <value>Apple Inc.</value>
+        </property>
       </activation>
       <properties>
-        <platform>osx</platform>
-        <packaging>dylib</packaging>
-        <javahOS>darwin</javahOS>
-        <jdkIncludePath>${java.home}/../include</jdkIncludePath>
+        <jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
       </properties>
       <modules>
         <module>unix</module>