feat: use common code from tck-common module

eclipse-dataspacetck · Nov 26, 2024 · dca9348 · dca9348
1 parent e926c3a
commit dca9348
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 93 deletions.
diff --git a/api/core-api/src/main/java/org/eclipse/dataspacetck/api/system/MandatoryTest.java b/api/core-api/src/main/java/org/eclipse/dataspacetck/api/system/MandatoryTest.java
diff --git a/api/core-api/src/main/java/org/eclipse/dataspacetck/api/system/TestSequenceDiagram.java b/api/core-api/src/main/java/org/eclipse/dataspacetck/api/system/TestSequenceDiagram.java
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,10 +27,6 @@ plugins {
 }
 
 allprojects {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-    }
 
     apply(plugin = "java-library")
     apply(plugin = "checkstyle")
@@ -65,6 +61,10 @@ allprojects {
         testImplementation(rootProject.libs.assertj)
     }
 
+}
+
+subprojects {
+
     if (!project.hasProperty("skip.signing")) {
         apply(plugin = "signing")
         publishing {
@@ -75,11 +75,6 @@ allprojects {
         }
     }
 
-
-}
-
-subprojects {
-
     afterEvaluate {
 
         // register the annotation processor task to all modules that declare a dependency onto the annotation processor,

diff --git a/dsp/dsp-contract-negotiation/build.gradle.kts b/dsp/dsp-contract-negotiation/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.eclipse.dataspacetck.gradle.tasks.GenerateTestPlanTask
-
 /*
  *  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *
@@ -20,7 +18,7 @@ dependencies {
     // this module is included
     annotationProcessor(project(":tools"))
 
-    implementation(project(":api:core-api"))
+    implementation(libs.tck.common.api)
     implementation(project(":core"))
     implementation(project(":dsp:dsp-api"))
     testImplementation(project(":dsp:dsp-system"))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,9 +10,14 @@ jsonapi = "2.0.0"
 jupiter = "5.10.3"
 okhttp = "4.12.0"
 mockito = "5.13.0"
+tck = "0.0.1-SNAPSHOT"
 titanium = "1.4.1"
 
 [libraries]
+
+# modules from tck-common
+tck-common-api = {module = "org.eclipse.dataspacetck:core-api", version.ref = "tck"}
+
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,6 +14,29 @@
  */
 
 rootProject.name = "dsp-tck"
+
+// this is needed to have access to snapshot builds of plugins
+pluginManagement {
+    repositories {
+        mavenLocal()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
+        mavenCentral()
+    }
+}
+
 include("tools")
 include("boot")
 include("core")
@@ -22,4 +45,3 @@ include("dsp:dsp-api")
 include("dsp:dsp-system")
 include("dsp:dsp-contract-negotiation")
 include("dsp:dsp-tck")
-include("api:core-api")
diff --git a/tools/build.gradle.kts b/tools/build.gradle.kts
@@ -27,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":api:core-api"))
+    implementation(libs.tck.common.api)
     implementation(libs.markdown.gen)
     implementation(libs.plantuml)
 }