Skip to content

Commit 6bba31e

Browse files
ginoaugustinevladak
ginoaugustine
authored and
vladak
committed
upgrade third party dependencies
Signed-off-by: Gino Augustine <[email protected]>
1 parent 13e296f commit 6bba31e

File tree

4 files changed

+29
-26
lines changed

4 files changed

+29
-26
lines changed

‎opengrok-web/pom.xml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,18 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
6868
<dependency>
6969
<groupId>jakarta.servlet.jsp</groupId>
7070
<artifactId>jakarta.servlet.jsp-api</artifactId>
71-
<version>3.1.0</version>
71+
<version>3.1.1</version>
7272
<scope>provided</scope>
7373
</dependency>
74+
<dependency>
75+
<groupId>jakarta.servlet.jsp.jstl</groupId>
76+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
77+
<version>3.0.0</version>
78+
</dependency>
7479
<dependency>
7580
<groupId>org.glassfish.web</groupId>
7681
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
77-
<version>2.0.0</version>
82+
<version>3.0.1</version>
7883
</dependency>
7984
<dependency>
8085
<groupId>org.glassfish.jersey.containers</groupId>
@@ -103,12 +108,12 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
103108
<dependency>
104109
<groupId>org.webjars</groupId>
105110
<artifactId>jquery</artifactId>
106-
<version>3.6.0</version>
111+
<version>3.6.4</version>
107112
</dependency>
108113
<dependency>
109114
<groupId>org.webjars.npm</groupId>
110115
<artifactId>showdown</artifactId>
111-
<version>1.9.1</version>
116+
<version>2.1.0</version>
112117
<!-- dependencies not required -->
113118
<exclusions>
114119
<exclusion>
@@ -132,7 +137,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
132137
<dependency>
133138
<groupId>org.webjars.npm</groupId>
134139
<artifactId>xss</artifactId>
135-
<version>1.0.8</version>
140+
<version>1.0.10</version>
136141
<!-- dependencies not required -->
137142
<exclusions>
138143
<exclusion>
@@ -181,7 +186,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
181186
<dependency>
182187
<groupId>org.modelmapper</groupId>
183188
<artifactId>modelmapper</artifactId>
184-
<version>2.4.4</version>
189+
<version>3.1.1</version>
185190
</dependency>
186191
<dependency>
187192
<groupId>org.hamcrest</groupId>
@@ -213,7 +218,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
213218
<plugin>
214219
<groupId>org.eclipse.jetty</groupId>
215220
<artifactId>jetty-jspc-maven-plugin</artifactId>
216-
<version>11.0.0</version>
221+
<version>11.0.16</version>
217222
<executions>
218223
<execution>
219224
<id>jspc</id>

