diff --git a/build.gradle.kts b/build.gradle.kts index eb44d33..db0ce65 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,8 @@ val descriptions: Map = 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 { @@ -31,8 +32,6 @@ allprojects { 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 index 8fbe0e8..f426e59 100644 --- 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 index 3eea824..d8efa4a 100644 --- 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 index e21882b..35173a9 100644 --- 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 new file mode 100644 index 0000000..8cdf5bf --- /dev/null +++ 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") { + 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 new file mode 100644 index 0000000..27382bb Binary files /dev/null and b/infomodel/libs/infomodel-serializer-4.1.3.jar differ diff --git a/infomodel/libs/java-4.1.3.jar b/infomodel/libs/java-4.1.3.jar new file mode 100644 index 0000000..fad447d Binary files /dev/null and b/infomodel/libs/java-4.1.3.jar differ diff --git a/infomodel/libs/util-4.1.3.jar b/infomodel/libs/util-4.1.3.jar new file mode 100644 index 0000000..55c1046 Binary files /dev/null and b/infomodel/libs/util-4.1.3.jar differ diff --git a/settings.gradle.kts b/settings.gradle.kts index 2bf4013..24efd6d 100644 --- 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")