Merge branch 'develop' into 'master'

Update Android containers

See merge request !92

android-build-server/Dockerfile

-FROM adoptopenjdk/openjdk11:alpine
+FROM amazoncorretto:17-alpine
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -19,7 +19,7 @@ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}
 WORKDIR /opt
 RUN apk add --no-cache curl bash unzip libstdc++ su-exec
 RUN mkdir -p /opt/android-sdk-linux/cmdline-tools \
-    && curl -q -o commandlinetools.zip -L https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip \
+    && curl -q -o commandlinetools.zip -L https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
     && unzip -q commandlinetools.zip -d ${ANDROID_HOME}/cmdline-tools \
     && mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
     && rm -f commandlinetools.zip

static-code-analysis/android/Dockerfile

@@ -12,7 +12,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
 
-ENV SONAR_SCANNER_VERSION 4.6.0.2311
+ENV SONAR_SCANNER_VERSION 6.1.0.4477
 ENV SONAR_HOME /opt/sonar-scanner
 
 ENV PATH ${PATH}:${SONAR_HOME}