1150 Commits

Author SHA1 Message Date
Kilian Schüttler
2a87eede6d RED-6009: Document Tree Structure 2023-06-15 21:07:47 +02:00
Dominique Eifländer
108da249fa Merge branch 'RED-6072' into 'master'
RED-6072 - As Operation I want to see why files are in an ERROR state

Closes RED-6072

See merge request redactmanager/redaction-service!3
4.15.0
2023-06-15 14:07:50 +02:00
Corina Olariu
c508f8c0ea RED-6072 - As Operation I want to see why files are in an ERROR state 2023-06-15 14:07:49 +02:00
Kilian Schüttler
c54dc0ab43 Merge branch 'RED-6009' into 'master'
RED-6009: Document Tree Structure

Closes RED-6009

See merge request redactmanager/redaction-service!1
4.14.0
2023-06-14 09:49:31 +02:00
Kilian Schuettler
1f9e151092 RED-6009: Document Tree Structure
* squashed commits
RED-6009-1f9e1
2023-06-06 19:37:27 +02:00
Christoph Schabert
a6a6fd8180 Update file pom.xml 4.13.0 2023-06-01 11:21:14 +02:00
Christoph Schabert
aa0167525b Update 7 files
- /bamboo-specs/src/main/java/buildjob/PlanSpec.java
- /bamboo-specs/src/main/resources/scripts/build-java.sh
- /bamboo-specs/src/main/resources/scripts/sonar-java.sh
- /bamboo-specs/src/test/java/buildjob/PlanSpecTest.java
- /bamboo-specs/pom.xml
- /pom.xml
- /.gitlab-ci.yml
2023-06-01 11:11:24 +02:00
Corina Olariu
cdb0a418f8 Pull request #537: RED-6744
Merge in RED/redaction-service from RED-6744 to master

* commit '809349f65d7aa4af9ac5ca2fa75d80548d2f475b':
  RED-6744 - Merge dossier and template dictionaries in redaction-service - reformat - add junit test
  RED-6744 - Merge dossier and template dictionaries in redaction-service - remove unnecessary annotations
  RED-6744 - erge dossier and template dictionaries in redaction-service - extend DictionaryEntry from persistence to use it in merging dictionaries and to override the hascode and equals - use this DictionaryEntryModel instead of DictionaryEntry
4.12.0
2023-05-31 10:19:32 +02:00
devplant
809349f65d RED-6744 - Merge dossier and template dictionaries in redaction-service
- reformat
- add junit test
RED-6744_5
2023-05-26 10:17:48 +03:00
devplant
9cfbf62bc5 RED-6744 - Merge dossier and template dictionaries in redaction-service
- remove unnecessary annotations
RED-6744_4
2023-05-24 12:23:04 +03:00
devplant
2c6e397247 RED-6744 - erge dossier and template dictionaries in redaction-service
- extend DictionaryEntry from persistence to use it in merging dictionaries and to override the hascode and equals
- use this DictionaryEntryModel instead of DictionaryEntry
RED-6744_3
2023-05-23 17:05:53 +03:00
Thomas Beyer
a6be7c9cfd Pull request #534: RED-6619 5
Merge in RED/redaction-service from RED-6619_5 to master

* commit 'f574b414c471cb6f349a5fd44a1ad337c77521ac':
  RED-6619 - change pom to fforesight again
  RED-6619 - revert changes in pom
  RED-6619 - change from iqser to knecon
  RED-6619 - change nexus-url from iqser to knecon
4.11.0 RED-6744_2
2023-05-03 09:43:35 +02:00
Thomas Beyer
f574b414c4 RED-6619 - change pom to fforesight again RED-6619_5_13 dev_tmptest11 2023-05-03 08:55:42 +02:00
Thomas Beyer
a427e676f7 RED-6619 - revert changes in pom RED-6619_5_10 2023-05-02 16:41:55 +02:00
Thomas Beyer
a8dd0ccd47 RED-6619 - change from iqser to knecon RED-6619_5_8 2023-05-02 15:51:28 +02:00
Thomas Beyer
fca35c97ca RED-6619 - change nexus-url from iqser to knecon RED-6619_5_5 2023-05-02 15:10:09 +02:00
Thomas Beyer
4bf686a432 Pull request #532: RED-6619 1
Merge in RED/redaction-service from RED-6619_1 to master

