Merge remote-tracking branch 'origin/gretl_3.0' into renovate/configure

# Conflicts:
#	.github/workflows/gretl.yml
#	gretl/build.gradle

.github/workflows/gretl.yml

@@ -83,12 +83,12 @@ jobs:
           images: sogis/gretl
           labels: |
             org.opencontainers.image.title=gretl
-            org.opencontainers.image.version=2.2.${{ github.run_number }}
+            org.opencontainers.image.version=3.0.${{ github.run_number }}
             org.opencontainers.image.base.name=docker.io/eclipse-temurin:11-jdk-alpine
           tags: |
-            type=raw,value=2.3.${{ github.run_number }},enable=true,priority=200
-            type=raw,value=2.3,enable=true,priority=200
-            type=raw,value=2,enable=true,priority=200
+            type=raw,value=3.0.${{ github.run_number }},enable=true,priority=200
+            type=raw,value=3.0,enable=true,priority=200
+            type=raw,value=3,enable=true,priority=200
             type=raw,value=latest,enable=true,priority=200
 
       - name: Login to GitHub Container Registry

README.md

@@ -30,6 +30,16 @@ The _GRETL_ repository is organized as Gradle multi-project:
 * `gretl`: _GRETL_ source code with unit tests _and_ integration tests.
 * `runtimeImage`: Subproject for building the _GRETL_ runtime (docker) image. The docker image is tested against the integration tests, too.
 
+## Developing
+
+### Eclipse
+
+Since `java.xml` is part of the JDK but is also a dependency of the Gradle API (which is automatically added by the `java-gradle-plugin`) you will get the famous `The package javax.xml.transform.stream is accessible from more than one module: ,java.xml` errors. Excluding `xml-apis` with `all*.exclude group: 'xml-apis'` should be done but will not work for the Gradle API. Workaround: 
+
+- Clone the repository
+- Run `./gradlew eclipse`
+- Add `org.eclipse.jdt.core.compiler.ignoreUnnamedModuleForSplitPackage=enabled` to _gretl/.settings/org.eclipse.jdt.core.prefs_.
+
 ## Oracle JDBC
 There are still signs and wonders taking place: Since fall 2019 the Oracle JDBC library can be found on maven central. Oracle database support is now straight forward.
 

gradle/libs.versions.toml

@@ -44,18 +44,17 @@ awssdk = "1.12.761"
 
 [libraries]
 iox-ili = { group = "ch.interlis", name = "iox-ili", version.ref = "ioxIliVersion" }
-ili-validator = { group = "ch.interlis", name = "ilivalidator", version.ref = "ilivalidatorVersion" }
-ili-custom-validator-functions = { group = "io.github.sogis", name = "ilivalidator-custom-functions", version.ref = "ilivalidatorCustomFunctionsVersion" }
-ili-custom-validator-geometries = { group = "io.github.sogis", name = "ilivalidator-custom-functions-geometries", version.ref = "ilivalidatorCustomFunctionsGeometriesVersion" }
-ili-validator-custom-geometries = { group = "io.github.sogis", name = "ilivalidator-custom-functions-geometries", version.ref = "ilivalidatorCustomFunctionsGeometriesVersion" }
+ilivalidator = { group = "ch.interlis", name = "ilivalidator", version.ref = "ilivalidatorVersion" }
+ilivalidator-custom-functions = { group = "io.github.sogis", name = "ilivalidator-custom-functions", version.ref = "ilivalidatorCustomFunctionsVersion" }
+ilivalidator-custom-functions-geometries = { group = "io.github.sogis", name = "ilivalidator-custom-functions-geometries", version.ref = "ilivalidatorCustomFunctionsGeometriesVersion" }
 geow-custom-functions = { group = "ch.geowerkstatt.ilivalidator.extensions.functions", name = "geow-interlis-functions", version.ref = "geowCustomFunctionsVersion" }
-ili2-pg = { group = "ch.interlis", name = "ili2pg", version.ref = "ili2pgVersion" }
-ili2-gpkg = { group = "ch.interlis", name = "ili2gpkg", version.ref = "ili2gpkgVersion" }
+ili2pg = { group = "ch.interlis", name = "ili2pg", version.ref = "ili2pgVersion" }
+ili2gpkg = { group = "ch.interlis", name = "ili2gpkg", version.ref = "ili2gpkgVersion" }
 iox-wkf = { group = "ch.interlis", name = "iox-wkf", version.ref = "ioxWkfVersion" }
