Merge branch 'develop' into align_url

usnistgov · Mar 18, 2024 · 7e9f1fe · 7e9f1fe
2 parents f2c0e51 + 65e13bc
commit 7e9f1fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
         cache: 'maven'
     - name: Initialize CodeQL
       if: github.event_name == 'push'
-      uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4
+      uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f
       with:
         languages: java
     # -------------------------
@@ -78,7 +78,7 @@ jobs:
         mvn -B -e -Prelease -Preporting install
     - name: Perform CodeQL Analysis
       if: github.event_name == 'push'
-      uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4
+      uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f
       with:
         upload: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref_name == 'develop' && 'always' || 'never' }}
     - name: Test Website

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 		<dependency.version.jaxb-api>2.3.1</dependency.version.jaxb-api>
 		<dependency.version.jaxb-impl>2.3.5</dependency.version.jaxb-impl>
 		<dependency.version.decima>0.7.1</dependency.version.decima>
-		<dependency.version.spring>4.3.2.RELEASE</dependency.version.spring>
+		<dependency.version.spring>5.2.20.RELEASE</dependency.version.spring>
 		<dependency.version.jstl>1.2</dependency.version.jstl>
 		<dependency.version.servletapi>4.0.0-b01</dependency.version.servletapi>
 	</properties>
@@ -168,7 +168,7 @@
 			<dependency>
 				<groupId>commons-fileupload</groupId>
 				<artifactId>commons-fileupload</artifactId>
-				<version>1.3.3</version>
+				<version>1.5</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.xml.bind</groupId>