* commit 'aff7074b4012627a4e8b64b2f4a779b18feed50a':
  RED-6619 - renamed variables
  RED-6619 - reformat code
  RED-6619 - delete unnecessary import
  RED-6619 - moved not the logic to a boolean, but the 1 into a constant
  RED-6619 - fix integration-tests by adding versions and move the hasMinimumSize-logic into own boolea
  RED-6619 - added missing ' (typo)
  RED-6619 - add logic to ignore found table-cells with height or width < 1. Also: Fix the tests and add new segmentation-tests and 1 redaction-integration-test. Renamed the latter to fit maven regexp
  RED-6619 - add tests for table-extraction
RED-6619_5_2 RED-6619_5_3
2023-05-02 10:54:30 +02:00
Thomas Beyer
aff7074b40 RED-6619 - renamed variables RED-6619_1_10 2023-04-28 16:54:16 +02:00
Thomas Beyer
2e37cd5669 RED-6619 - reformat code RED-6619_1_9 2023-04-28 12:32:11 +02:00
Thomas Beyer
794a160115 RED-6619 - delete unnecessary import RED-6619_1_8 2023-04-28 12:22:11 +02:00
Thomas Beyer
e2d3972e16 RED-6619 - moved not the logic to a boolean, but the 1 into a constant RED-6619_1_7 2023-04-28 12:19:14 +02:00
Thomas Beyer
4a76e89ab8 RED-6619 - fix integration-tests by adding versions and move the hasMinimumSize-logic into own boolea RED-6619_1_6 2023-04-28 12:13:54 +02:00
Thomas Beyer
fcc4085321 RED-6619 - added missing ' (typo) 2023-04-27 17:52:03 +02:00
Thomas Beyer
8490690001 RED-6619 - add logic to ignore found table-cells with height or width < 1.
Also: Fix the tests and add new segmentation-tests and 1 redaction-integration-test. Renamed the latter to fit maven regexp
2023-04-27 17:49:36 +02:00
Thomas Beyer
6f783a9f00 RED-6619 - add tests for table-extraction RED-6619_1_3 2023-04-27 14:04:22 +02:00
Corina Olariu
2646407805 Pull request #531: RED-5694 - Upgrade spring-boot to 3.0
Merge in RED/redaction-service from RED-5694-storage to master

* commit '9a933e9563769dbbc38756151ef7d33fde859194':
  RED-5694 - Upgrade spring-boot to 3.0 - import storageAutoConfiguration to Application
4.10.0 RED-6368_23 RED-6619_1_2
2023-04-21 07:21:48 +02:00
devplant
9a933e9563 RED-5694 - Upgrade spring-boot to 3.0
- import storageAutoConfiguration to Application
RED-5694-storage_3
2023-04-20 13:03:39 +03:00
Corina Olariu
999973a00f Pull request #530: RED-5694
Merge in RED/redaction-service from RED-5694 to master

* commit '7d4b3f40d3a09493459d6f71e53275fc1da7adad':
  RED-5694 - Upgrade spring-boot to 3.0 - exclude storageAutoConfiguration with @ComponentScan
  RED-5694 - Upgrade spring-boot to 3.0 - remove comment code
  RED-5694 - Upgrade spring-boot to 3.0 - remove comment code
  RED-5694 - Upgrade spring-boot to 3.0 - update exclusion of StorageAutoConfiguration
  RED-5694 - Upgrade spring-boot to 3.0 - update after the merge of master
  RED-5694 - Upgrade spring-boot to 3.0 - update platfrom-dependency and other dependencies with latest versions - remove dslplatform dependency
  RED-5694: Imported new version of platform-dependency and fixed a couple of issues.
4.9.0 RED-5694-storage_2
2023-04-05 13:48:04 +02:00
devplant
7d4b3f40d3 RED-5694 - Upgrade spring-boot to 3.0
- exclude storageAutoConfiguration with @ComponentScan
RED-5694_10
2023-04-05 14:09:02 +03:00
devplant
d366d9207a RED-5694 - Upgrade spring-boot to 3.0
- remove comment code
2023-04-05 13:48:28 +03:00
devplant
e22e16aef1 RED-5694 - Upgrade spring-boot to 3.0
- remove comment code
2023-04-05 13:43:45 +03:00
devplant
077677e02d RED-5694 - Upgrade spring-boot to 3.0
- update exclusion of StorageAutoConfiguration
2023-04-05 13:22:17 +03:00
devplant
09de0dc2c6 RED-5694 - Upgrade spring-boot to 3.0
- update after the merge of master
2023-04-05 12:06:12 +03:00
devplant
c3b29e4ebc Merge branch 'master' of https://git.iqser.com/scm/red/redaction-service into RED-5694
# Conflicts:
#	redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
2023-04-05 11:37:33 +03:00
devplant
adcf17c5f0 RED-5694 - Upgrade spring-boot to 3.0
- update platfrom-dependency and other dependencies with latest versions
- remove dslplatform dependency
RED-5694_1 RED-5694_3
2023-04-05 10:58:18 +03:00
Thomas Beyer
49860ab95d Pull request #528: RED-6411 4.5.0 1
Merge in RED/redaction-service from RED-6411_4.5.0_1 to master

