Skip to content

Commit 3ffdecb

Browse files
dependabot[bot]ac-bgelfius
dependabot[bot]
and
ac-bgelfius
authored
Bump org.apache.tika:tika-core from 2.7.0 to 3.2.2 (#75)
* 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](apache/tika@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] <[email protected]> * bump version of tika core * fix downgraded package * update changelog * fix typo * added back missing plugin * reapply missing plugin * add testing isolation --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bryan Gelfius <[email protected]>
1 parent f8a3620 commit 3ffdecb

File tree

4 files changed

+100
-47
lines changed

4 files changed

+100
-47
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ jobs:
9494
command: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V
9595
- run:
9696
name: Run tests
97-
command: mvn test
97+
command: mvn test -DforkCount=1 -DreuseForks=false

‎.gitignore‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,49 @@
1+
# Logs
12
**/*.log
2-
**/*.DS_Store
3-
**/*.idea
3+
4+
# macOS metadata
5+
**/.DS_Store
6+
**/.Spotlight-V100
7+
**/.Trashes
8+
9+
# IDE metadata
10+
**/.idea
411
**/*.iml
5-
target
6-
out
12+
.vscode/
13+
14+
# Build artifacts
15+
target/
16+
out/
17+
18+
# Temporary test files
719
src/test/java/temp
20+
21+
# Sensitive files
822
src/test/resources/*properties*
23+
.env
24+
25+
# Gradle files
926
.gradle
27+
28+
# Java version file
1029
.java-version
30+
31+
# Maven Wrapper
32+
.mvn/
33+
mvnw
34+
mvnw.cmd
35+
36+
# Generated files
37+
generated-sources/
38+
generated-test-sources/
39+
40+
# Test reports
41+
target/surefire-reports/
42+
target/test-classes/
43+
44+
# Compiled files
45+
*.class
46+
*.jar
47+
48+
# Other OS-specific files
49+
Thumbs.db

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## 1.12.2
4+
* small change to fix removed code
5+
6+
## 1.12.1
7+
* reverted jackson version
8+
* **Note: This version is deprecated and should not be used.**
9+
10+
## 1.12.0
11+
12+
* Upgraded `tika-core` dependency to 2.9.4.
13+
* **Note: This version is deprecated and should not be used.**
14+
15+
316
## 1.11.1
417

518
* small updated to http client connection settings

‎pom.xml‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</developers>
2424

2525
<properties>
26-
<postmark.version>1.11.1</postmark.version>
26+
<postmark.version>1.12.2</postmark.version>
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2828
<java.version>1.8</java.version>
2929
<jackson.minimum.version>2.9.7</jackson.minimum.version>
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>org.apache.tika</groupId>
7979
<artifactId>tika-core</artifactId>
80-
<version>2.7.0</version>
80+
<version>2.9.4</version>
8181
</dependency>
8282

8383

@@ -122,8 +122,8 @@
122122
<artifactId>maven-compiler-plugin</artifactId>
123123
<version>3.8.1</version>
124124
<configuration>
125-
<source>1.8</source>
126-
<target>1.8</target>
125+
<source>${java.version}</source>
126+
<target>${java.version}</target>
127127
</configuration>
128128
</plugin>
129129

@@ -134,6 +134,8 @@
134134
<!-- workaround line to make test work on java10 https://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
135135
<configuration>
136136
<useSystemClassLoader>false</useSystemClassLoader>
137+
<forkCount>1</forkCount>
138+
<reuseForks>false</reuseForks>
137139
</configuration>
138140
</plugin>
139141

@@ -142,37 +144,6 @@
142144
<artifactId>maven-failsafe-plugin</artifactId>
143145
<version>2.22.2</version>
144146
</plugin>
145-
146-
<!-- Maven dependency enforcer plugin -->
147-
<plugin>
148-
<groupId>org.apache.maven.plugins</groupId>
149-
<artifactId>maven-enforcer-plugin</artifactId>
150-
<version>3.0.0-M2</version>
151-
152-
<executions>
153-
<execution>
154-
<id>enforce-banned-dependencies</id>
155-
<goals>
156-
<goal>enforce</goal>
157-
</goals>
158-
<configuration>
159-
<rules>
160-
<bannedDependencies>
161-
<searchTransitive>true</searchTransitive>
162-
<excludes>
163-
<exclude>com.fasterxml.jackson.core:jackson-annotations:(,${jackson.minimum.version}]</exclude>
164-
<exclude>com.fasterxml.jackson.core:jackson-core:jar:(,${jackson.minimum.version}]</exclude>
165-
<exclude>com.fasterxml.jackson.core:jackson-databind:jar:(,${jackson.minimum.version}]</exclude>
166-
</excludes>
167-
<message>A banned dependency was found! Need to use jackson newer than ${jackson.minimum.version}.</message>
168-
</bannedDependencies>
169-
</rules>
170-
<fail>true</fail>
171-
</configuration>
172-
</execution>
173-
</executions>
174-
</plugin>
175-
176147
</plugins>
177148

178149
<!-- Resources path -->
@@ -207,10 +178,9 @@
207178
<version>1.6.7</version>
208179
<extensions>true</extensions>
209180
<configuration>
210-
<serverId>ossrh</serverId>
211-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
181+
<serverId>central</serverId>
182+
<nexusUrl>https://ossrh-staging-api.central.sonatype.com/</nexusUrl>
212183
<autoReleaseAfterClose>true</autoReleaseAfterClose>
213-
<skipStaging>true</skipStaging>
214184
</configuration>
215185
</plugin>
216186

@@ -258,21 +228,52 @@
258228
</execution>
259229
</executions>
260230
</plugin>
231+
<!-- Maven dependency enforcer plugin -->
232+
<plugin>
233+
<groupId>org.apache.maven.plugins</groupId>
234+
<artifactId>maven-enforcer-plugin</artifactId>
235+
<version>3.0.0-M2</version>
236+
237+
<executions>
238+
<execution>
239+
<id>enforce-banned-dependencies</id>
240+
<goals>
241+
<goal>enforce</goal>
242+
</goals>
243+
<configuration>
244+
<rules>
245+
<bannedDependencies>
246+
<searchTransitive>true</searchTransitive>
247+
<excludes>
248+
<exclude>com.fasterxml.jackson.core:jackson-annotations:(,${jackson.minimum.version}]</exclude>
249+
<exclude>com.fasterxml.jackson.core:jackson-core:jar:(,${jackson.minimum.version}]</exclude>
250+
<exclude>com.fasterxml.jackson.core:jackson-databind:jar:(,${jackson.minimum.version}]</exclude>
251+
</excludes>
252+
<message>A banned dependency was found! Need to use jackson newer than ${jackson.minimum.version}.</message>
253+
</bannedDependencies>
254+
</rules>
255+
<fail>true</fail>
256+
</configuration>
257+
</execution>
258+
</executions>
259+
</plugin>
260+
261261
</plugins>
262262
</build>
263263

264264
<!-- Maven deploy repository setting -->
265265
<distributionManagement>
266266
<snapshotRepository>
267-
<id>ossrh</id>
268-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
267+
<id>central</id>
268+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
269269
</snapshotRepository>
270270
<repository>
271-
<id>ossrh</id>
272-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
271+
<id>central</id>
272+
<url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
273273
</repository>
274274
</distributionManagement>
275275

276+
276277
</profile>
277278
</profiles>
278279

0 commit comments

Comments
 (0)