Skip to content

Commit c63f944

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fb_bigVersionBumps
# Conflicts: # gradle.properties
2 parents b48677c + 0b717b6 commit c63f944

1 file changed

Lines changed: 13 additions & 17 deletions

File tree

gradle.properties

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
6060
artifactoryPluginVersion=5.2.5
6161
gradleNodePluginVersion=3.5.1
6262
gradlePluginsVersion=4.2.0
63-
owaspDependencyCheckPluginVersion=11.0.0
63+
owaspDependencyCheckPluginVersion=11.1.0
6464
versioningPluginVersion=1.1.2
6565

6666
# Versions of node and npm to use during the build. If set, these versions
@@ -112,8 +112,8 @@ asmVersion=9.7.1
112112
batikVersion=1.18
113113

114114
# sync with Tika version (or later)
115-
bouncycastlePgpVersion=1.78.1
116-
bouncycastleVersion=1.78.1
115+
bouncycastlePgpVersion=1.79
116+
bouncycastleVersion=1.79
117117

118118
cglibNodepVersion=2.2.3
119119

@@ -129,7 +129,7 @@ commonsCompressVersion=1.27.1
129129
commonsDbcpVersion=1.4
130130
commonsDiscoveryVersion=0.2
131131
commonsDigesterVersion=1.8.1
132-
commonsIoVersion=2.17.0
132+
commonsIoVersion=2.18.0
133133
commonsLangVersion=2.6
134134
commonsLang3Version=3.17.0
135135
commonsLoggingVersion=1.3.4
@@ -139,7 +139,7 @@ commonsTextVersion=1.12.0
139139
commonsValidatorVersion=1.9.0
140140
commonsVfs2Version=2.7.0
141141

142-
datadogVersion=1.41.1
142+
datadogVersion=1.42.2
143143

144144
dom4jVersion=2.1.4
145145

@@ -155,8 +155,8 @@ fopVersion=2.10
155155

156156
# Force latest for consistency
157157
googleAutoValueAnnotationsVersion=1.10.4
158-
googleErrorProneAnnotationsVersion=2.33.0
159-
googleHttpClientVersion=1.45.0
158+
googleErrorProneAnnotationsVersion=2.36.0
159+
googleHttpClientVersion=1.45.1
160160
googleOauthClientVersion=1.36.0
161161
googleProtocolBufVersion=3.25.5
162162

@@ -168,7 +168,7 @@ graalVersion=24.1.1
168168
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
169169
gsonVersion=2.8.9
170170

171-
grpcVersion=1.67.1
171+
grpcVersion=1.68.1
172172

173173
guavaVersion=33.3.1-jre
174174

@@ -184,15 +184,15 @@ hamcrestVersion=2.2
184184
# Note: if changing this, we might need to match with the picard version in the SequenceAnalysis module build.gradle
185185
htsjdkVersion=4.0.0
186186

187-
httpclient5Version=5.4
188-
httpcore5Version=5.3
187+
httpclient5Version=5.4.1
188+
httpcore5Version=5.3.1
189189

190190
# Not used directly, but these are widely used transitive dependencies
191191
httpclientVersion=4.5.14
192192
httpcoreVersion=4.4.16
193193

194194
# Jackson dependencies are usually released in tandem, but occasionally one gets a patch release out-of-sync with the others
195-
jacksonVersion=2.18.0
195+
jacksonVersion=2.18.1
196196
jacksonAnnotationsVersion=2.18.0
197197
jacksonDatabindVersion=2.18.0
198198
jacksonJaxrsBaseVersion=2.18.0
@@ -235,16 +235,14 @@ jxlVersion=2.6.3
235235

236236
kaptchaVersion=2.3
237237

238-
log4j2Version=2.24.1
238+
log4j2Version=2.24.2
239239

240-
lombokVersion=1.18.34
240+
lombokVersion=1.18.36
241241

242242
luceneVersion=9.12.0
243243

244244
mssqlJdbcVersion=12.8.1.jre11
245245

246-
mysqlDriverVersion=9.1.0
247-
248246
# forced compatibility between docker and UserReg-WS
249247
nettyVersion=4.1.115.Final
250248

@@ -255,8 +253,6 @@ opencsvVersion=2.3
255253

256254
openTracingVersion=0.33.0
257255

258-
oracleJdbcVersion=23.5.0.24.07
259-
260256
# sync with version Tika ships
261257
pdfboxVersion=3.0.3
262258

0 commit comments

Comments
 (0)