Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz4j

diff --combined pom.xml
index 3126e74,49e9ac9..a225618
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -251,7 -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>
@@@ -276,12 -276,9 +276,12 @@@
                  <configuration>
                    <tasks>
                      <exec executable="${yaz.config}" 
 -                      outputproperty="yaz-config.include">
 +                      outputproperty="yaz-config.include"
 +                      errorproperty="yaz-config.error">
                        <arg value="--include" />
                      </exec>
 +                    <echo 
 +                      message="yaz-config error (if any): ${yaz-config.error}"/>
                      <condition property="yaz.include" 
                        value="-I/usr/include"
                        else="${yaz-config.include}">
@@@ -320,10 -317,9 +320,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>
@@@ -331,8 -327,8 +330,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>
@@@ -340,19 -336,16 +339,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>