hotfix: test to add fonts

Update dependency com.iqser.red.commons:storage-commons to v2.29.0 (main)

See merge request fforesight/layout-parser!17

layoutparser-service/layoutparser-service-processor/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 description = "layoutparser-service-processor"
 
-val jacksonVersion = "2.15.0-rc2"
+val jacksonVersion = "2.15.2"
 val pdfBoxVersion = "3.0.0-RC1"
 
 dependencies {
@@ -16,7 +16,7 @@ dependencies {
         exclude("org.springframework.boot", "spring-boot-starter-validation")
     }
     implementation("com.knecon.fforesight:tenant-commons:0.10.0")
-    implementation("com.iqser.red.commons:storage-commons:2.27.0")
+    implementation("com.iqser.red.commons:storage-commons:2.29.0")
 
     implementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
     implementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")

layoutparser-service/layoutparser-service-server/build.gradle.kts

@@ -4,25 +4,25 @@ plugins {
     application
     id("com.knecon.fforesight.java-conventions")
     id("org.springframework.boot") version "3.1.2"
-    id("io.spring.dependency-management") version "1.1.0"
-    id("org.sonarqube") version "4.2.1.3168"
+    id("io.spring.dependency-management") version "1.1.2"
+    id("org.sonarqube") version "4.3.0.3225"
     id("io.freefair.lombok") version "8.1.0"
 //    id("org.graalvm.buildtools.native") version "0.9.23"
 }
 
 description = "layoutparser-service-server"
 
-val jacksonVersion = "2.15.0-rc2"
+val jacksonVersion = "2.15.2"
 val pdfBoxVersion = "3.0.0-alpha2"
 
 dependencies {
     implementation(project(":layoutparser-service-processor"))
     implementation(project(":layoutparser-service-internal-api"))
 
-    implementation("com.iqser.red.commons:storage-commons:2.27.0")
+    implementation("com.iqser.red.commons:storage-commons:2.29.0")
     implementation("com.knecon.fforesight:tenant-commons:0.10.0")
     implementation("org.springframework.boot:spring-boot-starter-actuator:3.1.2")
-    implementation("com.amazonaws:aws-java-sdk-s3:1.12.514")
+    implementation("com.amazonaws:aws-java-sdk-s3:1.12.526")
     implementation("org.springframework.boot:spring-boot-starter-amqp:3.0.6")
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4")
 
@@ -31,7 +31,7 @@ dependencies {
 
     testImplementation("org.springframework.boot:spring-boot-starter-amqp:3.0.6")
     testImplementation("com.iqser.red.service:persistence-service-shared-api-v1:2.124.0")
-    testImplementation("com.iqser.red.commons:jackson-commons:1.0.0")
+    testImplementation("com.iqser.red.commons:jackson-commons:1.3.0")
     testImplementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
     testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
     testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
@@ -71,10 +71,31 @@ sonarqube {
 
 tasks.named<BootBuildImage>("bootBuildImage") {
 
-    println("--------------------" + layout.projectDirectory.file( "src/main/resources/Aptfile").toString());
-    var aptfilePath = layout.projectDirectory.file( "src/main/resources/Aptfile").toString() // make sure this path is valid because there will be no log or exception if not
-    bindings.add("${aptfilePath}:/workspace/Aptfile:ro")
-    buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_apt@sha256:6471c8c70f32b749e29f65ae562ac0339fecad26aa9217628c00a6c31f197dae", "urn:cnb:builder:paketo-buildpacks/java"))
+//    environment.put("BP_ACCEPT_EULA","Y")
+////    println("--------------------" + layout.projectDirectory.file( "src/main/resources/Aptfile").toString());
+//    var aptfilePath = layout.projectDirectory.file( "src/main/resources/Aptfile").toString() // make sure this path is valid because there will be no log or exception if not
+//    bindings.add("${aptfilePath}:/workspace/Aptfile:ro")
+//    buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_apt@sha256:6471c8c70f32b749e29f65ae562ac0339fecad26aa9217628c00a6c31f197dae", "urn:cnb:builder:paketo-buildpacks/java"))
+
+
+//    environment.put("BP_LOG_LEVEL","DEBUG")
+//    var aptfilePath = layout.projectDirectory.file( "src/main/resources/Aptfile").toString() // make sure this path is valid because there will be no log or exception if not
+//    bindings.add("${aptfilePath}:/workspace/Aptfile:ro")
+//    var shfilePath = layout.projectDirectory.file( "src/main/resources/buildpack-run.sh").toString() // make sure this path is valid because there will be no log or exception if not
+//    bindings.add("${shfilePath}:/workspace/buildpack-run.sh:ro")
+//    buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_run@sha256:5c75bf651072e1ad345aa148433b8cdd373e97f9b29523ceaeaf1c39f1691985", "ghcr.io/fagiani/buildpacks/fagiani_apt@sha256:6471c8c70f32b749e29f65ae562ac0339fecad26aa9217628c00a6c31f197dae","urn:cnb:builder:paketo-buildpacks/java"))
+
+    var fontsfilePath = layout.projectDirectory.file( "src/main/resources/fonts.tar.gz").toString() // make sure this path is valid because there will be no log or exception if not
+    bindings.add("${fontsfilePath}:/workspace/fonts.tar.gz:ro")
+
+    var shfilePath = layout.projectDirectory.file( "src/main/resources/buildpack-run.sh").toString() // make sure this path is valid because there will be no log or exception if not
+    bindings.add("${shfilePath}:/workspace/buildpack-run.sh:ro")
+    buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_run@sha256:5c75bf651072e1ad345aa148433b8cdd373e97f9b29523ceaeaf1c39f1691985", "urn:cnb:builder:paketo-buildpacks/java"))
+
+
+
+
+
 
     imageName.set("nexus.knecon.com:5001/ff/${project.name}:${project.version}")
     if (project.hasProperty("buildbootDockerHostNetwork")) {

layoutparser-service/layoutparser-service-server/src/main/resources/Aptfile

@@ -3,9 +3,12 @@ ghostscript
 cabextract
 xfonts-utils
 fonts-liberation
+lmodern
+ttf-mscorefonts-installer
+
 
 # or include links to specific .deb files
-http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb
+# http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb
 
 # or add custom apt repos (only required if using packages outside of the standard Ubuntu APT repositories)
 # :repo:deb http://cz.archive.ubuntu.com/ubuntu artful main universe

layoutparser-service/layoutparser-service-server/src/main/resources/buildpack-run.sh

@@ -0,0 +1 @@
+tar -xf fonts.tar.gz