Skip to content

Commit 264cf7f

Browse files
committed
update jackson
1 parent a146392 commit 264cf7f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileAnnotationCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ String getRevision(File file) throws CacheException {
9999
parser.nextToken();
100100
}
101101

102-
if (parser.getCurrentName().equals("revision")) {
102+
if (parser.currentName().equals("revision")) {
103103
parser.nextToken();
104104
if (!parser.getCurrentToken().equals(JsonToken.VALUE_STRING)) {
105105
LOGGER.log(Level.WARNING, "the value of the ''revision'' field in ''{0}'' is not string",

opengrok-indexer/src/test/java/org/opengrok/indexer/web/messages/JSONUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/*
21-
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
21+
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
2222
*/
2323
package org.opengrok.indexer.web.messages;
2424

@@ -59,7 +59,7 @@ protected static Set<String> getTopLevelJSONFields(String jsonString) throws IOE
5959
continue;
6060
}
6161

62-
fields.add(jParser.getCurrentName());
62+
fields.add(jParser.currentName());
6363
}
6464
jParser.close();
6565

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1818
1919
CDDL HEADER END
2020
21-
Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
21+
Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
2323
2424
-->
@@ -64,11 +64,11 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
6464
<mavenjavadocplugin.version>3.6.0</mavenjavadocplugin.version>
6565
<java.version>11</java.version>
6666
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
67-
<jersey.version>3.1.3</jersey.version>
67+
<jersey.version>3.1.7</jersey.version>
6868
<!-- Jackson version needs to match the version of Jackson which Jersey
6969
(notably the jersey-media-json-jackson artifact used in opengrok-web)
7070
depends on or otherwise weird things will happen. -->
71-
<jackson.version>2.15.2</jackson.version>
71+
<jackson.version>2.17.1</jackson.version>
7272
<junit.version>5.10.0</junit.version>
7373
<hamcrest.version>2.2</hamcrest.version>
7474
<maven-surefire.version>3.0.0-M5</maven-surefire.version>

0 commit comments

Comments
 (0)