Merge pull request #21 from indiana-university/q3_updates_LMSA-9263

LMSA-9263 - q3 library updates and spring boot upgrade
indiana-university · Oct 4, 2024 · 5878662 · 5878662
2 parents a192950 + 468b8c8
commit 5878662
Show file tree

Hide file tree

Showing 31 changed files with 7,349 additions and 433 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,10 +38,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
 

diff --git a/.github/workflows/kube-deploy.yml b/.github/workflows/kube-deploy.yml
@@ -55,7 +55,7 @@ jobs:
     name: Maven Build
     runs-on: self-hosted
     container:
-      image: maven:3.9.4-eclipse-temurin-17
+      image: maven:3.9.9-eclipse-temurin-21
     environment: ${{ github.event.inputs.server_env }}
     steps:
       - name: Clone GitHub root repository
@@ -74,15 +74,15 @@ jobs:
       - name: Create maven settings.xml
         run: echo -n '${{ secrets.LMS_MAVEN_SETTINGS }}' | base64 -d > /root/.m2/settings.xml
       - name: Maven Build
-        run: mvn clean install -P '${{ vars.BUILD_PROFILES}}'
+        run: mvn clean install -B -P '${{ vars.BUILD_PROFILES}}'
         working-directory: tools/${{ vars.DEPLOY_DIR }}
       - name: copy jar file
         run: |
           mkdir -p deployments/${{ vars.DEPLOY_DIR }}/lib
           cp tools/${{ vars.DEPLOY_DIR }}/target/${{ vars.JAR_FILE }} deployments/${{ vars.DEPLOY_DIR }}/lib/${{ vars.JAR_FILE }}
       - name: build/push docker image
         run: |
-          mvn clean install -P docker-push -D dockerfile.username=${{ secrets.LMS_REGISTRY_USERNAME }} \
+          mvn clean install -B -P docker-push -D dockerfile.username=${{ secrets.LMS_REGISTRY_USERNAME }} \
             -D dockerfile.password=${{ secrets.LMS_REGISTRY_PASSWORD }} -D docker_repository_base=registry.docker.iu.edu/lms/ \
             -D docker_tag=${{ vars.DOCKER_TAG }}
         working-directory: deployments/${{ vars.DEPLOY_DIR }}

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
       - name: Release prepare/perform

diff --git a/README.md b/README.md
@@ -134,18 +134,18 @@ Job processing happens in the background, via a RabbitMQ job.  Configuring the q
 If you would like to use Redis for session storage, you will need to enable it by including the value `redis-session` into the `SPRING_PROFILES_ACTIVE` environment variable. Be aware that if the tool requires multiple values, that there could be more than one profile value in there.
 
 Additionally, the following properties need to be set to configure the communication with Redis.
-Then can be set in a properties file, or overridden as environment variables.
+They can be set in a properties file, or overridden as environment variables.
 
-| Property                | Description                                    |
-|-------------------------|------------------------------------------------|
-| `spring.redis.host`     | Redis server host.                             |
-| `spring.redis.port`     | Redis server port.                             |
-| `spring.redis.database` | Database index used by the connection factory. |
-| `spring.redis.password` | Login password of the redis server.            |
+| Property                     | Description                                    |
+|------------------------------|------------------------------------------------|
+| `spring.data.redis.host`     | Redis server host.                             |
+| `spring.data.redis.port`     | Redis server port.                             |
+| `spring.data.redis.database` | Database index used by the connection factory. |
+| `spring.data.redis.password` | Login password of the redis server.            |
 
 
 ### Vault Configuration (optional)
-If you would like to use HasiCorp's Vault for secure property storage, you will need to enable it by including the value `vault` into the `SPRING_PROFILES_ACTIVE` environment variable. Be aware that if the tool requires multiple values, that there could be more than one profile value in there.
+If you would like to use HashiCorp's Vault for secure property storage, you will need to enable it by including the value `vault` into the `SPRING_PROFILES_ACTIVE` environment variable. Be aware that if the tool requires multiple values, that there could be more than one profile value in there.
 Include any `spring.cloud.vault.*` properties that your environment requires in a properties file, or override as environment variables.
 
 ### Exposing the LTI authz REST endpoints