fix support of SCRAM authentification in PostgreSQL (#448)

claeis · Sep 5, 2023 · 1cfc054 · 1cfc054
1 parent a366189
commit 1cfc054
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 10 deletions.
diff --git a/README.rst b/README.rst
@@ -18,7 +18,7 @@ ili2db is in stable state.
 
 System Requirements
 ===================
-For the current version of ili2db, you will need a JRE (Java Runtime Environment) installed on your system, version 1.6 or later.
+For the current version of ili2db, you will need a JRE (Java Runtime Environment) installed on your system, version 1.8 or later.
 The JRE (Java Runtime Environment) can be downloaded for free from the Website <http://www.java.com/>.
 
 Download ili2db

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'ch.interlis'
-version '4.11.2'+System.getProperty('release','-SNAPSHOT')
+version '5.0.0'+System.getProperty('release','-SNAPSHOT')
 
 apply plugin: "java"
 apply plugin: "maven"
@@ -8,8 +8,8 @@ apply plugin: "maven"
 if(!JavaVersion.current().isJava8()){
   compileJava.options.compilerArgs.addAll(['--release', '6'])
 }else{
-  sourceCompatibility = JavaVersion.VERSION_1_6 
-  targetCompatibility = JavaVersion.VERSION_1_6
+  sourceCompatibility = JavaVersion.VERSION_1_8 
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 compileJava.options.encoding = 'US-ASCII'
 
@@ -335,8 +335,8 @@ dependencies {
     testImplementation 'org.xmlunit:xmlunit-matchers:2.8.2'
     testImplementation 'org.xmlunit:xmlunit-placeholders:2.8.2'
 
-	ili2pgImplementation group: 'org.postgresql', name: 'postgresql', version: '42.2.18.jre6'
-	compileOnly group: 'org.postgresql', name: 'postgresql', version: '42.2.18.jre6' // add as compileOnly, so that eclipse sees it
+	ili2pgImplementation group: 'org.postgresql', name: 'postgresql', version: '42.6.0' 
+	compileOnly group: 'org.postgresql', name: 'postgresql', version: '42.6.0' // add as compileOnly, so that eclipse sees it
 	ili2pgImplementation group: 'com.github.waffle', name: 'waffle-jna', version: '1.9.1'
 	compileOnly group: 'com.github.waffle', name: 'waffle-jna', version: '1.9.1' // add as compileOnly, so that eclipse sees it
 	ili2gpkgImplementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2'

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -11,6 +11,11 @@ ideas/open issues/questions
 - einfache Liste mit den neu erzeugten Vertexpunkte (aufgrund der Overlap-Bereinigung)
 - Schalter f�r das "disablen" der Overlaps-Bereinigung. Bei vorhandenen gueltigen Overlaps erfolgen: a) Import mit NULL als Polygon, ohne Fehlermeldung, b) Import mit NULL als Polygon, mit Warning, c) kein Import, Fehlermeldung
 
+ili2db 5.0.0 (SNAPSHOT)
+---------------------------
+- JRE 1.8
+- org.postgresql:postgresql:42.6.0
+
 ili2db 4.11.1 (2023-08-22)
 ---------------------------
 - ili2gpkg: new option --gpkgMultiGeomPerTable to create multi geom col tables (#511)

diff --git a/docs/README.src.txt b/docs/README.src.txt
@@ -7,7 +7,7 @@ Status
 ili2ora is in beta/transition state.
 
 System Configuration
-In order to compile ili2ora, a JAVA software development kit (JDK) version 1.6 or a more recent version must be installed on your system.
+In order to compile ili2ora, a JAVA software development kit (JDK) version 1.8 or a more recent version must be installed on your system.
 A free version of the JAVA software development kit (JDK) is available at the website http://java.sun.com/j2se/.
 Also required is the build tool ant. Download it from http://ant.apache.org and install it as documented there.
 

diff --git a/docs/README.txt b/docs/README.txt
@@ -12,7 +12,7 @@ Status
 ili2ora is in beta/transition state.
 
 System Requirements
-For the current version of ili2ora, you will need a JRE (Java Runtime Environment) installed on your system, version 1.6 or later.
+For the current version of ili2ora, you will need a JRE (Java Runtime Environment) installed on your system, version 1.8 or later.
 The JRE (Java Runtime Environment) can be downloaded for free from the Website http://www.java.com/ .
 ili2ora was tested with Oracle 9.
 

diff --git a/docs/ili2db.rst b/docs/ili2db.rst
@@ -154,7 +154,7 @@ Um solche Daten zu importieren (um sie danach zu flicken)::
 Laufzeitanforderungen
 ---------------------
 
-Das Programm setzt Java 1.6 voraus.
+Das Programm setzt Java 1.8 voraus.
 
 **PostGIS:** Als Datenbank muss mindestens PostgreSQL 8.3 und PostGIS
 1.5 vorhanden sein. Falls das Interlis Datenmodell INTERLIS.UUIDOID als 

diff --git a/docs/ili2db_es.rst b/docs/ili2db_es.rst
@@ -95,7 +95,7 @@ por lo normal se emite desde antes.::
 Requisitos de sistema en tiempo de ejecución
 --------------------------------------------
 
-El programa requiere Java 1.6.
+El programa requiere Java 1.8.
 
 **PostGIS:** Se requiere por lo menos PostgreSQL 8.3 con PostGIS 1.5. En
 el caso de usar el modelo de datos Interlis INTERLIS.UUIDOID como OID,

diff --git a/ili2pg/test/java/ch/ehi/ili2db/CatalogueObjectsTest.java b/ili2pg/test/java/ch/ehi/ili2db/CatalogueObjectsTest.java
@@ -46,6 +46,7 @@ public Config initConfig(String xtfFilename,String dbschema,String logfile) {
 		if(dbschema!=null){
 			config.setDbschema(dbschema);
 		}
+        config.setSetupPgExt(true);
 		if(logfile!=null){
 			config.setLogfile(logfile);
 		}

diff --git a/ili2pg/test/java/ch/ehi/ili2pg/PgTestSetup.java b/ili2pg/test/java/ch/ehi/ili2pg/PgTestSetup.java
@@ -32,6 +32,7 @@ public Config initConfig(String xtfFilename,String logfile) {
         if(dbschema!=null){
             config.setDbschema(dbschema);
         }
+        config.setSetupPgExt(true);
         if(logfile!=null){
             config.setLogfile(logfile);
         }
@@ -50,6 +51,7 @@ protected void initConfig(Config config) {
         if(dbschema!=null) {
             config.setDbschema(dbschema);
         }
+        config.setSetupPgExt(true);
     }
     @Override
     public String prefixName(String name) {