From 360846179bcd93056851ad9d428d73849f707092 Mon Sep 17 00:00:00 2001
From: Paul Tang <1811147+pauledwardtang@users.noreply.github.com>
Date: Fri, 2 Oct 2020 14:53:08 +0800
Subject: [PATCH 01/11] Fixed Java 11 compilation errors

---
 ocrevalUAtion/pom.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ocrevalUAtion/pom.xml b/ocrevalUAtion/pom.xml
index e12af5dd..2593adec 100644
--- a/ocrevalUAtion/pom.xml
+++ b/ocrevalUAtion/pom.xml
@@ -29,7 +29,7 @@
     </licenses>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdk.version>1.6</jdk.version>
+        <jdk.version>1.7</jdk.version>
     </properties>
     <build>
         <!--finalName>ocrevaluation</finalName-->
@@ -39,8 +39,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                     <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>
@@ -227,6 +227,11 @@
             <version>1.4</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.3</version>
+        </dependency>
     </dependencies>
     <repositories>
         <!--repository>

From b0593f037ae1b2541daf48f9811ca5ff21ae9d39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 01:08:08 +0000
Subject: [PATCH 02/11] Bump junit from 4.12 to 4.13.1 in /tools

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 tools/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pom.xml b/tools/pom.xml
index 6b619154..f40d0ea6 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 2f4ab3b45850f0f7b0af5bdf34522d6d48410811 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 02:30:08 +0000
Subject: [PATCH 03/11] Bump junit from 4.12 to 4.13.1 in /gui

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 gui/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/pom.xml b/gui/pom.xml
index 64fa5ab6..d3f526fc 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From cbffe117794d09fd6e4f51c8ad6f98443df7477c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 06:31:51 +0000
Subject: [PATCH 04/11] Bump junit from 4.11 to 4.13.1 in /ocrevalUAtion

Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 ocrevalUAtion/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocrevalUAtion/pom.xml b/ocrevalUAtion/pom.xml
index e12af5dd..17b3cb6b 100644
--- a/ocrevalUAtion/pom.xml
+++ b/ocrevalUAtion/pom.xml
@@ -198,7 +198,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <!--dependency>

From 00ef7dddb7854422a80675f4018e5030874e7e62 Mon Sep 17 00:00:00 2001
From: Paul Tang <1811147+pauledwardtang@users.noreply.github.com>
Date: Fri, 16 Oct 2020 17:39:50 +0800
Subject: [PATCH 05/11] Added support for images with 4 byte RGBA color
 components

---
 .../tools/preprocessing/binarization/BinarizationUtilities.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/src/main/java/de/vorb/tesseract/tools/preprocessing/binarization/BinarizationUtilities.java b/tools/src/main/java/de/vorb/tesseract/tools/preprocessing/binarization/BinarizationUtilities.java
