Merge remote-tracking branch 'origin/master' into feature/adminlte3-u…

…pgrade
Evolveum · Apr 20, 2022 · 1d69099 · 1d69099
2 parents efd5ac8 + 07eae3f
commit 1d69099
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 17 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -627,7 +627,7 @@
 
         <!-- end connectors -->
 
-        <!-- report dependency (needed for microsoft office formats) -->
+        <!-- report dependency (needed for Microsoft Office formats) -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebConfig.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Evolveum and contributors
+ * Copyright (C) 2010-2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -8,9 +8,8 @@
 
 import java.time.Duration;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.web.ResourceProperties;
+import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -50,17 +49,15 @@ public AsyncWebProcessManager asyncWebProcessManager() {
     @Configuration
     public static class StaticResourceConfiguration implements WebMvcConfigurer {
 
-        @Autowired
-        private ResourceProperties resourceProperties;
+        private final WebProperties.Resources resourceProperties = new WebProperties.Resources();
 
         @Value("${midpoint.home}")
         private String midpointHome;
 
         @Override
         public void addResourceHandlers(ResourceHandlerRegistry registry) {
-            Duration cachePeriod = this.resourceProperties.getCache().getPeriod();
-            CacheControl cacheControl = this.resourceProperties.getCache()
-                    .getCachecontrol().toHttpCacheControl();
+            Duration cachePeriod = resourceProperties.getCache().getPeriod();
+            CacheControl cacheControl = resourceProperties.getCache().getCachecontrol().toHttpCacheControl();
             if (!registry.hasMappingForPattern("/static-web/**")) {
                 registry
                         .addResourceHandler("/static-web/**")

diff --git a/gui/admin-gui/src/main/resources/application.yml b/gui/admin-gui/src/main/resources/application.yml
@@ -4,6 +4,8 @@ spring:
   main:
     # needed to override springSecurityFilterChain from Spring Security
     allow-bean-definition-overriding: true
+    # Added after upgrade to Boot 2.6.x because of objectRetriever<>certificationCaseHelper.
+    allow-circular-references: true
   servlet:
     multipart:
       max-file-size: 100MB

diff --git a/gui/admin-gui/src/test/resources/application.yml b/gui/admin-gui/src/test/resources/application.yml
@@ -4,6 +4,8 @@ spring:
   main:
     # needed to override springSecurityFilterChain from Spring Security
     allow-bean-definition-overriding: true
+    # Added after upgrade to Boot 2.6.x because of objectRetriever<>certificationCaseHelper.
+    allow-circular-references: true
   servlet:
     multipart:
       max-file-size: 100MB
@@ -13,7 +15,7 @@ server:
   port: 18080
   tomcat:
     basedir: ${midpoint.home}
-    max-http-post-size: 104857600 # in bytes
+    max-http-form-post-size: 100MB
 ## Enable and configuration ajp connector for mp
 #    ajp:
 #      enabled: true

diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -193,13 +193,12 @@
         <!--
         Excluding javax.annotation-api coming via:
         org.springframework.boot:spring-boot-starter-amqp -> org.springframework.amqp:spring-rabbit
-        -> org.springframework.amqp:spring-amqp -> org.springframework.retry:spring-retry:jar:1.3.1:runtime
+        -> org.springframework.amqp:spring-amqp -> org.springframework.retry:spring-retry:jar:1.3.2:runtime
         -> javax.annotation:javax.annotation-api
         -->
         <dependency>
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
-            <version>1.3.1</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>

diff --git a/pom.xml b/pom.xml
@@ -94,9 +94,9 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.5.2</version>
+        <version>2.6.6</version>
         <!-- This parent also declares dependencies listed here:
-        https://docs.spring.io/spring-boot/docs/2.5.2/reference/html/dependency-versions.html#dependency-versions
+        https://docs.spring.io/spring-boot/docs/2.6.6/reference/html/dependency-versions.html#dependency-versions
         Or for current version of Spring Boot:
         https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-dependency-versions.html
         -->
@@ -108,7 +108,7 @@
     <packaging>pom</packaging>
 
     <name>midPoint Project</name>
-    <description>Utility module to compile all of the maven based midPoint projects.</description>
+    <description>Main parent Maven module for all midPoint sub-modules.</description>
     <organization>
         <name>evolveum</name>
         <url>https://www.evolveum.com</url>
@@ -228,8 +228,8 @@
         <!-- Spring Boot parent declares most fresh versions for JDBC drivers for all our servers -->
         <wicket.version>9.7.0</wicket.version>
         <wicket.chartjs.version>0.1</wicket.chartjs.version>
-        <!-- Groovy 3.0.8 is also default for Spring Boot 2.5.0 -->
-        <groovy.version>3.0.9</groovy.version>
+        <!-- Groovy 3.0.10 is also default for Spring Boot 2.6.6 -->
+        <groovy.version>3.0.10</groovy.version>
         <xmlsec.version>2.2.3</xmlsec.version>
         <!-- NOTE: also update the version number in TestConnectorManager -->
         <connid.version>1.5.0.18</connid.version>
@@ -1197,6 +1197,38 @@
                 <version>${j2html.version}</version>
             </dependency>
 
+            <!-- Version convergence setup; RECONSIDER after major upgrades of Boot, Maven... -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>6.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>2.10.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_core</artifactId>
+                <version>2.10.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-qual</artifactId>
+                <version>3.19.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.el</groupId>
+                <artifactId>javax.el-api</artifactId>
+                <version>3.0.1-b06</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>3.19.3</version>
+            </dependency>
+
             <!-- Maven plugins -->
             <dependency>
                 <groupId>org.apache.maven</groupId>