From 7dae66371ba76beadd01e6567cc56f8a98683df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Sun, 5 Jun 2022 19:53:43 +0200 Subject: [PATCH] fix jsr-305 --- datastructures-trie/build.gradle | 4 ++-- datastructures-validation/NOTICE.txt | 0 datastructures-validation/build.gradle | 2 +- settings.gradle | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 datastructures-validation/NOTICE.txt diff --git a/datastructures-trie/build.gradle b/datastructures-trie/build.gradle index 97b63e6..5a16958 100644 --- a/datastructures-trie/build.gradle +++ b/datastructures-trie/build.gradle @@ -1,5 +1,5 @@ dependencies { - testImplementation("org.mockito:mockito-core:${project.property('mockito.version')}") { + testImplementation(libs.mockito.core) { exclude group: 'org.hamcrest' } -} \ No newline at end of file +} diff --git a/datastructures-validation/NOTICE.txt b/datastructures-validation/NOTICE.txt new file mode 100644 index 0000000..e69de29 diff --git a/datastructures-validation/build.gradle b/datastructures-validation/build.gradle index 5d13ebc..3e76a2d 100644 --- a/datastructures-validation/build.gradle +++ b/datastructures-validation/build.gradle @@ -1,5 +1,5 @@ dependencies { - api libs.jsr305.v2 + api libs.jsr305 testImplementation libs.assertj testImplementation libs.compile.testing } diff --git a/settings.gradle b/settings.gradle index 4eefb49..35adf57 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,8 +12,7 @@ dependencyResolutionManagement { library('junit4', 'junit', 'junit').version('4.13.2') library('chronicle-core', 'net.openhft', 'chronicle-core').version('2.21ea14') library('affinity', 'net.openhft', 'affinity').version('3.21ea0') - library('jsr305', 'org.xbib', 'jsr-305').version('1.0.0') - library('jsr305-v2', 'org.xbib', 'jsr-305').version('2.0.0') + library('jsr305', 'org.xbib', 'jsr-305').version('2.0.0') library('javassist', 'org.javassist', 'javassist').version('3.28.0-GA') library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson') library('gson', 'com.google.code.gson', 'gson').version('2.8.9')