diff --git a/.travis.yml b/.travis.yml index dfbdf1fbc..0943741d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ addons: - libcppunit-dev - gcovr - libfl-dev # needed for focal, but not xenial. jhrg 1/18/24 - - openjdk-17-jre # This should get Java 17. jhrg 1/18/24 + # - openjdk-17-jre # Removed, see hack in before_install: jhrg 1/23/24 # remove support for debian packages. jhrg 2/23/21 # - build-essential # - lintian @@ -90,6 +90,12 @@ env: before_install: - pip install --user awscli + # fix for Java 17 install for Sonar from Travis CI support. jhrg 1/23/24 + - curl -s "https://get.sdkman.io" | bash + - source "$HOME/.sdkman/bin/sdkman-init.sh" + - sdk install java 17.0.2-open + - sdk use java 17.0.2-open + - java -version install: # $HOME is /home/travis and $TRAVIS_BUILD_DIR is /home/travis/build/OPENDAP/libdap4 diff --git a/sonar-project.properties b/sonar-project.properties index 7cd971090..6af408ec4 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,7 +5,7 @@ sonar.projectName=OPeNDAP libdap sonar.projectVersion=1.0 # Hack added to keep us going until Jan 28th, 2024. jhrg 1/18/24 -sonar.scanner.force-deprecated-java-version=true +# sonar.scanner.force-deprecated-java-version=true sonar.sources=. sonar.exclusions=old/**,debian/**,gl/**,VCPP/**,win32/**