diff --git a/build.gradle.kts b/build.gradle.kts index be56f33e..687fb271 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,9 +44,6 @@ subprojects { repositories { mavenCentral() mavenLocal() - - // References IAIS repository that contains the infomodel artifacts - maven("https://maven.iais.fraunhofer.de/artifactory/eis-ids-public/") } apply(plugin = "java") diff --git a/camel-processors/build.gradle.kts b/camel-processors/build.gradle.kts index c7e8c7df..937f8ba4 100644 --- a/camel-processors/build.gradle.kts +++ b/camel-processors/build.gradle.kts @@ -5,8 +5,7 @@ dependencies { implementation(project(":ids-api")) { isTransitive = false } implementation(libs.idscp2.core) implementation(libs.camel.idscp2) - implementation(libs.infomodel.model) - implementation(libs.infomodel.serializer) + implementation(libs.infomodel) implementation(libs.camel.core) implementation(libs.guava) implementation(libs.apacheHttp.mime) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d7112dba..23769e50 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -idscp2 = "0.18.0" +idscp2 = "0.18.1" ktlint = "0.48.2" # Kotlin library/compiler version @@ -93,8 +93,7 @@ camel-influxdb = { group = "org.apache.camel", name = "camel-influxdb", version. # camel-processors camel-idscp2 = { group = "de.fhg.aisec.ids", name = "camel-idscp2", version.ref = "idscp2" } camel-bean = { group = "org.apache.camel", name = "camel-bean", version.ref = "camel" } -infomodel-model = { group = "de.fraunhofer.iais.eis.ids.infomodel", name = "java", version.ref = "infomodel" } -infomodel-serializer = { group = "de.fraunhofer.iais.eis.ids", name = "infomodel-serializer", version.ref = "infomodel" } +infomodel = { group = "de.fhg.aisec.ids", name = "infomodel", version.ref = "infomodel" } apacheHttp-mime = { group = "org.apache.httpcomponents", name = "httpmime", version.ref = "httpclient" } commons-fileupload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commonsFileUpload" } diff --git a/ids-api/build.gradle.kts b/ids-api/build.gradle.kts index bbd5e016..b526b488 100644 --- a/ids-api/build.gradle.kts +++ b/ids-api/build.gradle.kts @@ -1,8 +1,7 @@ dependencies { implementation(libs.protobuf) implementation(libs.jackson.annotations) - implementation(libs.infomodel.model) - implementation(libs.infomodel.serializer) + implementation(libs.infomodel) implementation(libs.camel.core) testImplementation(libs.bundles.test4) diff --git a/ids-dataflow-control/build.gradle.kts b/ids-dataflow-control/build.gradle.kts index 72d34ed9..ef0babaf 100644 --- a/ids-dataflow-control/build.gradle.kts +++ b/ids-dataflow-control/build.gradle.kts @@ -3,8 +3,7 @@ description = "Camel IDS Component" dependencies { implementation(project(":ids-api")) { isTransitive = false } implementation("org.springframework.boot:spring-boot-starter") - implementation(libs.infomodel.model) - implementation(libs.infomodel.serializer) + implementation(libs.infomodel) implementation(libs.camel.core) implementation(libs.guava) implementation(libs.bundles.tup) diff --git a/ids-infomodel-manager/build.gradle.kts b/ids-infomodel-manager/build.gradle.kts index baa06bce..b204c655 100644 --- a/ids-infomodel-manager/build.gradle.kts +++ b/ids-infomodel-manager/build.gradle.kts @@ -25,8 +25,7 @@ configure { dependencies { implementation(project(":ids-api")) { isTransitive = false } - implementation(libs.infomodel.model) - implementation(libs.infomodel.serializer) + implementation(libs.infomodel) implementation(libs.commons.cli) implementation(libs.javax.validation) implementation(libs.jackson.annotations) diff --git a/ids-webconsole/build.gradle.kts b/ids-webconsole/build.gradle.kts index a45b8524..70639089 100644 --- a/ids-webconsole/build.gradle.kts +++ b/ids-webconsole/build.gradle.kts @@ -67,7 +67,7 @@ dependencies { implementation(project(":ids-api")) implementation("org.springframework.boot:spring-boot-starter-web") implementation(libs.spring.security.crypto) - implementation(libs.infomodel.model) + implementation(libs.infomodel) implementation(libs.camel.core) implementation(libs.jose4j) implementation(libs.auth0Jwt)