From a0ff4c4aa9cd7784bda1fefc43bdf1481d39e56c Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 11 Apr 2024 16:00:11 +0200 Subject: [PATCH] refactor: cleanup dependencies --- build.gradle.kts.release | 76 ------------------------------ gradle/libs.versions.toml | 13 ----- runtime-metamodel/build.gradle.kts | 8 ---- 3 files changed, 97 deletions(-) delete mode 100644 build.gradle.kts.release diff --git a/build.gradle.kts.release b/build.gradle.kts.release deleted file mode 100644 index aa1963c..0000000 --- a/build.gradle.kts.release +++ /dev/null @@ -1,76 +0,0 @@ -plugins { - // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins - checkstyle - `java-library` - `version-catalog` - `maven-publish` -} - -val group: String by project -val edcScmUrl: String by project -val edcScmConnection: String by project - -allprojects { - apply(plugin = "checkstyle") - apply(plugin = "maven-publish") - - // let's not generate any reports because that is done from within the GitHub Actions workflow - tasks.withType { - reports { - html.required.set(false) - xml.required.set(true) - } - } - - tasks.withType { - duplicatesStrategy = DuplicatesStrategy.INCLUDE - metaInf { - from("${rootProject.projectDir.path}/NOTICE.md") - from("${rootProject.projectDir.path}/LICENSE") - } - } - - afterEvaluate { - // values needed for publishing - val websiteUrl: String by project - val developerId: String by project - val developerName: String by project - val developerEmail: String by project - val scmConnection: String by project - val scmUrl: String by project - publishing { - publications.forEach { i -> - val mp = (i as MavenPublication) - mp.pom { - name.set(project.name) - description.set("Runtime metamodel for annotations of the Eclipse Dataspace Components") - url.set(websiteUrl) - - licenses { - license { - name.set("The Apache License, Version 2.0") - url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") - } - developers { - developer { - id.set(developerId) - name.set(developerName) - email.set(developerEmail) - } - } - scm { - connection.set(scmConnection) - url.set(scmUrl) - } - } - } - } - } - } - -} -// configure checkstyle version -checkstyle { - toolVersion = "10.0" - maxErrors = 0 // does not tolerate errors -} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b78fcce..0e25a90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,25 +2,12 @@ format.version = "1.1" [versions] -assertj = "3.25.3" jackson = "2.17.0" edc = "0.6.0" jetbrainsAnnotation = "24.1.0" -junit = "5.10.2" -mockito = "5.11.0" [libraries] edc-build = { module = "org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin", version.ref = "edc" } jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" } -jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" } jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } -jackson-dataformat-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "jackson" } -jackson-datatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" } jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotation" } - -# test dependencies -junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } -junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" } -junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } -assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } -mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" } diff --git a/runtime-metamodel/build.gradle.kts b/runtime-metamodel/build.gradle.kts index daed4da..3c059fd 100644 --- a/runtime-metamodel/build.gradle.kts +++ b/runtime-metamodel/build.gradle.kts @@ -6,16 +6,8 @@ plugins { dependencies { api(libs.jetbrains.annotations) - api(libs.jackson.core) api(libs.jackson.annotations) api(libs.jackson.databind) - api(libs.jackson.datatypeJsr310) - - testImplementation(libs.junit.api) - testImplementation(libs.junit.params) - testImplementation(libs.assertj) - testImplementation(libs.mockito) - testRuntimeOnly(libs.junit.engine) } tasks.test {