Merge pull request #490 from indigo-iam/fix-deps

Update dependencies
indigo-iam · Jul 4, 2022 · 1bb02d7 · 1bb02d7
2 parents f4b2f3b + 94a61e8
commit 1bb02d7
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/iam-common/pom.xml b/iam-common/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns:ns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -17,6 +17,7 @@
 
   <properties>
    <spring-boot.build-image.skip>true</spring-boot.build-image.skip>
+   <java.version>17</java.version>
   </properties>
   <build>
 

diff --git a/iam-login-service/pom.xml b/iam-login-service/pom.xml
@@ -16,9 +16,9 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns:ns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>it.infn.mw</groupId>
@@ -36,6 +36,7 @@
     <test-clock.version>1.0.2</test-clock.version>
     <eclipselink.version>2.7.9</eclipselink.version>
     <javax.persistence.version>2.2.1</javax.persistence.version>
+    <java.version>17</java.version>
 
     <!-- Sonar Jacoco massaging -->
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

diff --git a/iam-persistence/pom.xml b/iam-persistence/pom.xml
@@ -16,9 +16,9 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns:ns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>it.infn.mw</groupId>
@@ -33,6 +33,7 @@
 
   <properties>
     <spring-boot.build-image.skip>true</spring-boot.build-image.skip>
+    <java.version>17</java.version>
   </properties>
 
   <dependencies>

diff --git a/iam-test-client/pom.xml b/iam-test-client/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:ns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -10,6 +10,9 @@
     <version>1.8.0</version>
   </parent>
 
+  <properties>
+    <java.version>17</java.version>
+  </properties>
   <artifactId>iam-test-client</artifactId>
   <packaging>jar</packaging>
 

diff --git a/iam-voms-aa/pom.xml b/iam-voms-aa/pom.xml
@@ -18,7 +18,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -38,6 +38,7 @@
     <!-- Sonar Jacoco massaging -->
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+    <java.version>17</java.version>
   </properties>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns:ns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.springframework.boot</groupId>
@@ -30,23 +30,23 @@
     <testcontainers.version>1.16.2</testcontainers.version>
 
     <mitreid.version>1.3.5.cnaf-spring-update-080122</mitreid.version>
-    <spring-security-oauth2.version>2.5.1.RELEASE</spring-security-oauth2.version>
+    <spring-security-oauth2.version>2.5.2.RELEASE</spring-security-oauth2.version>
 
     <voms.version>3.3.2</voms.version>
     <spring-security-saml.version>1.0.10.RELEASE</spring-security-saml.version>
 
     <!-- Update this in sync with the parent project version -->
-    <spring-boot.version>2.5.6</spring-boot.version>
+    <spring-boot.version>2.6.6</spring-boot.version>
 
     <angularjs.version>1.6.1</angularjs.version>
     <angular-ui-bootstrap.version>2.5.6</angular-ui-bootstrap.version>
     <angular-ui-router.version>1.0.20</angular-ui-router.version>
     <angular-ui-select.version>0.19.8</angular-ui-select.version>
     <angular-sanitize.version>1.3.11</angular-sanitize.version>
     <font-awesome.version>4.7.0</font-awesome.version>
-    <jquery.version>2.1.1</jquery.version>
-    <bootstrap.version>3.3.7</bootstrap.version>
-    <jquery-ui.version>1.12.0</jquery-ui.version>
+    <jquery.version>3.6.0</jquery.version>
+    <bootstrap.version>3.4.1</bootstrap.version>
+    <jquery-ui.version>1.13.1</jquery-ui.version>
 
     <rest-assured.version>4.4.0</rest-assured.version>
     <json-path.version>2.2.0</json-path.version>
@@ -203,13 +203,13 @@
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk15on</artifactId>
-        <version>1.52</version>
+        <version>1.70</version>
       </dependency>
 
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-jdk15on</artifactId>
-        <version>1.52</version>
+        <version>1.70</version>
       </dependency>
 
       <dependency>