Migrate Service from Spring 2.x and JUnit 4 to Spring 3.3 and JUnit 5

.github/workflows/docker.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker
         uses: docker/setup-buildx-action@v1

.github/workflows/integration.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker
         uses: docker/setup-buildx-action@v1

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker
         uses: docker/setup-buildx-action@v1

.github/workflows/source.yml

@@ -14,7 +14,7 @@ jobs:
 #        java: [ '8' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache Maven packages
         uses: actions/cache@v2

.github/workflows/testall.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker
         uses: docker/setup-buildx-action@v1

docker/build-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:8-jdk-focal 
+FROM eclipse-temurin:21-jdk
 
 RUN mkdir -p /usr/share/man/man1
 RUN apt-get update && apt-get install -y netcat-openbsd zip git less \
@@ -7,31 +7,41 @@ RUN cd /usr/bin && ln -s python3 python
 
 COPY cacerts/README.md cacerts/*.crt /usr/local/share/ca-certificates/
 RUN update-ca-certificates
-RUN java_certs=$JAVA_HOME/jre/lib/security/cacerts; \
+RUN java_certs=$JAVA_HOME/lib/security/cacerts; \
     add_certs=`ls /usr/local/share/ca-certificates/*.crt` && \
     for crt in $add_certs; do \
         name=`basename -s .crt $crt`; \
         echo -n ${name}: " "; \
         keytool -import -keystore $java_certs -trustcacerts -file $crt \
                 -storepass changeit -alias $name -noprompt; \
     done;
-FROM eclipse-temurin:8
+FROM eclipse-temurin:21
 
 RUN mkdir -p /usr/share/man/man1
 RUN apt-get update && apt-get install -y netcat-openbsd zip git less \
-                                            python2 curl maven
-RUN cd /usr/bin && ln -s python2 python
+                                            python3 curl maven
+RUN cd /usr/bin && ln -s python3 python
 
 # Create the user that build/test operations should run as.  Normally,
 # this is set to match identity information of the host user that is
-# launching the container.
+# launching the container.  We have to allow for the possibility that
+# the user login name and/or UID exists already.
 #
 RUN sed --in-place -e '/CREATE_MAIL_SPOOL/ s/=yes/=no/' /etc/default/useradd
-ARG devuser=developer
+ARG devuser=ubuntu
 ARG devuid=1000
+
+# Consider if login name exists but not UID; if so, move the login name out of the way
+RUN grep -qs "^${devuser}:" /etc/group && grep -qs :${devuid}: /etc/group || \
+    groupmod -n ${devuser}os ${devuser}
+RUN grep -qs "^${devuser}:" /etc/passwd && \
+    grep -qsE ":${devuid}:[[:digit:]]+:" /etc/passwd ||    \
+    usermod -l ${devuser}os -d /home/${devuser}os -m $devuser
+
+# Now create the development user, if necessary
 RUN grep -qs :${devuid}: /etc/group || \
     groupadd --gid $devuid $devuser
-RUN grep -qs ":${devuid}:[[:digit:]]+:" /etc/passwd || \
+RUN grep -Eqs ":${devuid}:[[:digit:]]+:" /etc/passwd || \
     useradd -m --comment "OAR Developer" --shell /bin/bash \
             --gid $devuid --uid $devuid $devuser
 RUN mkdir /home/$devuser/.m2