Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-2633 Added section to manual redactions, updated version from persistence-service and extracted versions in pom.xm

Browse Source
This commit is contained in:
Philipp Schramm 2021-11-15 11:36:31 +01:00
parent 2c6957360b
commit 6e713c4fcc
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
redaction-service-v1/pom.xml
View File

@ -13,7 +13,6 @@
<groupId>com.iqser.red.service</groupId> <groupId>com.iqser.red.service</groupId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

6
redaction-service-v1/redaction-service-api-v1/pom.xml
View File

@ -11,6 +11,10 @@
<artifactId>redaction-service-api-v1</artifactId> <artifactId>redaction-service-api-v1</artifactId>
<properties>
<persistence-service.version>0.103.0</persistence-service.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@ -20,7 +24,7 @@
<dependency> <dependency>
<groupId>com.iqser.red.service</groupId> <groupId>com.iqser.red.service</groupId>
<artifactId>persistence-service-api-v1</artifactId> <artifactId>persistence-service-api-v1</artifactId>
<version>0.77.0</version> <version>${persistence-service.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

20
redaction-service-v1/redaction-service-server-v1/pom.xml
View File

@ -11,6 +11,14 @@
<artifactId>redaction-service-server-v1</artifactId> <artifactId>redaction-service-server-v1</artifactId>
<properties>
<drools.version>7.59.0.Final</drools.version>
<kie.version>7.59.0.Final</kie.version>
<locationtech.version>1.16.1</locationtech.version>
<pdfbox.jbig2-imageio.version>3.0.3</pdfbox.jbig2-imageio.version>
<jai-imageio.version>1.4.0</jai-imageio.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.iqser.red.commons</groupId> <groupId>com.iqser.red.commons</groupId>
@ -24,17 +32,17 @@
<dependency> <dependency>
<groupId>org.drools</groupId> <groupId>org.drools</groupId>
<artifactId>drools-core</artifactId> <artifactId>drools-core</artifactId>
<version>7.59.0.Final</version> <version>${drools.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kie</groupId> <groupId>org.kie</groupId>
<artifactId>kie-spring</artifactId> <artifactId>kie-spring</artifactId>
<version>7.59.0.Final</version> <version>${kie.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.locationtech.jts</groupId> <groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId> <artifactId>jts-core</artifactId>
<version>1.16.1</version> <version>${locationtech.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
@ -44,17 +52,17 @@
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>jbig2-imageio</artifactId> <artifactId>jbig2-imageio</artifactId>
<version>3.0.3</version> <version>${pdfbox.jbig2-imageio.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jai-imageio</groupId> <groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId> <artifactId>jai-imageio-core</artifactId>
<version>1.4.0</version> <version>${jai-imageio.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jai-imageio</groupId> <groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-jpeg2000</artifactId> <artifactId>jai-imageio-jpeg2000</artifactId>
<version>1.4.0</version> <version>${jai-imageio.version}</version>
</dependency> </dependency>
<!-- commons --> <!-- commons -->

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
View File

@ -298,10 +298,10 @@ public class RedactionLogMergeService {
.isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary()) .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
.legalBasis(manualRedactionEntry.getLegalBasis()) .legalBasis(manualRedactionEntry.getLegalBasis())
.value(manualRedactionEntry.getValue()) .value(manualRedactionEntry.getValue())
.section(manualRedactionEntry.getSection())
.type(manualRedactionEntry.getType()) .type(manualRedactionEntry.getType())
.redacted(true) .redacted(true)
.isHint(false) .isHint(false)
.section(null)
.sectionNumber(-1) .sectionNumber(-1)
.manual(true) .manual(true)
.status(manualRedactionEntry.getStatus()) .status(manualRedactionEntry.getStatus())

8
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
View File

@ -1195,10 +1195,10 @@ public class RedactionIntegrationTest {
private static String getTemporaryDirectory() { private static String getTemporaryDirectory() {
// String tmpdir = System.getProperty("java.io.tmpdir"); String tmpdir = System.getProperty("java.io.tmpdir");
// if (StringUtils.isNotBlank(tmpdir)) { if (StringUtils.isNotBlank(tmpdir)) {
// return tmpdir; return tmpdir;
// } }
return "/tmp"; return "/tmp";
} }