index c5ffe221..4882d8c7 100644
--- a/tools/src/main/java/de/vorb/tesseract/tools/preprocessing/binarization/BinarizationUtilities.java
+++ b/tools/src/main/java/de/vorb/tesseract/tools/preprocessing/binarization/BinarizationUtilities.java
@@ -25,6 +25,7 @@ static BufferedImage imageToGrayscale(BufferedImage image) {
             case BufferedImage.TYPE_INT_RGB:
             case BufferedImage.TYPE_BYTE_INDEXED:
             case BufferedImage.TYPE_3BYTE_BGR:
+            case BufferedImage.TYPE_4BYTE_ABGR:
                 grayscale = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
                 RGB_TO_GRAYSCALE.filter(image, grayscale);
                 break;

From eb1e9cf248c067e1672b8933ac15c1e5c0ff5544 Mon Sep 17 00:00:00 2001
From: Paul Tang <1811147+pauledwardtang@users.noreply.github.com>
Date: Fri, 16 Oct 2020 17:40:58 +0800
Subject: [PATCH 06/11] Added Visual Studio code and Eclipse project files to
 .gitignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2531f82e..6be03663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
 *.iml
 target/
 /gui/hs_err_pid*.log
+**/.vscode
+**/.settings
+**/.classpath
+**/.project
\ No newline at end of file

From 6cebb0143cbcb4355df8a9f59910d8f97891a3e9 Mon Sep 17 00:00:00 2001
From: Paul Tang <1811147+pauledwardtang@users.noreply.github.com>
Date: Fri, 16 Oct 2020 17:45:42 +0800
Subject: [PATCH 07/11] Added global page segmentation mode configuration

---
 .../gui/controller/TesseractController.java   |  24 +++-
 .../gui/view/dialogs/PreferencesDialog.java   | 106 +++++++++++-------
 .../gui/work/PageRecognitionProducer.java     |   8 +-
 3 files changed, 93 insertions(+), 45 deletions(-)

diff --git a/gui/src/main/java/de/vorb/tesseract/gui/controller/TesseractController.java b/gui/src/main/java/de/vorb/tesseract/gui/controller/TesseractController.java
index d11f7db7..dc6a3513 100644
--- a/gui/src/main/java/de/vorb/tesseract/gui/controller/TesseractController.java
+++ b/gui/src/main/java/de/vorb/tesseract/gui/controller/TesseractController.java
@@ -1,5 +1,6 @@
 package de.vorb.tesseract.gui.controller;
 
+import com.google.common.collect.Lists;
 import de.vorb.tesseract.gui.io.BoxFileReader;
 import de.vorb.tesseract.gui.io.BoxFileWriter;
 import de.vorb.tesseract.gui.io.PlainTextWriter;
@@ -49,8 +50,6 @@
 import de.vorb.tesseract.util.TraineddataFiles;
 import de.vorb.tesseract.util.feat.Feature3D;
 import de.vorb.util.FileNames;
-
-import com.google.common.collect.Lists;
 import eu.digitisation.input.Batch;
 import eu.digitisation.input.Parameters;
 import eu.digitisation.input.WarningException;
@@ -231,6 +230,8 @@ public TesseractController() {
 
         try {
             pageRecognitionProducer.init();
+            pageRecognitionProducer.setPageSegmentationMode(getPageSegmentationMode());
+
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -1141,6 +1142,21 @@ private void handlePreferences() {
                 final String editorFont = (String) prefDialog.getComboEditorFont().getSelectedItem();
                 globalPrefs.put(PreferencesDialog.KEY_EDITOR_FONT, editorFont);
 
+                // Update the page segmentation mode if necessary
+                int currentPageSegMode = getPageSegmentationMode();
+                int pageSegMode = prefDialog.getPageSegmentationMode();
+                boolean hasPageSegModeChanged = currentPageSegMode != pageSegMode;
+                if (hasPageSegModeChanged) {
+                    globalPrefs.putInt(PreferencesDialog.KEY_PAGE_SEG_MODE, pageSegMode);
+                    pageRecognitionProducer.setPageSegmentationMode(pageSegMode);
+
+                    // Update model with new segmentation mode
+                    if (activeComponent instanceof PageModelComponent) {
+                        final Optional<PageModel> pm = ((PageModelComponent) activeComponent).getPageModel();
+                        pm.ifPresent(it -> setImageModel(Optional.of(it.getImageModel())));
+                    }
+                }
+
                 view.getRecognitionPane().setRenderingFont(renderingFont);
                 if (view.getActiveComponent() == view.getRecognitionPane()) {
                     view.getRecognitionPane().render();
@@ -1241,6 +1257,10 @@ private void handleTesseractTrainer() {
         trainer.setVisible(true);
     }
 
+    private int getPageSegmentationMode() {
+        return PreferencesUtil.getPreferences().getInt(PreferencesDialog.KEY_PAGE_SEG_MODE, PreferencesDialog.DEFAULT_PSM_MODE);
+    }
+
     public void setPageModel(Optional<PageModel> model) {
         if (projectModel.isPresent() && model.isPresent()) {
             try {
diff --git a/gui/src/main/java/de/vorb/tesseract/gui/view/dialogs/PreferencesDialog.java b/gui/src/main/java/de/vorb/tesseract/gui/view/dialogs/PreferencesDialog.java
index ba9e8e61..f54c69ab 100644
--- a/gui/src/main/java/de/vorb/tesseract/gui/view/dialogs/PreferencesDialog.java
+++ b/gui/src/main/java/de/vorb/tesseract/gui/view/dialogs/PreferencesDialog.java
@@ -26,15 +26,35 @@
 public class PreferencesDialog extends JDialog {
     private static final long serialVersionUID = 1L;
 
+    private static final String[] PSM_MODES = {
+            "0 - PSM_OSD_ONLY",
+            "1 - PSM_AUTO_OSD",
+            "2 - PSM_AUTO_ONLY",
+            "3 - (DEFAULT) PSM_AUTO",
+            "4 - PSM_SINGLE_COLUMN",
+            "5 - PSM_SINGLE_BLOCK_VERT_TEXT",
+            "6 - PSM_SINGLE_BLOCK",
+            "7 - PSM_SINGLE_LINE",
+            "8 - PSM_SINGLE_WORD",
+            "9 - PSM_CIRCLE_WORD",
+            "10 - PSM_SINGLE_CHAR",
+            "11 - PSM_SPARSE_TEXT",
+            "12 - PSM_SPARSE_TEXT_OSD",
+            "13 - PSM_RAW_LINE",
+    };
+    public static final int DEFAULT_PSM_MODE = 3;
+
     public static final String KEY_LANGDATA_DIR = "langdata_dir";
     public static final String KEY_RENDERING_FONT = "rendering_font";
     public static final String KEY_EDITOR_FONT = "editor_font";
+    public static final String KEY_PAGE_SEG_MODE = "page_seg_mode";
 
     private final JPanel contentPanel = new JPanel();
     private JTextField tfLangdataDir;
 
     private final JComboBox<String> comboRenderingFont;
     private final JComboBox<String> comboEditorFont;
+    private final JComboBox<String> comboPageSegMode;
 
     private ResultState resultState = ResultState.CANCEL;
 
@@ -134,48 +154,20 @@ public PreferencesDialog() {
         final GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
         final String[] availableFontFamilyNames = graphicsEnvironment.getAvailableFontFamilyNames();
 
-        {
-            JLabel lblRenderingFont = new JLabel("Rendering font:");
-            GridBagConstraints gbc_lblRenderingFont = new GridBagConstraints();
-            gbc_lblRenderingFont.anchor = GridBagConstraints.EAST;
-            gbc_lblRenderingFont.insets = new Insets(0, 0, 0, 5);
-            gbc_lblRenderingFont.gridx = 0;
-            gbc_lblRenderingFont.gridy = 2;
-            contentPanel.add(lblRenderingFont, gbc_lblRenderingFont);
-        }
-        {
-            comboRenderingFont = new JComboBox<>();
-            GridBagConstraints gbc_comboRenderingFont = new GridBagConstraints();
-            gbc_comboRenderingFont.insets = new Insets(0, 0, 0, 5);
-            gbc_comboRenderingFont.fill = GridBagConstraints.HORIZONTAL;
-            gbc_comboRenderingFont.gridx = 1;
-            gbc_comboRenderingFont.gridy = 2;
-            contentPanel.add(comboRenderingFont, gbc_comboRenderingFont);
-
-            Arrays.stream(availableFontFamilyNames).forEach(comboRenderingFont::addItem);
-            comboRenderingFont.setSelectedItem(pref.get(PreferencesDialog.KEY_RENDERING_FONT, Font.SANS_SERIF));
-        }
-        {
-            JLabel lblEditorFont = new JLabel("Editor font:");
-            GridBagConstraints gbc_lblEditorFont = new GridBagConstraints();
-            gbc_lblEditorFont.anchor = GridBagConstraints.EAST;
-            gbc_lblEditorFont.insets = new Insets(0, 0, 0, 5);
-            gbc_lblEditorFont.gridx = 0;
-            gbc_lblEditorFont.gridy = 3;
-            contentPanel.add(lblEditorFont, gbc_lblEditorFont);
-        }
-        {
-            comboEditorFont = new JComboBox<>();
-            GridBagConstraints gbc_comboEditorFont = new GridBagConstraints();
-            gbc_comboEditorFont.insets = new Insets(0, 0, 0, 5);
-            gbc_comboEditorFont.fill = GridBagConstraints.HORIZONTAL;
-            gbc_comboEditorFont.gridx = 1;
-            gbc_comboEditorFont.gridy = 3;
-            contentPanel.add(comboEditorFont, gbc_comboEditorFont);
-
-            Arrays.stream(availableFontFamilyNames).forEach(comboEditorFont::addItem);
-            comboEditorFont.setSelectedItem(pref.get(PreferencesDialog.KEY_EDITOR_FONT, Font.MONOSPACED));
-        }
+        // Rendering font
+        addGridLabel(0, 2, "Rendering font:");
+        final String initialFontFamilyName = pref.get(PreferencesDialog.KEY_EDITOR_FONT, Font.SANS_SERIF);
+        comboRenderingFont = createGridComboBox(1, 2, availableFontFamilyNames, initialFontFamilyName);
+
+        // Editor font
+        addGridLabel(0, 3, "Editor font:");
+        final String initialEditorFontFamilyName = pref.get(PreferencesDialog.KEY_RENDERING_FONT, Font.MONOSPACED);
+        comboEditorFont = createGridComboBox(1, 3, availableFontFamilyNames, initialEditorFontFamilyName);
+
+        // Page Segmentation Modes
+        addGridLabel(0, 4, "Page Segmentation Mode:");
+        final int pageSegMode = pref.getInt(PreferencesDialog.KEY_PAGE_SEG_MODE, DEFAULT_PSM_MODE);
+        comboPageSegMode = createGridComboBox(1, 4, PSM_MODES, PSM_MODES[pageSegMode]);
 
         pack();
         setMinimumSize(getSize());
@@ -197,9 +189,39 @@ public JComboBox<String> getComboEditorFont() {
         return comboEditorFont;
     }
 
+    public int getPageSegmentationMode() {
+        return comboPageSegMode.getSelectedIndex();
+    }
+
     public ResultState showPreferencesDialog(Component parent) {
         setLocationRelativeTo(parent);
         setVisible(true);
         return resultState;
     }
+
+    private Component addGridLabel(int gridX, int gridY, String label) {
+        JLabel jLabel = new JLabel(label);
+        GridBagConstraints constraints = new GridBagConstraints();
+        constraints.anchor = GridBagConstraints.EAST;
+        constraints.insets = new Insets(0, 0, 0, 5);
+        constraints.gridx = gridX;
+        constraints.gridy = gridY;
+        contentPanel.add(jLabel, constraints);
+        return jLabel;
+    }
+
+    private <T> JComboBox<T> createGridComboBox(int gridX, int gridY, T[] options, T selectedItem) {
+        JComboBox<T> jComboBox = new JComboBox<>();
+        GridBagConstraints constraints = new GridBagConstraints();
+        constraints.insets = new Insets(0, 0, 0, 5);
+        constraints.fill = GridBagConstraints.HORIZONTAL;
+        constraints.gridx = gridX;
+        constraints.gridy = gridY;
+        contentPanel.add(jComboBox, constraints);
+
+        Arrays.stream(options).forEach(jComboBox::addItem);
+        jComboBox.setSelectedItem(selectedItem);
+        return jComboBox;
+    }
+
 }
diff --git a/gui/src/main/java/de/vorb/tesseract/gui/work/PageRecognitionProducer.java b/gui/src/main/java/de/vorb/tesseract/gui/work/PageRecognitionProducer.java
index 11acc9a1..bb3e50ed 100644
--- a/gui/src/main/java/de/vorb/tesseract/gui/work/PageRecognitionProducer.java
+++ b/gui/src/main/java/de/vorb/tesseract/gui/work/PageRecognitionProducer.java
@@ -30,6 +30,7 @@ public class PageRecognitionProducer extends RecognitionProducer {
 
     private final TesseractController controller;
     private final HashMap<String, String> variables = new HashMap<>();
+    private int pageSegmentationMode = tesseract.PSM_AUTO;
 
     public PageRecognitionProducer(TesseractController controller,
             Path tessdataDir, String trainingFile) {
@@ -67,7 +68,7 @@ public void reset() throws IOException {
                 tesseract.OEM_DEFAULT);
 
         // set page segmentation mode
-        tesseract.TessBaseAPISetPageSegMode(getHandle(), tesseract.PSM_AUTO);
+        tesseract.TessBaseAPISetPageSegMode(getHandle(), pageSegmentationMode);
 
         // set variables
         for (Entry<String, String> var : variables.entrySet()) {
@@ -80,6 +81,11 @@ public void close() throws IOException {
         tesseract.TessBaseAPIDelete(getHandle());
     }
 
+    public void setPageSegmentationMode(int pageSegmentationMode) {
+        this.pageSegmentationMode = pageSegmentationMode;
+        tesseract.TessBaseAPISetPageSegMode(getHandle(), pageSegmentationMode);
+    }
+
     public void loadImage(Path imageFile) {
         if (lastPix.isPresent()) {
             // destroy old pix

From 9ee77be030857d504fc9ff129d5b25c844a6b2a6 Mon Sep 17 00:00:00 2001
From: Celebrate-future <78527112+Celebrate-future@users.noreply.github.com>
Date: Mon, 29 Mar 2021 21:03:42 +0800
Subject: [PATCH 08/11] Update pom.xml

---
 ocrevalUAtion/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ocrevalUAtion/pom.xml b/ocrevalUAtion/pom.xml
index ad5fe82b..4426a048 100644
--- a/ocrevalUAtion/pom.xml
+++ b/ocrevalUAtion/pom.xml
@@ -226,6 +226,24 @@
             <artifactId>tika-parsers</artifactId>
             <version>1.4</version>
             <type>jar</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.gagravarr</groupId>
+                    <artifactId>vorbis-java-core</artifactId>
+                </exclusion>  
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion> 
+                <exclusion>
+                    <groupId>rome</groupId>
+                    <artifactId>rome</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>

From 25945ec969fc296c26f9d65ad7802e3dd2fbf33f Mon Sep 17 00:00:00 2001
From: Thad Guidry <thadguidry@gmail.com>
Date: Tue, 20 Jul 2021 15:59:02 -0500
Subject: [PATCH 09/11] Add note about Usage page on Wiki

- A link to the Wiki from the README would be useful, it took me over 1 hour to figure this out by happening to have an issue and noting the wiki page referenced in an existing issue.  Having this basic link would have saved time.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 14b981c6..8b2fc31f 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ by Paul Vorbach (German).
 
 [![Donate with PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LF8T2JP2YUUUE)
 
+## Usage
+Basic usage is documented on [our wiki page](https://github.com/tesseract4java/tesseract4java/wiki/Usage)
 
 ## Download
 

From 6ef2d0c86bf3cb6ad3cec7c49e63cc1f5797dd24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 21:06:26 +0000
Subject: [PATCH 10/11] Bump jsoup from 1.7.2 to 1.14.2 in /ocrevalUAtion

Bumps [jsoup](https://github.com/jhy/jsoup) from 1.7.2 to 1.14.2.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.7.2...jsoup-1.14.2)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 ocrevalUAtion/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocrevalUAtion/pom.xml b/ocrevalUAtion/pom.xml
index 4426a048..2e3a43fb 100644
--- a/ocrevalUAtion/pom.xml
+++ b/ocrevalUAtion/pom.xml
@@ -219,7 +219,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.7.2</version>
+            <version>1.14.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>

From 8bc4bf8f789c4c21395dcb776ffc3d87b732fb6c Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
Date: Sun, 17 Dec 2023 15:38:24 +0000
Subject: [PATCH 11/11] vuln-fix: Use HTTPS instead of HTTP to resolve deps
 CVE-2021-26291

This fixes a security vulnerability in this project where the `pom.xml`
files were configuring Maven to resolve dependencies over HTTP instead of
HTTPS.

Weakness: CWE-829: Inclusion of Functionality from Untrusted Control Sphere
Severity: High
CVSS: 8.1
Detection: CodeQL & OpenRewrite (https://app.moderne.io/recipes/org.openrewrite.maven.security.UseHttpsForRepositories)

Reported-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>

Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/8
Detection: CodeQL (https://codeql.github.com/codeql-query-help/java/java-maven-non-https-url/) & OpenRewrite (https://app.moderne.io/recipes/org.openrewrite.maven.security.UseHttpsForRepositories)

Reported-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>

Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/8


Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/IfHkrYfxx?organizationId=QWxsIEdpdEh1Yg%3D%3D

Co-authored-by: Moderne <team@moderne.io>
---
 ocrevalUAtion/pom.xml | 2 +-
 tools/pom.xml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ocrevalUAtion/pom.xml b/ocrevalUAtion/pom.xml
index 2e3a43fb..45b5a58e 100644
--- a/ocrevalUAtion/pom.xml
+++ b/ocrevalUAtion/pom.xml
@@ -264,7 +264,7 @@
         <repository>
             <id>com.springsource.repository.bundles.external</id>
             <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/external</url>
+            <url>https://repository.springsource.com/maven/bundles/external</url>
         </repository>
     </repositories>
 </project>
diff --git a/tools/pom.xml b/tools/pom.xml
index f40d0ea6..7f6c3259 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -47,11 +47,11 @@
     <repositories>
         <repository>
             <id>central</id>
-            <url>http://repo1.maven.org/maven2</url>
+            <url>https://repo1.maven.org/maven2</url>
         </repository>
         <repository>
             <id>imagej</id>
-            <url>http://maven.imagej.net/content/groups/public</url>
+            <url>https://maven.imagej.net/content/groups/public</url>
         </repository>
     </repositories>