projects
/
yaz4j-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change SSH port
[yaz4j-moved-to-github.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
9306750
..
3da5c1e
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-2,7
+2,7
@@
<modelVersion>4.0.0</modelVersion>
<groupId>org.yaz4j</groupId>
<artifactId>yaz4j-lib</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.yaz4j</groupId>
<artifactId>yaz4j-lib</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4</version>
<packaging>pom</packaging>
<!-- Project Information -->
<packaging>pom</packaging>
<!-- Project Information -->
@@
-214,7
+214,7
@@
<uniqueVersion>false</uniqueVersion>
<id>id-maven-repo</id>
<name>Index Data Maven Repository</name>
<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>
</repository>
<site>
<id>id-website</id>
@@
-233,10
+233,10
@@
<properties>
<platform>win32</platform>
<yaz.path>C:\Program Files\YAZ</yaz.path>
<properties>
<platform>win32</platform>
<yaz.path>C:\Program Files\YAZ</yaz.path>
- <swig>C:\Program Files\swigwin-2.0.7\swig</swig>
+ <swig>C:\Program Files\swigwin-2.0.9\swig</swig>
<!-- needed by swig -->
<yaz.include>"-I${yaz.path}\include"</yaz.include>
<!-- 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>
</properties>
<modules>
<module>win32</module>
@@
-251,7
+251,7
@@
</os>
</activation>
<properties>
</os>
</activation>
<properties>
- <platform>linux</platform>
+ <platform>linux</platform> <!-- no solaris etc -->
<packaging>so</packaging>
<!-- yaz-config executable -->
<yaz.config>yaz-config</yaz.config>
<packaging>so</packaging>
<!-- yaz-config executable -->
<yaz.config>yaz-config</yaz.config>
@@
-276,9
+276,12
@@
<configuration>
<tasks>
<exec executable="${yaz.config}"
<configuration>
<tasks>
<exec executable="${yaz.config}"
- outputproperty="yaz-config.include">
+ outputproperty="yaz-config.include"
+ errorproperty="yaz-config.error">
<arg value="--include" />
</exec>
<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}">
<condition property="yaz.include"
value="-I/usr/include"
else="${yaz-config.include}">
@@
-317,10
+320,9
@@
</profile>
<profile>
</profile>
<profile>
- <!-- osx is both 'unix' and 'mac' -->
+ <!-- osx family is both 'unix' and 'mac' -->
<id>osx</id>
<activation>
<id>osx</id>
<activation>
- <jdk>1.6</jdk>
<os>
<family>mac</family>
</os>
<os>
<family>mac</family>
</os>
@@
-328,8
+330,8
@@
<properties>
<platform>osx</platform>
<packaging>dylib</packaging>
<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>
</properties>
<modules>
<module>unix</module>
@@
-337,19
+339,16
@@
</profile>
<profile>
</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>
<activation>
- <jdk>[1.7,)</jdk>
- <os>
- <family>mac</family>
- </os>
+ <property>
+ <name>java.vendor</name>
+ <value>Apple Inc.</value>
+ </property>
</activation>
<properties>
</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>
</properties>
<modules>
<module>unix</module>