diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3c18b327dc..e3d447e83a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,4 @@ updates: directory: "/" schedule: interval: "daily" - rebase-strategy: "disabled" - # for testing only: - target-branch: "driessamyn/poc/version-catalogue" \ No newline at end of file + rebase-strategy: "disabled" \ No newline at end of file diff --git a/application/build.gradle b/application/build.gradle index 7b4d113e22..eb5221f609 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -21,5 +21,4 @@ dependencies { compileOnly 'org.osgi:osgi.core' testApi 'org.jetbrains.kotlin:kotlin-osgi-bundle' - testImplementation "org.assertj:assertj-core:$assertjVersion" } diff --git a/base/build.gradle b/base/build.gradle index 69b7096ac2..8fbbed01b3 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -16,5 +16,4 @@ dependencies { compileOnly 'org.osgi:osgi.annotation' testApi 'org.jetbrains.kotlin:kotlin-osgi-bundle' - testImplementation "org.assertj:assertj-core:$assertjVersion" } diff --git a/build.gradle b/build.gradle index fa654e1a18..e7759d4127 100644 --- a/build.gradle +++ b/build.gradle @@ -9,15 +9,6 @@ buildscript { ext { vcsUrl = System.getenv('GIT_URL') ?: 'https://github.com/corda/corda-api.git' } - - dependencies { - classpath "org.jetbrains.dokka:dokka-core:$dokkaVersion" - constraints { - classpath("org.jsoup:jsoup:1.15.3") { - because "required until dokka plugin updates it's internal version of jsoup, not fixed as of dokka 1.7.10" - } - } - } } plugins { @@ -25,15 +16,15 @@ plugins { id 'org.jetbrains.kotlin.jvm' apply false id 'org.jetbrains.kotlin.plugin.allopen' apply false id 'org.jetbrains.kotlin.plugin.jpa' apply false - id 'io.gitlab.arturbosch.detekt' apply false - id 'io.snyk.gradle.plugin.snykplugin' - id 'org.ajoberstar.grgit' // used for GIT interaction (e.g. extract commit hash) + alias libs.plugins.detekt apply false + alias libs.plugins.snyk + alias libs.plugins.grgit // used for GIT interaction (e.g. extract commit hash) id 'corda.root-publish' id 'jacoco' // test coverage - id 'com.dorongold.task-tree' // utility to visualise Gradle task DAG - id 'org.jetbrains.dokka' - id 'com.github.ben-manes.versions' // discover possible dependency version upgrades - id 'org.cyclonedx.bom' apply false + alias libs.plugins.task.tree // utility to visualise Gradle task DAG + alias libs.plugins.dokka + alias libs.plugins.dependency.check.versions // discover possible dependency version upgrades + alias libs.plugins.cyclonedx.bom apply false } snyk { @@ -108,7 +99,9 @@ subprojects { releasable = true // all corda-api jars are externally consumable } - apply plugin: 'org.cyclonedx.bom' + // NOTE: according to this we shouldn't be using subprojects: + // https://discuss.gradle.org/t/apply-plugin-with-version-catalog/43029 + apply plugin: libs.plugins.cyclonedx.bom.get().pluginId cyclonedxBom { includeConfigs = ["runtimeClasspath"] skipProjects = [rootProject.name] @@ -162,21 +155,7 @@ subprojects { // thinking is that for the test dependencies it's ok as it'll keep things consistent. // we can add exclusions, or review this if necessary. dependencies { - // Test libraries -> keep consistent across modules - testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" - testImplementation "org.mockito:mockito-core:$mockitoVersion" - testImplementation("org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion") { - // Excluding mockito-core and adding it implicitly above. This is done to allow the use of the latest version of mockito. - exclude group: 'mockito-core' - } - - testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion" - - // Test runtime libraries -> also keep consistent - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - - detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:$detektPluginVersion" + detektPlugins libs.detekt.formatting } // Making all persistence entity open and with an empty constructor to allow Hibernate to work. @@ -259,17 +238,6 @@ subprojects { } } - pluginManager.withPlugin('io.gitlab.arturbosch.detekt'){ - dependencies { - detekt "io.gitlab.arturbosch.detekt:detekt-cli:$detektPluginVersion" - constraints { - detekt("org.yaml:snakeyaml:$snakeyamlVersion") { - because "required until detekt plugin updates it's internal version of snakeYaml, not fixed as of detekt version 1.21" - } - } - } - } - // we do this to allow for Gradle task caching. OSGI attribute Bnd-LastModified breaks gradle caching as it is a timestamp // below block tells Gradle to ignore specifically the Bnd-LastModified attribute of the manifest when checking if // a task is up-to-date, this has no impact on publishing or production of jar. @@ -407,4 +375,4 @@ if (project.hasProperty('generateSBOM')) { artifactoryPublish { publications('sbom') } -} +} \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 422eda9adf..6f82db3fbe 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -10,8 +10,6 @@ repositories { // So we'll load it into our own object to grab what we need. def constants = new Properties() file("$rootDir/../gradle.properties").withInputStream { InputStream input -> constants.load(input) } -def bndVersion = constants.getProperty('bndVersion') -def bndlibVersion = constants.getProperty('bndlibVersion') def internalPluginVersion = constants.getProperty('internalPluginVersion') def artifactoryContextUrl = constants.getProperty('artifactoryContextUrl') @@ -51,23 +49,11 @@ repositories { dependencies { constraints { - implementation('biz.aQute.bnd:biz.aQute.bndlib') { - version { - require bndlibVersion - } - } - implementation('biz.aQute.bnd:biz.aQute.bnd.embedded-repo') { - version { - require bndlibVersion - } - } - implementation('biz.aQute.bnd:biz.aQute.resolve') { - version { - require bndlibVersion - } - } + implementation libs.bnd.lib + implementation libs.bnd.embedded.repo + implementation libs.bnd.resolve } - implementation "biz.aQute.bnd:biz.aQute.bnd.gradle:$bndVersion" + implementation libs.bnd.gradle if (System.getenv('CORDA_ARTIFACTORY_USERNAME') != null || project.hasProperty('cordaArtifactoryUsername')) { implementation "com.r3.internal.gradle.plugins:publish:$internalPluginVersion" diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle new file mode 100644 index 0000000000..3ef0465d8c --- /dev/null +++ b/buildSrc/settings.gradle @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + create('libs', { from(files("../gradle/libs.versions.toml")) }) + } +} + +rootProject.name = 'buildSrc' \ No newline at end of file diff --git a/buildSrc/src/main/groovy/corda-api.common-library.gradle b/buildSrc/src/main/groovy/corda-api.common-library.gradle index c68141d62e..4c80598d08 100644 --- a/buildSrc/src/main/groovy/corda-api.common-library.gradle +++ b/buildSrc/src/main/groovy/corda-api.common-library.gradle @@ -2,6 +2,7 @@ plugins { id 'java-library' + id 'org.jetbrains.kotlin.jvm' id 'biz.aQute.bnd.builder' } @@ -26,9 +27,8 @@ configurations { dependencies { compileOnly "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" - testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation libs.bundles.test + testRuntimeOnly libs.bundles.test.runtime } tasks.named('jar', Jar) { diff --git a/buildSrc/src/main/groovy/corda.java-only.gradle b/buildSrc/src/main/groovy/corda.java-only.gradle index 091034ddc4..29b8c62e08 100644 --- a/buildSrc/src/main/groovy/corda.java-only.gradle +++ b/buildSrc/src/main/groovy/corda.java-only.gradle @@ -1,9 +1,12 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' -} - -tasks.named('compileKotlin') { - doFirst { - throw new InvalidUserCodeException("Module '${project.path}' should only contain Java classes") +/** + * Apply this plugin to projects that must be implemented in pure Java. + * We cannot prevent such projects from applying the Kotlin Gradle plugin, + * but we can throw an exception if they try to compile any Kotlin classes. + */ +pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { + tasks.named('compileKotlin') { + doFirst { + throw new InvalidUserCodeException("Module '${project.path}' should only contain Java classes") + } } } diff --git a/corda-api/build.gradle b/corda-api/build.gradle index d2a42b505f..2b6a00f9cf 100644 --- a/corda-api/build.gradle +++ b/corda-api/build.gradle @@ -26,14 +26,10 @@ dependencies { api project(':membership') api project(':serialization') - api('javax.persistence:javax.persistence-api') { - version { - require javaxPersistenceApiVersion - } - } + api(libs.javax.persistence.api) api('org.jetbrains.kotlin:kotlin-osgi-bundle') { version { - require kotlinVersion + require kotlinVersion } } api('org.jetbrains:annotations') { @@ -41,26 +37,9 @@ dependencies { require jetbrainsAnnotationsVersion } } - api('org.osgi:osgi.annotation') { - version { - require osgiAnnotationVersion - } - } - api('org.osgi:osgi.core') { - version { - require osgiVersion - } - } - api('org.osgi:org.osgi.service.component.annotations') { - version { - require osgiScrAnnotationVersion - } - } - api('org.slf4j:slf4j-api') { + api(libs.bundles.osgi) + api(libs.slf4j) { because 'Corda 5.1 only supports SLF4J 1.x' - version { - strictly slf4jVersion - } } } } diff --git a/cordapp-configuration/build.gradle b/cordapp-configuration/build.gradle index 419eb4424c..6c1357719e 100644 --- a/cordapp-configuration/build.gradle +++ b/cordapp-configuration/build.gradle @@ -31,9 +31,8 @@ java { } dependencies { - testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion" - testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" + testImplementation libs.bundles.test + testRuntimeOnly libs.bundles.test.runtime } tasks.named('jar', Jar) { diff --git a/cordapp-configuration/gradle.properties b/cordapp-configuration/gradle.properties index f2f2b9dd0c..75ecf0b4af 100644 --- a/cordapp-configuration/gradle.properties +++ b/cordapp-configuration/gradle.properties @@ -1,5 +1,3 @@ org.gradle.java.installations.auto-download=false org.gradle.jvmargs=-XX:+UseG1GC -Xmx1g -org.gradle.caching=false - -junitVersion=5.7.2 +org.gradle.caching=false \ No newline at end of file diff --git a/cordapp-configuration/settings.gradle b/cordapp-configuration/settings.gradle index 07d9dbd8c8..4658f23014 100644 --- a/cordapp-configuration/settings.gradle +++ b/cordapp-configuration/settings.gradle @@ -2,4 +2,7 @@ dependencyResolutionManagement { repositories { mavenCentral() } + versionCatalogs { + create('libs', { from(files("../gradle/libs.versions.toml")) }) + } } diff --git a/crypto/build.gradle b/crypto/build.gradle index ec911decc4..5a28ec011f 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -15,9 +15,6 @@ dependencies { api platform(project(':corda-api')) api project(':base') - testImplementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion" - testImplementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion" - testImplementation "org.assertj:assertj-core:$assertjVersion" - testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion" + testImplementation libs.bundles.bouncycastle } diff --git a/data/avro-schema/build.gradle b/data/avro-schema/build.gradle index 5708c8e9c0..ae76018e6e 100644 --- a/data/avro-schema/build.gradle +++ b/data/avro-schema/build.gradle @@ -6,17 +6,17 @@ plugins { id 'corda-api.common-library' id 'corda.common-publishing' id 'corda.java-only' - id "com.github.davidmc24.gradle.plugin.avro-base" + alias libs.plugins.avro.gradle } dependencies { - api "org.apache.avro:avro:$avroVersion" + api libs.avro constraints { - implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") { + implementation(libs.jackson.databind) { because "required until new version of Avro available which updates Jackson" } - implementation("org.apache.commons:commons-compress:$commonsCompressVersion") { + implementation(libs.commons.compress) { because "CVE-2023-42503, current version of Avro uses an outdated version" } } @@ -30,7 +30,7 @@ dependencies { configurations.all { resolutionStrategy { // CVE-2023-42503, current version of Avro uses an outdated version - force "org.apache.commons:commons-compress:$commonsCompressVersion" + force libs.commons.compress } } diff --git a/data/topic-schema/build.gradle b/data/topic-schema/build.gradle index 0dce24b7b1..ddf347e521 100644 --- a/data/topic-schema/build.gradle +++ b/data/topic-schema/build.gradle @@ -9,9 +9,8 @@ description 'Definition of Topics' dependencies { implementation platform(project(':corda-api')) - testImplementation "org.assertj:assertj-core:$assertjVersion" - testImplementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion" - testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion" + testImplementation libs.jackson.kotlin + testImplementation libs.jackson.yaml compileOnly 'org.osgi:osgi.annotation' } diff --git a/gradle.properties b/gradle.properties index 1805f8a32e..6040cba2d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,3 @@ -# This file is parsed from Python in the docs/source/conf.py file -# because some versions here need to be matched by app authors in -# their own projects. So don't get fancy with syntax! - org.gradle.java.installations.auto-download=false # Versioning @@ -30,48 +26,12 @@ publicArtifactURL = https://download.corda.net/maven # dokka need more metaspace - https://github.com/Kotlin/dokka/issues/1405 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=2g internalPluginVersion = 1.+ -dokkaVersion = 1.8.+ -detektPluginVersion = 1.22.+ -dependencyCheckVersion=0.46.+ artifactoryPluginVersion = 4.28.2 -snakeyamlVersion=2.0 - -# Logging -slf4jVersion = 1.7.36 - -# Main implementation dependencies -avroGradlePluginVersion=1.3.0 -avroVersion = 1.11.3 -commonsCompressVersion = 1.24.0 -bouncycastleVersion = 1.73 -grgitPluginVersion = 5.2.0 -taskTreePluginVersion = 2.1.1 -javaxPersistenceApiVersion = 2.2 -jacksonVersion = 2.15.2 - -# Testing -assertjVersion = 3.24.+ -junitVersion = 5.10.0 -mockitoVersion = 5.3.+ -mockitoKotlinVersion = 4.1.+ - -# OSGi -bndVersion = 6.4.0 -bndlibVersion = 6.4.1 -osgiVersion = 8.0.0 -osgiAnnotationVersion = 8.1.0 -osgiScrAnnotationVersion = 1.5.1 gradleEnterpriseVersion = 3.14.1 gradleDataPlugin = 1.8.2 org.gradle.caching = true gradleEnterpriseUrl = https://gradle.dev.r3.com -#snyk version -snykVersion = 0.4 - # Kotlin build -kotlin.build.report.output=file,build_scan - -# Cyclonedx Bom generation version -cyclonedxVersion = 1.7.4 +kotlin.build.report.output=file,build_scan \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..dc4474218c --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,84 @@ +[versions] +kotlinVersion = "1.8.21" + +# Logging +slf4jVersion = { strictly = "1.7.36" } + +# Main implementation dependencies +avroVersion = "1.11.3" +commonsCompressVersion = "1.24.0" +bouncycastleVersion = "1.73" +javaxPersistenceApiVersion = "2.2" +jacksonVersion = "2.15.2" +osgiVersion = "8.0.0" +osgiAnnotationVersion = "8.1.0" +osgiSvcAnnotationVersion = "1.5.1" +bndVersion = "6.4.0" +bndlibVersion = "6.4.1" + +# Testing +assertjVersion = "3.24.0" +junitVersion = "5.10.0" +mockitoVersion = "5.3.0" +mockitoKotlinVersion = "4.1.0" + +# Plugins +artifactoryVersion = "4.28.2" +avroGradleVersion = "1.3.0" +cyclonedxVersion = "1.7.4" +dokkaVersion = "1.8.20" +detektVersion = "1.23.4" +dependencyCheckVersion = "0.46.0" +gradleDataVersion = "1.8.2" +gradleEnterpriseVersion = "3.14.1" +grgitVersion = "5.2.0" +snykVersion = "0.4" +taskTreeVersion = "2.1.1" + +[libraries] +slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4jVersion" } +avro = { group = "org.apache.avro", name = "avro", version.ref = "avroVersion" } +commons-compress = { group = "org.apache.commons", name = "commons-compress", version.ref = "commonsCompressVersion" } +bouncycastle-prov = { group = "org.bouncycastle", name = "bcprov-jdk18on", version.ref = "bouncycastleVersion" } +bouncycastle-pkix = { group = "org.bouncycastle", name = "bcpkix-jdk18on", version.ref = "bouncycastleVersion" } +javax-persistence-api = { group = "javax.persistence", name = "javax.persistence-api", version.ref = "javaxPersistenceApiVersion" } +jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jacksonVersion" } +jackson-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jacksonVersion" } +jackson-yaml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jacksonVersion" } +assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertjVersion" } +kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinVersion" } +junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junitVersion" } +junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitVersion" } +junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junitVersion" } +junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitVersion" } +junit-platform = { group = "org.junit.platform", name = "junit-platform-launcher" } +mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockitoVersion" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockitoKotlinVersion" } +osgi-core = { group = "org.osgi", name = "osgi.core", version.ref = "osgiVersion" } +osgi-annotation = { group = "org.osgi", name = "osgi.annotation", version.ref = "osgiAnnotationVersion" } +osgi-svc-component-annotation = { group = "org.osgi", name = "org.osgi.service.component.annotations", version.ref = "osgiSvcAnnotationVersion" } +bnd-gradle = { group = "biz.aQute.bnd", name = "biz.aQute.bnd.gradle", version.ref = "bndVersion" } +bnd-lib = { group = "biz.aQute.bnd", name = "biz.aQute.bndlib", version.ref = "bndlibVersion" } +bnd-embedded-repo = { group = "biz.aQute.bnd", name = "biz.aQute.bnd.embedded-repo", version.ref = "bndlibVersion" } +bnd-resolve = { group = "biz.aQute.bnd", name = "biz.aQute.resolve", version.ref = "bndlibVersion" } + +detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detektVersion" } + +[bundles] +bouncycastle = ["bouncycastle-prov", "bouncycastle-pkix"] +osgi = ["osgi-core", "osgi-annotation", "osgi-svc-component-annotation"] +test = ["junit", "junit-api", "junit-params", "mockito-core", "mockito-kotlin", "assertj-core", "kotlin-test"] +test-runtime = ["junit-engine", "junit-platform"] + +[plugins] +avro-gradle = { id = "com.github.davidmc24.gradle.plugin.avro-base", version.ref = "avroGradleVersion" } +artifactory = { id = "com.jfrog.artifactory", version.ref = "artifactoryVersion" } +cyclonedx-bom = { id = "org.cyclonedx.bom", version.ref = "cyclonedxVersion" } +dependency-check-versions = { id = "com.github.ben-manes.versions", version.ref = "dependencyCheckVersion" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" } +dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaVersion" } +gradle-data = { id = "com.gradle.common-custom-user-data-gradle-plugin", version.ref = "gradleDataVersion" } +gradle-enterprise = { id = "com.gradle.enterprise", version.ref = "gradleEnterpriseVersion" } +grgit = { id = "org.ajoberstar.grgit", version.ref = "grgitVersion" } +snyk = { id = "io.snyk.gradle.plugin.snykplugin", version.ref = "snykVersion" } +task-tree = { id = "com.dorongold.task-tree", version.ref = "taskTreeVersion" } \ No newline at end of file diff --git a/ledger/ledger-common/build.gradle b/ledger/ledger-common/build.gradle index 96e26c32e0..89d8c2af3d 100644 --- a/ledger/ledger-common/build.gradle +++ b/ledger/ledger-common/build.gradle @@ -14,5 +14,4 @@ dependencies { api project(':application') testImplementation project(':crypto') - testImplementation "org.assertj:assertj-core:$assertjVersion" } diff --git a/ledger/ledger-consensual/build.gradle b/ledger/ledger-consensual/build.gradle index 0517c33436..de850989fc 100644 --- a/ledger/ledger-consensual/build.gradle +++ b/ledger/ledger-consensual/build.gradle @@ -11,6 +11,4 @@ dependencies { compileOnly 'org.osgi:osgi.annotation' api project(':ledger:ledger-common') - - testImplementation "org.assertj:assertj-core:$assertjVersion" } \ No newline at end of file diff --git a/ledger/ledger-utxo/build.gradle b/ledger/ledger-utxo/build.gradle index 1bb4115d44..ca78a9f736 100644 --- a/ledger/ledger-utxo/build.gradle +++ b/ledger/ledger-utxo/build.gradle @@ -11,6 +11,4 @@ dependencies { compileOnly 'org.osgi:osgi.annotation' api project(':ledger:ledger-common') - - testImplementation "org.assertj:assertj-core:$assertjVersion" } diff --git a/membership/build.gradle b/membership/build.gradle index efb96604dd..35a7c0f4fd 100644 --- a/membership/build.gradle +++ b/membership/build.gradle @@ -14,7 +14,4 @@ dependencies { compileOnly 'org.osgi:osgi.annotation' api project(':base') - - testImplementation "org.assertj:assertj-core:$assertjVersion" - testImplementation "org.mockito:mockito-core:$mockitoVersion" } diff --git a/serialization/build.gradle b/serialization/build.gradle index dce0054134..b708ca3b09 100644 --- a/serialization/build.gradle +++ b/serialization/build.gradle @@ -13,6 +13,4 @@ dependencies { compileOnly 'org.jetbrains:annotations' compileOnly 'org.osgi:osgi.annotation' - - testImplementation "org.assertj:assertj-core:$assertjVersion" } diff --git a/settings.gradle b/settings.gradle index a0a7752f0e..2d8523d8ec 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,16 +31,7 @@ pluginManagement { id 'org.jetbrains.kotlin.jvm' version kotlinVersion id 'org.jetbrains.kotlin.plugin.allopen' version kotlinVersion id 'org.jetbrains.kotlin.plugin.jpa' version kotlinVersion - id 'io.gitlab.arturbosch.detekt' version detektPluginVersion - id 'org.ajoberstar.grgit' version grgitPluginVersion // used for GIT interaction (e.g. extract commit hash) - id 'com.dorongold.task-tree' version taskTreePluginVersion // utility to visualise Gradle task DAG - id 'biz.aQute.bnd.builder' version bndVersion // used to create OSGi bundles - id 'org.jetbrains.dokka' version dokkaVersion - id "com.github.davidmc24.gradle.plugin.avro-base" version avroGradlePluginVersion - id 'com.github.ben-manes.versions' version dependencyCheckVersion id "com.jfrog.artifactory" version artifactoryPluginVersion - id 'io.snyk.gradle.plugin.snykplugin' version snykVersion - id "org.cyclonedx.bom" version cyclonedxVersion } } plugins {