diff --git a/redaction-service-v1/pom.xml b/redaction-service-v1/pom.xml index 09d9dd03..358f6de2 100644 --- a/redaction-service-v1/pom.xml +++ b/redaction-service-v1/pom.xml @@ -13,7 +13,6 @@ com.iqser.red.service 1.0-SNAPSHOT - pom diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml index 821d4af4..5337144b 100644 --- a/redaction-service-v1/redaction-service-api-v1/pom.xml +++ b/redaction-service-v1/redaction-service-api-v1/pom.xml @@ -11,6 +11,10 @@ redaction-service-api-v1 + + 0.103.0 + + org.springframework @@ -20,7 +24,7 @@ com.iqser.red.service persistence-service-api-v1 - 0.77.0 + ${persistence-service.version} diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml index 138e79d7..7eae3868 100644 --- a/redaction-service-v1/redaction-service-server-v1/pom.xml +++ b/redaction-service-v1/redaction-service-server-v1/pom.xml @@ -11,6 +11,14 @@ redaction-service-server-v1 + + 7.59.0.Final + 7.59.0.Final + 1.16.1 + 3.0.3 + 1.4.0 + + com.iqser.red.commons @@ -24,17 +32,17 @@ org.drools drools-core - 7.59.0.Final + ${drools.version} org.kie kie-spring - 7.59.0.Final + ${kie.version} org.locationtech.jts jts-core - 1.16.1 + ${locationtech.version} com.google.guava @@ -44,17 +52,17 @@ org.apache.pdfbox jbig2-imageio - 3.0.3 + ${pdfbox.jbig2-imageio.version} com.github.jai-imageio jai-imageio-core - 1.4.0 + ${jai-imageio.version} com.github.jai-imageio jai-imageio-jpeg2000 - 1.4.0 + ${jai-imageio.version} diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java index 0020c41d..3e682999 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java @@ -298,10 +298,10 @@ public class RedactionLogMergeService { .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary()) .legalBasis(manualRedactionEntry.getLegalBasis()) .value(manualRedactionEntry.getValue()) + .section(manualRedactionEntry.getSection()) .type(manualRedactionEntry.getType()) .redacted(true) .isHint(false) - .section(null) .sectionNumber(-1) .manual(true) .status(manualRedactionEntry.getStatus()) diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index e7ade382..50333224 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -1195,10 +1195,10 @@ public class RedactionIntegrationTest { private static String getTemporaryDirectory() { -// String tmpdir = System.getProperty("java.io.tmpdir"); -// if (StringUtils.isNotBlank(tmpdir)) { -// return tmpdir; -// } + String tmpdir = System.getProperty("java.io.tmpdir"); + if (StringUtils.isNotBlank(tmpdir)) { + return tmpdir; + } return "/tmp"; }