Merge pull request #70 from industrial-data-space/release/5.0.2

Bumped version, added IDS MIME Multipart and Jetty
Fraunhofer-AISEC · Jul 8, 2021 · 98882ce · 98882ce
2 parents a3ed9db + ac67723
commit 98882ce
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -46,7 +46,7 @@ licenseReport {
 
 allprojects {
     group = "de.fhg.aisec.ids"
-    version = "5.0.0"
+    version = "5.0.2"
 }
 
 subprojects {

diff --git a/camel-multipart-processor/build.gradle.kts b/camel-multipart-processor/build.gradle.kts
@@ -5,9 +5,12 @@ dependencies {
     implementation(project(":ids-api")) { isTransitive = false }
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.apache.camel", "camel-core", libraryVersions["camel"])
+    implementation("org.apache.camel", "camel-jetty", libraryVersions["camel"])
     implementation("org.apache.camel", "camel-http4", libraryVersions["camelHttp4"])
-    implementation("org.apache.httpcomponents", "httpcore-osgi", libraryVersions["httpcore"])
-    implementation("org.apache.httpcomponents", "httpclient-osgi", libraryVersions["httpclient"])
+
+    implementation("org.apache.httpcomponents", "httpcore", libraryVersions["httpcore"])
+    implementation("org.apache.httpcomponents", "httpclient", libraryVersions["httpclient"])
+    implementation("org.apache.httpcomponents", "httpmime", libraryVersions["httpclient"])
     implementation("commons-fileupload", "commons-fileupload", libraryVersions["commonsFileUpload"])
 
     testImplementation("junit", "junit", libraryVersions["junit4"])

diff --git a/ids-connector/build.gradle.kts b/ids-connector/build.gradle.kts
@@ -24,11 +24,13 @@ dependencies {
     api(project(":ids-route-manager"))
     api(project(":ids-infomodel-manager"))
     api(project(":ids-dataflow-control"))
+    api(project(":camel-multipart-processor"))
 
     // Spring Boot
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-jersey")
+    implementation("org.springframework.boot:spring-boot-starter-jetty")
     // Camel Spring Boot integration
     implementation("org.apache.camel.springboot:camel-spring-boot-starter")
     implementation("org.apache.camel.springboot:camel-rest-starter")

diff --git a/libraryVersions.yaml b/libraryVersions.yaml
@@ -1,4 +1,4 @@
-idscp2: "0.4.4"
+idscp2: "0.4.5"
 ktlint: "0.41.0"
 
 # Pinning
@@ -82,7 +82,6 @@ commonsCli: "1.4"
 javaxValidation: "2.0.1.Final"
 
 # Needed for token manager to assemble JWTs
-jsonwebtoken: "0.11.2"
 jose4j: "0.7.6"
 
 # Needed for web console