diff --git a/build.gradle b/build.gradle index aff07417..be69400e 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ allprojects { repositories { mavenLocal() - maven { url "http://jars.interlis.ch" } + maven { url "https://jars.interlis.ch" } maven { url "https://repo.osgeo.org/repository/release/" } mavenCentral() maven { url "https://s01.oss.sonatype.org/service/local/repositories/releases/content/" } diff --git a/docs/user/index.md b/docs/user/index.md index e0dcc7b7..748ba4fe 100755 --- a/docs/user/index.md +++ b/docs/user/index.md @@ -46,7 +46,7 @@ apply plugin: 'ch.so.agi.gretl' buildscript { repositories { - maven { url "http://jars.interlis.ch" } + maven { url "https://jars.interlis.ch" } maven { url "http://jars.umleditor.org" } maven { url "https://repo.osgeo.org/repository/release/" } maven { url "https://plugins.gradle.org/m2/" } diff --git a/gretl/build.gradle b/gretl/build.gradle index 485c4bd6..d694ef83 100755 --- a/gretl/build.gradle +++ b/gretl/build.gradle @@ -65,6 +65,11 @@ configurations { exclude group: 'org.apache.hadoop', module: 'hadoop-core' // Konflikt zwischen "core" und "client". Siehe iox-parquet. exclude group: 'org.slf4j', module: 'slf4j-reload4j' } + + integrationTestImplementation.extendsFrom implementation + integrationTestImplementation.extendsFrom testImplementation + integrationTestImplementation.extendsFrom runtime + integrationTestImplementation.extendsFrom testRuntime all*.exclude module: 'spring-boot-starter-logging' @@ -169,14 +174,14 @@ dependencies { * Provides, at compile-time, the dependencies that both _main_ and _test_ require in order * to successfully compile. */ - integrationTestImplementation configurations.implementation - integrationTestImplementation configurations.testImplementation + /*integrationTestImplementation configurations.implementation + integrationTestImplementation configurations.testImplementation*/ /** * Provides, at run-time, the dependencies that both _main_ and _test_ require to run. */ - integrationTestImplementation configurations.runtime - integrationTestImplementation configurations.testRuntime + /*integrationTestImplementation configurations.runtime + integrationTestImplementation configurations.testRuntime*/ testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.69' diff --git a/gretl/src/integrationTest/jobs/init.gradle b/gretl/src/integrationTest/jobs/init.gradle index 3fda676b..258d42b5 100755 --- a/gretl/src/integrationTest/jobs/init.gradle +++ b/gretl/src/integrationTest/jobs/init.gradle @@ -2,7 +2,7 @@ allprojects { buildscript { repositories { mavenLocal() - maven { url "http://jars.interlis.ch" } + maven { url "https://jars.interlis.ch" } maven { url "https://repo.osgeo.org/repository/release/" } maven { url "https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/" } mavenCentral()