#131: rename clashing dependencies

sogis · Apr 24, 2024 · 4e70ffe · 4e70ffe
1 parent 5feae27
commit 4e70ffe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -38,11 +38,12 @@ hadoopClientVersion = "3.3.5"
 [libraries]
 iox-ili = { group = "ch.interlis", module = "iox-ili", version.ref = "ioxIliVersion" }
 ili-validator = { group = "ch.interlis", module = "ilivalidator", version.ref = "ilivalidatorVersion" }
-ili-validator-custom-functions = { group = "io.github.sogis", module = "ilivalidator-custom-functions", version.ref = "ilivalidatorCustomFunctionsVersion" }
-ili-validator-custom-functions-geometries = { group = "io.github.sogis", module = "ilivalidator-custom-functions-geometries", version.ref = "ilivalidatorCustomFunctionsGeometriesVersion" }
+ili-custom-validator-functions = { group = "io.github.sogis", module = "ilivalidator-custom-functions", version.ref = "ilivalidatorCustomFunctionsVersion" }
+ili-custom-validator-geometries = { group = "io.github.sogis", module = "ilivalidator-custom-functions-geometries", version.ref = "ilivalidatorCustomFunctionsGeometriesVersion" }
+ili-validator-custom-geometries = { group = "io.github.sogis", module = "ilivalidator-custom-functions-geometries", version.ref = "ilivalidatorCustomFunctionsGeometriesVersion" }
 geow-custom-functions = { group = "ch.geowerkstatt.ilivalidator.extensions.functions", module = "geow-interlis-functions", version.ref = "geowCustomFunctionsVersion" }
-ili-2-pg = { group = "ch.interlis", module = "ili2pg", version.ref = "ili2pgVersion" }
-ili-2-gpkg = { group = "ch.interlis", module = "ili2gpkg", version.ref = "ili2gpkgVersion" }
+ili2-pg = { group = "ch.interlis", module = "ili2pg", version.ref = "ili2pgVersion" }
+ili2-gpkg = { group = "ch.interlis", module = "ili2gpkg", version.ref = "ili2gpkgVersion" }
 iox-wkf = { group = "ch.interlis", module = "iox-wkf", version.ref = "ioxWkfVersion" }
 ehi-sql-gen = { group = "ch.ehi", module = "ehisqlgen", version.ref = "ehiSqlgenVersion" }
 iox-formats = { group = "io.github.sogis", module = "iox-formats", version.ref = "ioxFormatsVersion" }
@@ -53,7 +54,7 @@ apache-commons-io = { group = "commons-io", module = "commons-io", version.ref =
 apache-commons-net = { group = "commons-net", module = "commons-net", version.ref = "apacheCommonsNetVersion" }
 apache-commons-code = { group = "commons-codec", module = "commons-codec", version.ref = "apacheCommonsCodeVersion" }
 apache-http-client = { group = "org.apache.httpcomponents", module = "httpclient", version.ref = "apacheHttpClientVersion" }
-apache-http-client-mime = { group = "org.apache.httpcomponents", module = "httpmime", version.ref = "apacheHttpClientMimeVersion" }
+apache-http-mime = { group = "org.apache.httpcomponents", module = "httpmime", version.ref = "apacheHttpClientMimeVersion" }
 jackson-core = { group = "com.fasterxml.jackson.core", module = "jackson-core", version.ref = "jacksonVersion" }
 jackson-data-bind = { group = "com.fasterxml.jackson.core", module = "jackson-databind", version.ref = "jacksonVersion" }
 saxon = { group = "net.sf.saxon", module = "Saxon-HE", version.ref = "saxonVersion"}
@@ -68,7 +69,7 @@ duckdb = { group = "org.duckdb", module = "duckdb_jdbc", version.ref = "duckdbVe
 junit = { group = "junit", module = "junit", version.ref = "junitVersion" }
 mock-ftp-server = { group = "org.mockftpserver", module = "MockFtpServer", version.ref = "mockFtpServerVersion" }
 mock-web-server = { group = "com.squareup.okhttp3", module ="mockwebserver", version.ref = "mockWebServerVersion"}
-test-containers = { group = "org.testcontainers", module = "testcontainers", version.ref = "testContainersVersion"}
+test-containers-base = { group = "org.testcontainers", module = "testcontainers", version.ref = "testContainersVersion"}
 test-containers-postgresql = { group = "org.testcontainers", module = "postgresql", version.ref = "testContainersVersion"}
 test-containers-oracle = { group = "org.testcontainers", module = "oracle-xe", version.ref = "testContainersVersion"}
 sftp-fs = { group = "com.github.robtimus", module = "sftp-fs", version.ref = "sftpFsVersion"}

diff --git a/gretl/build.gradle b/gretl/build.gradle
@@ -14,7 +14,6 @@ java {
 
 compileJava.options.encoding = 'US-ASCII'
 
-apply from: '../dependencies.gradle'
 apply from: 'integration-test.gradle'
 
 // to get the latest SNAPSHOT uncomment the following lines
@@ -67,26 +66,27 @@ dependencies {
     api gradleApi()
 
     api libs.ili.validator
-    api libs.ili.validator.custom.functions
-    api libs.ili.validator.custom.functions.geometries
+    api libs.ili.custom.validator.functions
+    api libs.ili.custom.validator.geometries
     api libs.geow.custom.functions
-    api (libs.ili.2.pg) {
+    api (libs.ili2.pg) {
         exclude group: 'ch.ehi', module: 'ehisqlgen'
     }
-    api (libs.ili.2.gpkg) {
+    api (libs.ili2.gpkg) {
         exclude group: 'ch.ehi', module: 'ehisqlgen'
     }
     api (libs.iox.wkf) {
         // Exclude old dependencies. These get overriden anyways.
         // And they show on Snaphots...
-        exclude group: 'ch.interlis', module: 'ili2pg'        
+        exclude group: 'ch.interlis', module: 'ili2pg'
         exclude group: 'ch.interlis', module: 'ili2gpkg'
     }
 
     api libs.iox.ili
     api libs.ehi.sql.gen
 
     api (libs.iox.formats) {
+        //todo: can we also use the libs.versions.toml versions here?
         exclude group: 'org.slf4j', module: 'slf4j-reload4j'
     }
 
@@ -99,7 +99,7 @@ dependencies {
     api libs.apache.commons.net
     api libs.apache.commons.code
     api libs.apache.http.client
-    api libs.apache.http.client.mime
+    api libs.apache.http.mime
 
     api libs.jackson.core
     api libs.jackson.data.bind
@@ -119,7 +119,7 @@ dependencies {
     runtimeOnly libs.oracle
 
     testImplementation libs.junit
-    testImplementation libs.test.containers
+    testImplementation libs.test.containers.base
     testImplementation libs.test.containers.postgresql
 
     testImplementation libs.mock.web.server