‎pom.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
155155
<dependency>
156156
<groupId>org.apache.ant</groupId>
157157
<artifactId>ant</artifactId>
158-
<version>1.10.11</version>
158+
<version>1.10.14</version>
159159
</dependency>
160160
<dependency>
161161
<groupId>org.glassfish.jaxb</groupId>
@@ -171,7 +171,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
171171
<dependency>
172172
<groupId>org.awaitility</groupId>
173173
<artifactId>awaitility</artifactId>
174-
<version>4.1.0</version>
174+
<version>4.2.0</version>
175175
<scope>test</scope>
176176
<exclusions>
177177
<exclusion>
@@ -183,7 +183,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
183183
<dependency>
184184
<groupId>org.jetbrains</groupId>
185185
<artifactId>annotations</artifactId>
186-
<version>22.0.0</version>
186+
<version>24.0.1</version>
187187
<scope>provided</scope>
188188
</dependency>
189189
</dependencies>
@@ -215,7 +215,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
215215
<plugin>
216216
<groupId>org.apache.maven.plugins</groupId>
217217
<artifactId>maven-enforcer-plugin</artifactId>
218-
<version>3.0.0-M3</version>
218+
<version>3.4.1</version>
219219
<executions>
220220
<execution>
221221
<id>enforce-maven</id>
@@ -238,7 +238,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
238238
</plugin>
239239
<plugin>
240240
<artifactId>maven-assembly-plugin</artifactId>
241-
<version>3.1.0</version>
241+
<version>3.5.0</version>
242242
<configuration>
243243
<descriptors>
244244
<descriptor>assembly.xml</descriptor>
@@ -259,7 +259,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
259259
<arg>-Xlint:-fallthrough</arg>
260260
</compilerArgs>
261261
</configuration>
262-
<version>3.8.1</version>
262+
<version>3.11.0</version>
263263
</plugin>
264264
<plugin>
265265
<!-- UNIT TEST RUNNER -->
@@ -283,7 +283,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
283283
<plugin>
284284
<groupId>org.jacoco</groupId>
285285
<artifactId>jacoco-maven-plugin</artifactId>
286-
<version>0.8.7</version>
286+
<version>0.8.10</version>
287287
<executions>
288288
<!-- Prepare execution with Surefire -->
289289
<execution>
@@ -352,26 +352,26 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
352352
</configuration>
353353
</plugin>
354354
<plugin>
355-
<artifactId>maven-project-info-reports-plugin</artifactId>
356-
<version>3.1.2</version>
355+
<artifactId>maven-project-info-reports-plugin</artifactId>
356+
<version>3.4.5</version>
357357
</plugin>
358358
<plugin>
359359
<groupId>org.apache.maven.plugins</groupId>
360360
<artifactId>maven-site-plugin</artifactId>
361-
<version>3.9.1</version>
361+
<version>3.12.1</version>
362362
</plugin>
363363
</plugins>
364364
<pluginManagement>
365365
<plugins>
366366
<plugin>
367367
<groupId>org.apache.maven.plugins</groupId>
368368
<artifactId>maven-checkstyle-plugin</artifactId>
369-
<version>3.1.2</version>
369+
<version>3.2.2</version>
370370
<dependencies>
371371
<dependency>
372372
<groupId>com.puppycrawl.tools</groupId>
373373
<artifactId>checkstyle</artifactId>
374-
<version>9.1</version>
374+
<version>9.3</version>
375375
</dependency>
376376
</dependencies>
377377
<executions>
@@ -380,7 +380,6 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
380380
<phase>validate</phase>
381381
<configuration>
382382
<configLocation>/dev/checkstyle/style.xml</configLocation>
383-
<encoding>UTF-8</encoding>
384383
<consoleOutput>true</consoleOutput>
385384
<failsOnError>true</failsOnError>
386385
<suppressionsLocation>/dev/checkstyle/suppressions.xml</suppressionsLocation>

‎suggester/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
101101
<dependency>
102102
<groupId>net.openhft</groupId>
103103
<artifactId>chronicle-map</artifactId>
104-
<version>3.21.85</version>
104+
<version>3.22.9</version>
105105
<exclusions>
106106
<exclusion>
107107
<groupId>com.sun.java</groupId>

‎suggester/src/main/java/org/opengrok/suggest/popular/impl/chronicle/BytesRefDataAccess.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.opengrok.suggest.popular.impl.chronicle;
2424

25-
import net.openhft.chronicle.bytes.HeapBytesStore;
25+
import net.openhft.chronicle.bytes.BytesStore;
2626
import net.openhft.chronicle.bytes.RandomDataInput;
2727
import net.openhft.chronicle.hash.AbstractData;
2828
import net.openhft.chronicle.hash.Data;
@@ -35,13 +35,12 @@
3535

3636
/**
3737
* {@link BytesRef} data serializer for {@link net.openhft.chronicle.map.ChronicleMap}.
38-
* Modified from https://github.com/OpenHFT/Chronicle-Map/blob/master/docs/CM_Tutorial_DataAccess.adoc
38+
* Modified from <a href="https://github.com/OpenHFT/Chronicle-Map/blob/master/docs/CM_Tutorial_DataAccess.adoc">...</a>
3939
*/
40-
@SuppressWarnings("deprecation")
4140
public class BytesRefDataAccess extends AbstractData<BytesRef> implements DataAccess<BytesRef> {
4241

4342
/** Cache field. */
44-
private transient HeapBytesStore<byte[]> bs;
43+
private transient BytesStore<?, ?> bs;
4544

4645
/** State field. */
4746
private transient byte[] array;
@@ -95,7 +94,7 @@ public Data<BytesRef> getData(@NotNull BytesRef instance) {
9594
array = new byte[instance.length];
9695
System.arraycopy(instance.bytes, instance.offset, array, 0, instance.length);
9796
}
98-
bs = HeapBytesStore.wrap(array);
97+
bs = BytesStore.wrap(array);
9998
return this;
10099
}
101100

0 commit comments

Comments
 (0)