diff --git a/dev/before_install b/dev/before_install index 0e56f7c5d32..f7ff69c982d 100755 --- a/dev/before_install +++ b/dev/before_install @@ -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" diff --git a/opengrok-indexer/pom.xml b/opengrok-indexer/pom.xml index 735d6f1c029..52a0c8e79a2 100644 --- a/opengrok-indexer/pom.xml +++ b/opengrok-indexer/pom.xml @@ -162,7 +162,7 @@ Portions Copyright (c) 2020-2020, Lubos Kosco . com.google.jimfs jimfs - 1.2 + 1.3.0 test diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileAnnotationCache.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileAnnotationCache.java index ad2b86f5b60..bf18c7b938e 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileAnnotationCache.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileAnnotationCache.java @@ -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", diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/web/messages/JSONUtils.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/web/messages/JSONUtils.java index 5123f927069..899395d735b 100644 --- a/opengrok-indexer/src/test/java/org/opengrok/indexer/web/messages/JSONUtils.java +++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/web/messages/JSONUtils.java @@ -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; @@ -59,7 +59,7 @@ protected static Set getTopLevelJSONFields(String jsonString) throws IOE continue; } - fields.add(jParser.getCurrentName()); + fields.add(jParser.currentName()); } jParser.close(); diff --git a/pom.xml b/pom.xml index d80abb1457f..8306cb10f7d 100644 --- a/pom.xml +++ b/pom.xml @@ -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 . --> @@ -64,11 +64,11 @@ Portions Copyright (c) 2018, 2020, Chris Fraire . 3.6.0 11 UTF-8 - 3.1.3 + 3.1.7 - 2.15.2 + 2.17.1 5.10.0 2.2 3.0.0-M5 diff --git a/tools/src/main/python/opengrok_tools/utils/java.py b/tools/src/main/python/opengrok_tools/utils/java.py index b267f6defb0..d8d659e7ee7 100755 --- a/tools/src/main/python/opengrok_tools/utils/java.py +++ b/tools/src/main/python/opengrok_tools/utils/java.py @@ -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 . # @@ -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'])