From bf7d374b0a967cf05b724f6c0c5672ad9337dfd4 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 22 Apr 2024 00:58:21 +0300 Subject: [PATCH 1/4] RED-8701 - Move files to customer data repositories - use git lfs to store customer files --- .gitlab-ci.yml | 4 ++++ .gitmodules | 6 ++++++ src/test/resources/files/basf | 1 + src/test/resources/files/syngenta | 1 + 4 files changed, 12 insertions(+) create mode 100644 .gitmodules create mode 160000 src/test/resources/files/basf create mode 160000 src/test/resources/files/syngenta diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b17158..cbef651 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +variables: +# SONAR_PROJECT_KEY: 'com.iqser.red.commons:pdftron-logic-commons' + GIT_SUBMODULE_STRATEGY: recursive + GIT_SUBMODULE_FORCE_HTTPS: 'true' include: - project: 'gitlab/gitlab' ref: 'main' diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0014976 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "src/test/resources/files/syngenta"] + path = src/test/resources/files/syngenta + url = https://gitlab.knecon.com/fforesight/documents/syngenta.git +[submodule "src/test/resources/files/basf"] + path = src/test/resources/files/basf + url = https://gitlab.knecon.com/fforesight/documents/basf.git diff --git a/src/test/resources/files/basf b/src/test/resources/files/basf new file mode 160000 index 0000000..fd99b2e --- /dev/null +++ b/src/test/resources/files/basf @@ -0,0 +1 @@ +Subproject commit fd99b2ed29dcb11d8beb16bdedc7a393f73d1ae0 diff --git a/src/test/resources/files/syngenta b/src/test/resources/files/syngenta new file mode 160000 index 0000000..d76c2fe --- /dev/null +++ b/src/test/resources/files/syngenta @@ -0,0 +1 @@ +Subproject commit d76c2fe273c27e3beea0b94e56f8821b1f715985 From 90470b41a074bd71968073055f013a85fa21202a Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 22 Apr 2024 14:17:02 +0300 Subject: [PATCH 2/4] RED-8701 - Move files to customer data repositories - update unit tests with the new path to submodules for customer files - remove customer files from project --- .../red/pdftronlogic/commons/WatermarkRemovalServiceTest.java | 2 +- src/test/resources/files/basf | 2 +- src/test/resources/files/syngenta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalServiceTest.java b/src/test/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalServiceTest.java index 2f94a3e..30d6c51 100644 --- a/src/test/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalServiceTest.java +++ b/src/test/java/com/iqser/red/pdftronlogic/commons/WatermarkRemovalServiceTest.java @@ -24,7 +24,7 @@ class WatermarkRemovalServiceTest { WatermarkRemovalService watermarkRemovalService = new WatermarkRemovalService(); - String filename = "files/1.A16148F - Toxicidade oral aguda (1).pdf"; + String filename = "files/syngenta/CustomerFiles/1.A16148F - Toxicidade oral aguda (1).pdf"; String tmpFilename = createTmpFileName(filename, "WATERMARK_REMOVAL"); try (var in = this.getClass().getClassLoader().getResourceAsStream(filename); var out = new FileOutputStream(tmpFilename)) { diff --git a/src/test/resources/files/basf b/src/test/resources/files/basf index fd99b2e..9dc6c23 160000 --- a/src/test/resources/files/basf +++ b/src/test/resources/files/basf @@ -1 +1 @@ -Subproject commit fd99b2ed29dcb11d8beb16bdedc7a393f73d1ae0 +Subproject commit 9dc6c2337dea32e63aef53271dba0692537c6605 diff --git a/src/test/resources/files/syngenta b/src/test/resources/files/syngenta index d76c2fe..1541e57 160000 --- a/src/test/resources/files/syngenta +++ b/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit d76c2fe273c27e3beea0b94e56f8821b1f715985 +Subproject commit 1541e57e45c74a963e5b453db38a253ec33524be From 7b35b53a5461c34023f9fc51b0a935ba10a6b3bc Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 23 Apr 2024 10:50:11 +0300 Subject: [PATCH 3/4] RED-8701 - Move files to customer data repositories - update syngenta submodule --- src/test/resources/files/syngenta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/files/syngenta b/src/test/resources/files/syngenta index 1541e57..c067cc3 160000 --- a/src/test/resources/files/syngenta +++ b/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit 1541e57e45c74a963e5b453db38a253ec33524be +Subproject commit c067cc38414ed1c3ba759af5e32ebdfb78720204 From 666c247f6a4037063e24f37a881b846d7dd48207 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 23 Apr 2024 14:59:36 +0300 Subject: [PATCH 4/4] RED-8701 - Move files to customer data repositories - update syngenta submodule --- src/test/resources/files/syngenta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/files/syngenta b/src/test/resources/files/syngenta index c067cc3..21fefb6 160000 --- a/src/test/resources/files/syngenta +++ b/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit c067cc38414ed1c3ba759af5e32ebdfb78720204 +Subproject commit 21fefb64bf27ca2b3329a6c69d90a27450b17930