X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pom.xml;h=50180c1d4e3462940b25d6f099289c59ea17e7db;hb=3fb2e9759acb3cdfacc16f083ed517daa2588ffa;hp=392aee96a3fad4c6bf60fd39625fd8f1bb4a1c8d;hpb=38ec3ec40d3f720aba455760ed09a93745070e41;p=yaz4j-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index 392aee9..50180c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.yaz4j</groupId>
   <artifactId>yaz4j-lib</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <prerequisites>
+    <maven>3.0.4</maven>
+  </prerequisites>
+
   <!-- Project Information -->
   <name>yaz4j</name>
   <url>http://www.indexdata.com/yaz4j/</url>
@@ -12,11 +16,15 @@
   <licenses>
     <license>
       <name>BSD</name>
-      <url>http://www.opensource.org/licenses/bsd-license.php</url>
+      <url>http://www.opensource.org/licenses/BSD-3-Clause</url>
     </license>
   </licenses>
   <description>Java wrapper for the ZOOM API of YAZ</description>
 
+  <organization>
+    <name>Index Data</name>
+  </organization>
+
   <developers>
     <developer>
       <name>Rob Styles</name>
@@ -105,13 +113,14 @@
 
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
         <executions>
           <execution>
             <id>generate-sources</id>
             <phase>generate-sources</phase>
             <inherited>false</inherited>
             <configuration>
-              <tasks>
+              <target>
                 <echo message="Using include: ${yaz.include}"/>
                 <mkdir dir="target/generated-sources/java/org/yaz4j/jni"/>
                 <mkdir dir="target/generated-sources/native" />
@@ -128,7 +137,7 @@
                   <arg value="-java"/>
                   <arg value="src/main/swig/libyaz4j.i"/>
                 </exec>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -146,6 +155,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.15</version>
         <configuration>
           <enableRSS>false</enableRSS>
           <include>**/*.java</include>
@@ -158,6 +168,7 @@
         <artifactId>
           maven-project-info-reports-plugin
         </artifactId>
+        <version>2.8</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -175,6 +186,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.3</version>
         <configuration>
           <chartset>UTF-8</chartset>
           <excludePackageNames>org.yaz4j.jni</excludePackageNames>
@@ -210,7 +222,7 @@
       <uniqueVersion>false</uniqueVersion>
       <id>id-maven-repo</id>
       <name>Index Data Maven Repository</name>
-      <url>scp://maven.indexdata.com:222/var/www/maven/repository</url>
+      <url>scp://maven.indexdata.com:22/var/www/maven/repository</url>
     </repository>
     <site>
       <id>id-website</id>
@@ -229,10 +241,10 @@
       <properties>
         <platform>win32</platform>
         <yaz.path>C:\Program Files\YAZ</yaz.path>
-        <swig>C:\Program Files\swigwin-2.0.7\swig</swig>
+        <swig>swig</swig>
         <!-- needed by swig -->
         <yaz.include>"-I${yaz.path}\include"</yaz.include>
-        <yaz.libs>"${yaz.path}\lib\yaz4.lib"</yaz.libs>
+        <yaz.libs>"${yaz.path}\lib\yaz5.lib"</yaz.libs>
       </properties>
       <modules>
         <module>win32</module>
@@ -247,7 +259,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>
@@ -270,16 +282,24 @@
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <tasks>
+                  <target>
                     <exec executable="${yaz.config}" 
-                      outputproperty="yaz.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}">
+                      <equals arg1="${yaz-config.include}" arg2=""/>
+                    </condition>
                     <echo message="YAZ INCLUDE=${yaz.include}"/>
                     <mkdir dir="${basedir}/target"/>
                     <echo file="${basedir}/target/swig.properties"
                       message="yaz.include=${yaz.include}"/>
-                  </tasks>
+                  </target>
                 </configuration>
               </execution>
             </executions>
@@ -308,7 +328,7 @@
     </profile>
 
     <profile>
-      <!-- osx is both 'unix' and 'mac' -->
+      <!-- osx family is both 'unix' and 'mac' -->
       <id>osx</id>
       <activation>
         <os>
@@ -318,13 +338,31 @@
       <properties>
         <platform>osx</platform>
         <packaging>dylib</packaging>
-        <javahOS>mac</javahOS>
+        <javahOS>darwin</javahOS>
+        <jdkIncludePath>${java.home}/../include</jdkIncludePath>
+      </properties>
+      <modules>
+        <module>unix</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <!-- Apple JDK has a different include layout -->
+      <id>apple-jdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>Apple Inc.</value>
+        </property>
+      </activation>
+      <properties>
         <jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
       </properties>
       <modules>
         <module>unix</module>
       </modules>
     </profile>
+
   </profiles>
 </project>