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

diff --git a/NEWS b/NEWS
new file mode 100644 (file)
index 0000000..f43cd55
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,36 @@
+--- 1.2 2010/04/22
+
+Changes to the API:
+
+* add Connection close that shutdowns socket without destroying the object
+* rename ResultSet getSize to getHitCount
+
+Bug fixes:
+
+* #3115 - fix JVM crash when fetching records in unsupported syntax caused
+  by null ptr dereference, handle record errors during search and in-record 
+  errors
+* properly deallocate records not managed by a result set
+
+
+--- 1.1 2010/02/22
+
+Major changes to the API:
+
+* using Java naming conventions
+* simplified/removed less used classes
+* using standard Java container types instead of of binded natives
+* use checked exceptions for all app/protocol layer errors
+
+Major changes to the code layout, using Maven to manage build.
+
+Bug fixes:
+
+* #3122 - out of memory bug caused by ResultSet using memory proportional 
+  to the number of hits
+
+--- 1.0 2009/09/22
+
+Initial version after receiving the code from Talis.
+
+Added JUnit test cases. 

diff --git a/any/pom.xml b/any/pom.xml
index 053d97f..86f8f32 100644 (file)
--- a/any/pom.xml
+++ b/any/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yaz4j</groupId>
     <artifactId>yaz4j</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>yaz4j-any</artifactId>
   <name>yaz4j-any</name>

diff --git a/linux/pom.xml b/linux/pom.xml
index d8fe07a..bf46f40 100644 (file)
--- a/linux/pom.xml
+++ b/linux/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yaz4j</groupId>
     <artifactId>yaz4j</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <groupId>org.yaz4j</groupId>
   <artifactId>libyaz4j</artifactId>

diff --git a/mkdist.sh b/mkdist.sh
index 3afe151..dc7f352 100755 (executable)
--- a/mkdist.sh
+++ b/mkdist.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-V=1.1
+V=1.2
 git archive --format=tar --prefix=yaz4j-$V/ v$V |gzip >yaz4j-$V.tar.gz

diff --git a/pom.xml b/pom.xml
index 6d81b55..9d15056 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.yaz4j</groupId>
   <artifactId>yaz4j</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- Project Information -->