From 3a414db9b281cb2d4e52bbe359537d5493c63582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Dec 2025 02:30:31 +0000 Subject: [PATCH 1/8] Bump org.apache.tika:tika-core from 2.7.0 to 3.2.2 Bumps [org.apache.tika:tika-core](https://github.com/apache/tika) from 2.7.0 to 3.2.2. - [Changelog](https://github.com/apache/tika/blob/main/CHANGES.txt) - [Commits](https://github.com/apache/tika/compare/2.7.0...3.2.2) --- updated-dependencies: - dependency-name: org.apache.tika:tika-core dependency-version: 3.2.2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae3505c..c90b5d4 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.apache.tika tika-core - 2.7.0 + 3.2.2 From e9a1e061c7c3209314614dc2d496bff6877ec30b Mon Sep 17 00:00:00 2001 From: Bryan Gelfius Date: Mon, 29 Dec 2025 09:22:47 -0500 Subject: [PATCH 2/8] bump version of tika core --- .gitignore | 47 +++++++++++++++++++++++++++++++++++++++---- CHANGELOG.md | 5 +++++ pom.xml | 57 ++++++++++++---------------------------------------- 3 files changed, 61 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 73bd6c2..29bb34f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,49 @@ +# Logs **/*.log -**/*.DS_Store -**/*.idea + +# macOS metadata +**/.DS_Store +**/.Spotlight-V100 +**/.Trashes + +# IDE metadata +**/.idea **/*.iml -target -out +.vscode/ + +# Build artifacts +target/ +out/ + +# Temporary test files src/test/java/temp + +# Sensitive files src/test/resources/*properties* +.env + +# Gradle files .gradle + +# Java version file .java-version + +# Maven Wrapper +.mvn/ +mvnw +mvnw.cmd + +# Generated files +generated-sources/ +generated-test-sources/ + +# Test reports +target/surefire-reports/ +target/test-classes/ + +# Compiled files +*.class +*.jar + +# Other OS-specific files +Thumbs.db diff --git a/CHANGELOG.md b/CHANGELOG.md index a1aec88..af60d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.0.0-SNAPSHOT + +* **BREAKING CHANGE:** The project now requires Java 11 or later. +* Upgraded `tika-core` dependency to 3.2.3. + ## 1.11.1 * small updated to http client connection settings diff --git a/pom.xml b/pom.xml index c90b5d4..0c3ad96 100644 --- a/pom.xml +++ b/pom.xml @@ -23,11 +23,11 @@ - 1.11.1 + 1.12.0 UTF-8 1.8 - 2.9.7 - 2.14.1 + 2.9.4 + 2.9.4 5.8.2 1.3.2 @@ -77,7 +77,7 @@ org.apache.tika tika-core - 3.2.2 + 2.9.4 @@ -122,8 +122,8 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + ${java.version} + ${java.version} @@ -142,37 +142,6 @@ maven-failsafe-plugin 2.22.2 - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M2 - - - - enforce-banned-dependencies - - enforce - - - - - true - - com.fasterxml.jackson.core:jackson-annotations:(,${jackson.minimum.version}] - com.fasterxml.jackson.core:jackson-core:jar:(,${jackson.minimum.version}] - com.fasterxml.jackson.core:jackson-databind:jar:(,${jackson.minimum.version}] - - A banned dependency was found! Need to use jackson newer than ${jackson.minimum.version}. - - - true - - - - - @@ -207,10 +176,9 @@ 1.6.7 true - ossrh - https://s01.oss.sonatype.org/ + central + https://ossrh-staging-api.central.sonatype.com/ true - true @@ -264,15 +232,16 @@ - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots/ - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + central + https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/ + From 1849c1059695a086c257e4bcbb6838bc0e75dd3e Mon Sep 17 00:00:00 2001 From: Bryan Gelfius Date: Mon, 29 Dec 2025 09:44:48 -0500 Subject: [PATCH 3/8] fix downgraded package --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0c3ad96..0bc8fd5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,11 +23,11 @@ - 1.12.0 + 1.12.1 UTF-8 1.8 2.9.4 - 2.9.4 + 2.14.1 5.8.2 1.3.2 From ec3b550e1a1e49e321913a004be74dc025ef452a Mon Sep 17 00:00:00 2001 From: Bryan Gelfius Date: Mon, 29 Dec 2025 09:48:38 -0500 Subject: [PATCH 4/8] update changelog --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af60d7b..18e2cff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog -## 2.0.0-SNAPSHOT +## 1.12.1 +* reverted jackson version -* **BREAKING CHANGE:** The project now requires Java 11 or later. -* Upgraded `tika-core` dependency to 3.2.3. +## 1.12.0 + +* Upgraded `tika-core` dependency to 2.9.4. ## 1.11.1 From ab38bdfeab6009f595d8a2898f3e600d2e1fa178 Mon Sep 17 00:00:00 2001 From: Bryan Gelfius Date: Mon, 29 Dec 2025 09:50:44 -0500 Subject: [PATCH 5/8] fix typo --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bc8fd5..bd82364 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.12.1 UTF-8 1.8 - 2.9.4 + 2.9.7 2.14.1 5.8.2 1.3.2 From e6977bea30052ac4c112584d0ad43336977b7e7c Mon Sep 17 00:00:00 2001 From: Bryan Gelfius Date: Mon, 29 Dec 2025 09:53:48 -0500 Subject: [PATCH 6/8] added back missing plugin --- pom.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pom.xml b/pom.xml index bd82364..a312609 100644 --- a/pom.xml +++ b/pom.xml @@ -226,6 +226,36 @@ + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M2 + + + + enforce-banned-dependencies + + enforce + + + + + true + + com.fasterxml.jackson.core:jackson-annotations:(,${jackson.minimum.version}] + com.fasterxml.jackson.core:jackson-core:jar:(,${jackson.minimum.version}] + com.fasterxml.jackson.core:jackson-databind:jar:(,${jackson.minimum.version}] + + A banned dependency was found! Need to use jackson newer than ${jackson.minimum.version}. + + + true + + + + + From 4d60e6629741b66855f6e71826fafe241cea728f Mon Sep 17 00:00:00 2001 From: Bryan Gelfius Date: Mon, 29 Dec 2025 10:03:11 -0500 Subject: [PATCH 7/8] reapply missing plugin --- CHANGELOG.md | 6 ++++++ pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18e2cff..6a64736 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # Changelog +## 1.12.2 +* small change to fix removed code + ## 1.12.1 * reverted jackson version +* **Note: This version is deprecated and should not be used.** ## 1.12.0 * Upgraded `tika-core` dependency to 2.9.4. +* **Note: This version is deprecated and should not be used.** + ## 1.11.1 diff --git a/pom.xml b/pom.xml index a312609..359b4c2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ - 1.12.1 + 1.12.2 UTF-8 1.8 2.9.7 From eb601a79143d2f30c8f1d3b1b663ba2de9880298 Mon Sep 17 00:00:00 2001 From: Bryan Gelfius Date: Mon, 29 Dec 2025 10:51:31 -0500 Subject: [PATCH 8/8] add testing isolation --- .circleci/config.yml | 2 +- pom.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35f19df..f62d87c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,4 +94,4 @@ jobs: command: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V - run: name: Run tests - command: mvn test + command: mvn test -DforkCount=1 -DreuseForks=false diff --git a/pom.xml b/pom.xml index 359b4c2..d97d945 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,8 @@ false + 1 + false