Added Infomodel workaround

industrial-data-space · Nov 6, 2023 · c8a06e3 · c8a06e3
1 parent b156cb4
commit c8a06e3
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,16 +23,15 @@ val descriptions: Map<String, String> = mapOf(
     "idscp2-core" to "IDSCP2 Protocol Implementation",
     "idscp2-app-layer" to "IDSCP2 Application Layer Implementation",
     "idscp2-daps-aisec" to "IDSCP2 AISEC DAPS Driver",
-    "camel-idscp2" to "Camel IDSCP2 Component Implementation"
+    "camel-idscp2" to "Camel IDSCP2 Component Implementation",
+    "infomodel" to "Legacy IAIS Infomodel Classes"
 )
 
 allprojects {
     group = "de.fhg.aisec.ids"
 
     repositories {
         mavenCentral()
-        // References IAIS repository that contains the infomodel artifacts
-        maven("https://maven.iais.fraunhofer.de/artifactory/eis-ids-public/")
     }
 
     val versionRegex = ".*(rc-?[0-9]*|beta)$".toRegex(RegexOption.IGNORE_CASE)
@@ -43,7 +42,6 @@ allprojects {
             versionRegex.matches(candidate.version)
                 || (candidate.group in setOf("org.apache.camel", "org.apache.camel.springboot")
                 && !candidate.version.startsWith("3.18"))
-                || (candidate.group.startsWith("de.fraunhofer.iais.eis.ids") && !candidate.version.startsWith("4.1."))
         }
     }
 }

diff --git a/camel-idscp2/build.gradle.kts b/camel-idscp2/build.gradle.kts
@@ -3,7 +3,7 @@ version = libs.versions.idscp2.get()
 dependencies {
     api(project(":idscp2-app-layer"))
     api(project(":idscp2-daps-aisec"))
-    api(libs.infomodel.model)
+    api(project(":infomodel"))
 
     implementation(project(":idscp2-core"))
     implementation(libs.camel.core)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ protobuf = "3.25.0"
 
 bouncycastle = "1.70"
 
-# We will pull in a newer version of jackson (required by io.jsonwebtoken) because of security fixes
+# We will pull in an up-to-date version of jackson for security fixes
 jackson = "2.15.3"
 
 # Needed for token manager to assemble JWTs

diff --git a/idscp2-app-layer/build.gradle.kts b/idscp2-app-layer/build.gradle.kts
@@ -9,10 +9,9 @@ val testImplementation by configurations
 
 dependencies {
     api(project(":idscp2-api"))
-    api(libs.infomodel.model)
+    api(project(":infomodel"))
+    api(project(":idscp2-core"))
 
-    implementation(project(":idscp2-core"))
-    implementation(libs.infomodel.serializer)
     implementation(libs.protobuf)
 }
 

diff --git a/infomodel/build.gradle.kts b/infomodel/build.gradle.kts
@@ -0,0 +1,30 @@
+version = "4.1.3"
+
+plugins {
+    kotlin("jvm")
+}
+
+repositories {
+    mavenCentral()
+}
+
+val imJars = fileTree("libs") {
+    include("*.jar")
+}
+
+dependencies {
+    api(imJars)
+    // Jackson Databind (includes Core and Annotations)
+    implementation(libs.jackson.databind)
+    // No CVEs with jena-core > 4.1.0
+    implementation("org.apache.jena:jena-arq:4.1.0")
+    implementation("org.apache.jena:jena-core:4.10.0")
+}
+
+tasks.named<Jar>("jar") {
+    imJars.files.map {
+        from(zipTree(it)) {
+            include("**/*.class")
+        }
+    }
+}
diff --git a/infomodel/libs/infomodel-serializer-4.1.3.jar b/infomodel/libs/infomodel-serializer-4.1.3.jar
diff --git a/infomodel/libs/java-4.1.3.jar b/infomodel/libs/java-4.1.3.jar
diff --git a/infomodel/libs/util-4.1.3.jar b/infomodel/libs/util-4.1.3.jar
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,3 +6,4 @@ include("idscp2-examples")
 include("idscp2-app-layer")
 include("idscp2-daps-aisec")
 include("camel-idscp2")
+include("infomodel")