Skip to content

Jackson update #4584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions dev/before_install
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,6 @@ elif [[ "$RUNNER_OS" == "macOS" ]]; then
exit 1
fi

brew install python3
brew upgrade python

./dev/install-python-packages.sh
if [[ $? != 0 ]]; then
echo "cannot install Python packages"
exit 1
fi

sudo ./dev/install-universal_ctags.sh
if [[ $? != 0 ]]; then
echo "cannot install Universal ctags"
Expand Down
2 changes: 1 addition & 1 deletion opengrok-indexer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
<dependency>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
<version>1.2</version>
<version>1.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ String getRevision(File file) throws CacheException {
parser.nextToken();
}

if (parser.getCurrentName().equals("revision")) {
if (parser.currentName().equals("revision")) {
parser.nextToken();
if (!parser.getCurrentToken().equals(JsonToken.VALUE_STRING)) {
LOGGER.log(Level.WARNING, "the value of the ''revision'' field in ''{0}'' is not string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
*/
package org.opengrok.indexer.web.messages;

Expand Down Expand Up @@ -59,7 +59,7 @@ protected static Set<String> getTopLevelJSONFields(String jsonString) throws IOE
continue;
}

fields.add(jParser.getCurrentName());
fields.add(jParser.currentName());
}
jParser.close();

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]

CDDL HEADER END

Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.

-->
Expand Down Expand Up @@ -64,11 +64,11 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
<mavenjavadocplugin.version>3.6.0</mavenjavadocplugin.version>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey.version>3.1.3</jersey.version>
<jersey.version>3.1.7</jersey.version>
<!-- Jackson version needs to match the version of Jackson which Jersey
(notably the jersey-media-json-jackson artifact used in opengrok-web)
depends on or otherwise weird things will happen. -->
<jackson.version>2.15.2</jackson.version>
<jackson.version>2.17.1</jackson.version>
<junit.version>5.10.0</junit.version>
<hamcrest.version>2.2</hamcrest.version>
<maven-surefire.version>3.0.0-M5</maven-surefire.version>
Expand Down
5 changes: 3 additions & 2 deletions tools/src/main/python/opengrok_tools/utils/java.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# CDDL HEADER END

#
# Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
# Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
#

Expand Down Expand Up @@ -82,12 +82,13 @@ def FindJava(self, logger):
system_name = platform.system()
if system_name == 'SunOS':
rel = platform.release()
java_home = None
if rel == '5.10':
java_home = "/usr/jdk/instances/jdk1.7.0"
elif rel == '5.11':
java_home = "/usr/jdk/latest"

if os.path.isdir(java_home):
if java_home and os.path.isdir(java_home):
java = os.path.join(java_home, 'bin', 'java')
elif system_name == 'Darwin':
cmd = Command(['/usr/libexec/java_home'])
Expand Down
Loading