* commit '2a56187294c125931d4b998ee1f812ea426e2b58':
  RED-6411 - optimize code
  RED-6411 - optimize method
  RED-6411 - rename testclass because of regexp
  RED-6411 - fix import of configuration
  RED-6411 - add test for this case (with the current rules-file) and move/abstract logic from the RedactionIntegrationTest into AbstractRedactionIntegrationTest
  RED-6411 - extend logic when replacing entities with higher rank
  RED-6411 - remove false positives before calling EntitySearchUtils.addOrAddEngine()
4.8.0
2023-03-29 15:03:13 +02:00
Thomas Beyer
2a56187294 RED-6411 - optimize code RED-6411_4.5.0_1_12 2023-03-29 09:35:55 +02:00
Thomas Beyer
710747d00b RED-6411 - optimize method RED-6411_4.5.0_1_11 2023-03-28 11:28:43 +02:00
Thomas Beyer
4e76c007b8 RED-6411 - rename testclass because of regexp RED-6411_4.5.0_1_10 2023-03-28 10:41:37 +02:00
Thomas Beyer
6e5b64ca94 RED-6411 - fix import of configuration RED-6411_4.5.0_1_9 2023-03-28 10:35:27 +02:00
Thomas Beyer
157b20a1de RED-6411 - add test for this case (with the current rules-file) and move/abstract logic from the RedactionIntegrationTest into AbstractRedactionIntegrationTest RED-6411_4.5.0_1_7 RED-6411_4.5.0_1_8 2023-03-28 10:16:17 +02:00
Thomas Beyer
7644afc3aa RED-6411 - extend logic when replacing entities with higher rank RED-6411_4.5.0_1_5 dev_red6411_7644a 2023-03-27 12:49:33 +02:00
Dominique Eiflaender
89e09f780d Pull request #525: RED-6224: Multitenancy for rules cache
Merge in RED/redaction-service from RED-6224 to master

* commit 'f03523ca8f49767b22d551023866dc9948c06e9f':
  RED-6224: Multitenancy for rules cache
4.6.0 4.7.0
2023-03-27 09:44:46 +02:00
deiflaender
f03523ca8f RED-6224: Multitenancy for rules cache RED-6224_8 2023-03-27 09:37:48 +02:00
Thomas Beyer
459af9e33b RED-6411 - remove false positives before calling EntitySearchUtils.addOrAddEngine() RED-6411_4.5.0_1_3 dev_red6411_459af 2023-03-27 09:05:13 +02:00
Viktor Seifert
3626dbd0a9 RED-5694: Imported new version of platform-dependency and fixed a couple of issues.
* Updated imports for some javax.* packages.
* Added improved config for annotation processors (not dependent on implementation details).
* Updated SectionText class to not use wildcard imports, since the cause problems for lombok + dsl-json.
2023-03-20 18:06:32 +01:00
Dominique Eiflaender
cec18a472f Pull request #524: RED-6224: Made dictionary cache multitenancy ready
Merge in RED/redaction-service from RED-6224 to master

* commit '339833e2d6f4f85757f7fdb84c2006f17d766f38':
  RED-6224: Fixed pr findings
  RED-6224: Made dictionary cache multitenancy ready
4.5.0 RED-6411_4.5.0_1_2
2023-03-17 16:17:57 +01:00
deiflaender
339833e2d6 RED-6224: Fixed pr findings RED-6224_6 2023-03-17 16:07:20 +01:00
deiflaender
ec0de5b6a2 RED-6224: Made dictionary cache multitenancy ready MultiT 2023-03-17 13:54:22 +01:00
Viktor Seifert
4b42c8d13f Pull request #523: RED-6250
Merge in RED/redaction-service from RED-6250 to master

* commit 'fe5121b1edf784d5cc57abd9cd8e27f70dea0f4a':
  RED-6250: Switched to new metrics-commons version to not have to instantiate a factory (reduces code duplication)
  RED-6250: Changed function-timer metric to use code from metric commons
4.4.0
2023-03-16 10:33:38 +01:00