From f4c80604016ec89e9537cc6267fb93c941f7c4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Fri, 14 Oct 2022 18:07:46 +0200 Subject: [PATCH] update to net 3.0.0 --- content-resource/src/main/java/module-info.java | 2 +- gradle/compile/java.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content-resource/src/main/java/module-info.java b/content-resource/src/main/java/module-info.java index 2e54342..e510d0a 100644 --- a/content-resource/src/main/java/module-info.java +++ b/content-resource/src/main/java/module-info.java @@ -1,5 +1,5 @@ module org.xbib.content.resource { exports org.xbib.content.resource; exports org.xbib.content.resource.text; - requires transitive org.xbib.net.url; + requires org.xbib.net; } diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 6ed401e..d7a16da 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -6,13 +6,13 @@ java { } compileJava { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } compileTestJava { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } jar { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ec77e5..8fad3f5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 090e126..6a0269c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '7.5') - version('junit', '5.8.2') - version('jackson', '2.13.3') + version('gradle', '7.5.1') + version('junit', '5.9.1') + version('jackson', '2.13.4') version('datastructures', '1.0.0') library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') @@ -21,7 +21,7 @@ dependencyResolutionManagement { library('datastructures-yaml-tiny', 'org.xbib', 'datastructures-yaml-tiny').versionRef('datastructures') library('mockito-core', 'org.mockito', 'mockito-core').version('4.6.1') library('mockito-inline', 'org.mockito', 'mockito-inline').version('4.6.1') - library('net', 'org.xbib', 'net-url').version('2.1.1') + library('net', 'org.xbib', 'net').version('3.0.0') library('woodstox', 'com.fasterxml.woodstox', 'woodstox-core').version('6.3.0') library('snakeyaml', 'org.yaml', 'snakeyaml').version('1.30') }