-ehi-sql-gen = { group = "ch.ehi", name = "ehisqlgen", version.ref = "ehiSqlgenVersion" }
+ehisqlgen = { group = "ch.ehi", name = "ehisqlgen", version.ref = "ehiSqlgenVersion" }
 iox-formats = { group = "io.github.sogis", name = "iox-formats", version.ref = "ioxFormatsVersion" }
-av2-ch = { group = "io.github.sogis", name = "av2ch", version.ref = "av2chVersion" }
-av2-geobau = { group = "ch.interlis", name = "av2geobau", version.ref = "av2geobauVersion" }
+av2ch = { group = "io.github.sogis", name = "av2ch", version.ref = "av2chVersion" }
+av2geobau = { group = "ch.interlis", name = "av2geobau", version.ref = "av2geobauVersion" }
 aws-sdk-s3 = { group = "software.amazon.awssdk", name = "s3", version.ref = "awsSdkVersion" }
 aws-java-sdk = { group = "com.amazonaws", name = "aws-java-sdk", version.ref = "awssdk" }
 apache-commons-io = { group = "commons-io", name = "commons-io", version.ref = "apacheCommonsIoVersion" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gretl/build.gradle

@@ -12,6 +12,8 @@ java {
         languageVersion = JavaLanguageVersion.of(11)
         vendor = JvmVendorSpec.ADOPTIUM
     }
+    sourceCompatibility = "11"
+    targetCompatibility = "11"
 }
 
 compileJava.options.encoding = 'US-ASCII'
@@ -61,22 +63,24 @@ configurations {
     all*.exclude module: 'spring-boot-starter-logging'
 
     all*.exclude group: 'org.slf4j', module: 'slf4j-simple'
-    all*.exclude group: 'ch.qos.logback', module: 'logback-classic'
+    all*.exclude group: 'ch.qos.logback', module: 'logback-classic' 
+
+    all*.exclude group: 'xml-apis'   
 }
 
 dependencies {
     testRuntime files(writePluginClassPath)
 
     api gradleApi()
 
-    api libs.ili.validator
-    api libs.ili.custom.validator.functions
-    api libs.ili.custom.validator.geometries
+    api libs.ilivalidator
+    api libs.ilivalidator.custom.functions
+    api libs.ilivalidator.custom.functions.geometries
     api libs.geow.custom.functions
-    api (libs.ili2.pg) {
+    api (libs.ili2pg) {
         exclude group: 'ch.ehi', module: 'ehisqlgen'
     }
-    api (libs.ili2.gpkg) {
+    api (libs.ili2gpkg) {
         exclude group: 'ch.ehi', module: 'ehisqlgen'
     }
     api (libs.iox.wkf) {
@@ -87,15 +91,15 @@ dependencies {
     }
 
     api libs.iox.ili
-    api libs.ehi.sql.gen
+    api libs.ehisqlgen
 
     api (libs.iox.formats) {
         exclude group: 'org.slf4j', module: 'slf4j-reload4j'
         exclude group: 'hsqldb', module: 'hsqldb'
     }
 
-    api libs.av2.ch
-    api libs.av2.geobau
+    api libs.av2ch
+    api libs.av2geobau
 
     api libs.aws.sdk.s3
 

runtimeImage/build.gradle

@@ -10,7 +10,7 @@ configurations.all {
 }
 
 dependencies {
-    api 'ch.so.agi:gretl:2.3.+'
+    api 'ch.so.agi:gretl:3.0.+'
 
     // Add 3rd party libs which we want in the docker image.
     api libs.gradle.download.task

versioning.gradle

@@ -9,7 +9,7 @@ if (System.env.BUILD_NUMBER) {
     buildNumber = System.env.GITHUB_RUN_NUMBER
 }
 
-version = new ProjectVersion(2, 3, buildNumber)
+version = new ProjectVersion(3, 0, buildNumber)
 
 class ProjectVersion {
     Integer major