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/.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..6a64736 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # 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 * small updated to http client connection settings diff --git a/pom.xml b/pom.xml index ae3505c..d97d945 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ - 1.11.1 + 1.12.2 UTF-8 1.8 2.9.7 @@ -77,7 +77,7 @@ org.apache.tika tika-core - 2.7.0 + 2.9.4 @@ -122,8 +122,8 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + ${java.version} + ${java.version} @@ -134,6 +134,8 @@ false + 1 + false @@ -142,37 +144,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 +178,9 @@ 1.6.7 true - ossrh - https://s01.oss.sonatype.org/ + central + https://ossrh-staging-api.central.sonatype.com/ true - true @@ -258,21 +228,52 @@ + + + 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 + + + + + - 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/ +