Skip to content

Commit

Permalink
Merge 23.7 to develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
cnathe committed Sep 26, 2023
2 parents d81ee99 + 9b139d6 commit 9143879
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ apacheDirectoryVersion=2.1.3
apacheMinaVersion=2.2.1

# Keep in sync with springBootTomcatVersion below
apacheTomcatVersion=9.0.76
apacheTomcatVersion=9.0.80

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand All @@ -128,7 +128,7 @@ commonsCollectionsVersion=3.2.2
commonsCollections4Version=4.4
commonsCodecVersion=1.15
# sync with version Tika ships
commonsCompressVersion=1.23.0
commonsCompressVersion=1.24.0
commonsDbcpVersion=1.4
commonsDiscoveryVersion=0.2
commonsDigesterVersion=1.8.1
Expand Down Expand Up @@ -279,10 +279,10 @@ slf4jLog4j12Version=2.0.7
# this version is forced for compatibility with api, LDK, and workflow
slf4jLog4jApiVersion=2.0.7

springBootVersion=2.7.13
springBootVersion=2.7.16
# This MUST match the Tomcat version dictated by springBootVersion
# Also, keep this in sync with apacheTomcatVersion above
springBootTomcatVersion=9.0.76
springBootTomcatVersion=9.0.80

springVersion=5.3.28

Expand Down

0 comments on commit 9143879

Please sign in to comment.