Skip to content

Commit a676d31

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fb_updateStartAndStopTasks
# Conflicts: # gradle.properties
2 parents 3c2e38c + b3526d1 commit a676d31

File tree

3 files changed

+51
-28
lines changed

3 files changed

+51
-28
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,6 @@ allprojects {
210210
force "org.slf4j:slf4j-api:${slf4jLog4jApiVersion}"
211211
// force some newer versions than are brought in by mondrian (et al.)
212212
force "xerces:xercesImpl:${xercesImplVersion}"
213-
// Microsoft SQL Server JDBC driver and Duo SDK pull in different versions of byte-buddy
214-
force "net.bytebuddy:byte-buddy:${byteBuddyVersion}"
215213
force "org.apache.logging.log4j:log4j-core:${log4j2Version}"
216214
force "org.apache.logging.log4j:log4j-api:${log4j2Version}"
217215
force "org.apache.logging.log4j:log4j-1.2-api:${log4j2Version}"
@@ -250,6 +248,8 @@ allprojects {
250248
force "com.google.protobuf:protobuf-java-util:${googleProtocolBufVersion}"
251249
// force version for Cloud, FileTransfer, SequenceAnalysis, etc.
252250
force "com.google.code.findbugs:jsr305:${jsr305Version}"
251+
// force version used by JAXB to match api
252+
force "org.eclipse.angus:angus-activation:${angusActivationVersion}"
253253
// force Jakarta Activation API version used by our Angus Activation implementation
254254
force "jakarta.activation:jakarta.activation-api:${jakartaActivationApiVersion}"
255255
// force version for accounts, api, query

dependencyCheckSuppression.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,29 @@
139139
<packageUrl regex="true">^pkg:maven/com\.google\.code\.gson/gson@.*$</packageUrl>
140140
<vulnerabilityName>CVE-2025-53864</vulnerabilityName>
141141
</suppress>
142+
143+
<!--
144+
False positives - API jars are getting matched to old (18.3) LabKey Server releases
145+
-->
146+
<suppress>
147+
<notes><![CDATA[
148+
file name: provisioning-2.1.0-api.jar
149+
]]></notes>
150+
<packageUrl regex="true">^pkg:maven/org\.labkey\.api/provisioning@.*$</packageUrl>
151+
<cpe>cpe:/a:labkey:labkey_server</cpe>
152+
</suppress>
153+
<suppress>
154+
<notes><![CDATA[
155+
file name: labkey-client-api-7.0.0.jar
156+
]]></notes>
157+
<packageUrl regex="true">^pkg:maven/org\.labkey\.api/labkey-client-api@.*$</packageUrl>
158+
<cpe>cpe:/a:labkey:labkey_server</cpe>
159+
</suppress>
160+
<suppress>
161+
<notes><![CDATA[
162+
file name: labkey-api-jdbc-3.1.0-all.jar
163+
]]></notes>
164+
<packageUrl regex="true">^pkg:maven/org\.labkey\.api/labkey-api-jdbc@.*$</packageUrl>
165+
<cpe>cpe:/a:labkey:labkey_server</cpe>
166+
</suppress>
142167
</suppressions>

gradle.properties

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ windowsProteomicsBinariesVersion=1.0
5959
# The current version numbers for the gradle plugins.
6060
artifactoryPluginVersion=5.2.5
6161
gradleNodePluginVersion=7.1.0
62-
gradlePluginsVersion=7.1.0-updateStartAndStopTasks-SNAPSHOT
63-
owaspDependencyCheckPluginVersion=12.1.6
62+
gradlePluginsVersion=7.1.0
63+
owaspDependencyCheckPluginVersion=12.1.8
6464
versioningPluginVersion=1.1.2
6565

6666
# Versions of node and npm to use during the build. If set, these versions
@@ -86,8 +86,8 @@ npmWorkDirectory=.node
8686
# convention is <library name>Version camel-cased, i.e. "jacksonVersion".
8787

8888
# The implementation of Jakarta Activation API that we use. Keep in sync with jakartaActivationApiVersion (below).
89-
angusActivationVersion=2.0.2
90-
angusMailVersion=2.0.4
89+
angusActivationVersion=2.0.3
90+
angusMailVersion=2.0.5
9191

9292
annotationsVersion=15.0
9393

@@ -104,22 +104,20 @@ apacheTomcatVersion=10.1.46
104104
# (mothership) -> json-path -> json-smart -> accessor-smart
105105
# (core) -> graalvm
106106
# tika
107-
asmVersion=9.8
107+
asmVersion=9.9
108108

109109
# Apache Batik -- Batik version needs to be compatible with Apache FOP, but we need to pull in batik-codec separately
110110
batikVersion=1.19
111111

112112
# sync with Tika version (or later)
113-
bouncycastlePgpVersion=1.81
114-
bouncycastleVersion=1.81
115-
116-
byteBuddyVersion=1.17.7
113+
bouncycastlePgpVersion=1.82
114+
bouncycastleVersion=1.82
117115

118116
cglibNodepVersion=2.2.3
119117

120118
checkerQualVersion=3.31.0
121119

122-
commonmarkVersion=0.25.1
120+
commonmarkVersion=0.27.0
123121

124122
# the beanutils version is not the default version brought from commons-validator and/or commons-digester
125123
# in the :server:api module but is required for some of our code to compile
@@ -132,7 +130,7 @@ commonsDbcpVersion=1.4
132130
commonsDigesterVersion=1.8.1
133131
commonsDiscoveryVersion=0.2
134132
commonsIoVersion=2.20.0
135-
commonsLang3Version=3.18.0
133+
commonsLang3Version=3.19.0
136134
commonsLangVersion=2.6
137135
commonsLoggingVersion=1.3.5
138136
commonsMath3Version=3.6.1
@@ -141,7 +139,7 @@ commonsTextVersion=1.14.0
141139
commonsValidatorVersion=1.10.0
142140
commonsVfs2Version=2.10.0
143141

144-
datadogVersion=1.52.1
142+
datadogVersion=1.54.0
145143

146144
dom4jVersion=2.1.4
147145

@@ -157,8 +155,8 @@ fopVersion=2.11
157155

158156
# Force latest for consistency
159157
googleAutoValueAnnotationsVersion=1.10.4
160-
googleErrorProneAnnotationsVersion=2.41.0
161-
googleHttpClientVersion=2.0.0
158+
googleErrorProneAnnotationsVersion=2.42.0
159+
googleHttpClientVersion=2.0.2
162160
googleOauthClientVersion=1.39.0
163161
googleProtocolBufVersion=3.25.8
164162

@@ -168,9 +166,9 @@ googleProtocolBufVersion=3.25.8
168166
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
169167
gsonVersion=2.8.9
170168

171-
grpcVersion=1.75.0
169+
grpcVersion=1.76.0
172170

173-
guavaVersion=33.4.8-jre
171+
guavaVersion=33.5.0-jre
174172

175173
# Note: You won't find usages in the product sources; this property is used by the gradle plugin.
176174
gwtVersion=2.12.2
@@ -184,8 +182,8 @@ hamcrestVersion=2.2
184182
# Note: if changing this, we might need to match with the picard version in the SequenceAnalysis module build.gradle
185183
htsjdkVersion=4.3.0
186184

187-
httpclient5Version=5.5
188-
httpcore5Version=5.3.5
185+
httpclient5Version=5.5.1
186+
httpcore5Version=5.3.6
189187

190188
# Not used directly, but these are widely used transitive dependencies
191189
httpclientVersion=4.5.14
@@ -201,7 +199,7 @@ jacksonDatabindVersion=2.20.0
201199
jacksonJaxrsBaseVersion=2.20.0
202200

203201
# The Jakarta Activation API version that Angus Activation implements. Keep in sync with angusActivationVersion (above).
204-
jakartaActivationApiVersion=2.1.3
202+
jakartaActivationApiVersion=2.1.4
205203

206204
jamaVersion=1.0.3
207205

@@ -241,16 +239,16 @@ jxlVersion=2.6.3
241239

242240
kaptchaVersion=2.3
243241

244-
log4j2Version=2.24.3
242+
log4j2Version=2.25.2
245243

246-
lombokVersion=1.18.38
244+
lombokVersion=1.18.42
247245

248-
luceneVersion=9.12.2
246+
luceneVersion=9.12.3
249247

250-
mssqlJdbcVersion=13.2.0.jre11
248+
mssqlJdbcVersion=13.2.1.jre11
251249

252250
# force for docker
253-
nettyVersion=4.2.5.Final
251+
nettyVersion=4.2.7.Final
254252

255253
objenesisVersion=1.0
256254

@@ -267,7 +265,7 @@ poiVersion=5.4.0
267265
pollingWatchVersion=0.2.0
268266

269267
# Newer versions of the driver have a perf degradation that's important for us. https://github.com/pgjdbc/pgjdbc/issues/3505
270-
postgresqlDriverVersion=42.7.4
268+
postgresqlDriverVersion=42.7.8
271269

272270
quartzVersion=2.5.0
273271

@@ -302,7 +300,7 @@ stax2ApiVersion=4.2.2
302300
thumbnailatorVersion=0.4.20
303301

304302
# used for tika-core in API and tika-parsers in search
305-
tikaVersion=3.2.2
303+
tikaVersion=3.2.3
306304

307305
# sync with Tika
308306
tukaaniXZVersion=1.10

0 commit comments

Comments
 (0)