Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Feb 12, 2021 · 674b3d8 · 674b3d8
2 parents 23fd75c + c9b2d5a
commit 674b3d8
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 31 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2010-2020 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.web.boot;
 
-import java.lang.management.ManagementFactory;
-import java.time.Duration;
-import java.util.Collections;
+import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
+import com.evolveum.midpoint.gui.impl.factory.panel.TextAreaPanelFactory;
+import com.evolveum.midpoint.gui.impl.registry.GuiComponentRegistryImpl;
+import com.evolveum.midpoint.task.api.TaskManager;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Manager;
@@ -40,12 +43,9 @@
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.stereotype.Component;
 
-import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
-import com.evolveum.midpoint.gui.impl.factory.panel.TextAreaPanelFactory;
-import com.evolveum.midpoint.gui.impl.registry.GuiComponentRegistryImpl;
-import com.evolveum.midpoint.task.api.TaskManager;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
+import java.lang.management.ManagementFactory;
+import java.time.Duration;
+import java.util.Collections;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -138,7 +138,9 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu
             System.setProperty(MidpointConfiguration.MIDPOINT_HOME_PROPERTY, mpHome);
         }
 
-        System.setProperty("spring.config.additional-location", "${midpoint.home}/");
+        // For Spring Boot 2.4+ optional: prefix is required if the directory may not exist.
+        // See https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.4-Release-Notes#config-data-imports
+        System.setProperty("spring.config.additional-location", "optional:${midpoint.home}/");
 
         application.bannerMode(Banner.Mode.LOG);
 

diff --git a/...l/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/yaml/MidpointYAMLGenerator.java b/...l/src/main/java/com/evolveum/midpoint/prism/impl/lex/json/yaml/MidpointYAMLGenerator.java
@@ -6,20 +6,15 @@
  */
 package com.evolveum.midpoint.prism.impl.lex.json.yaml;
 
-import com.fasterxml.jackson.core.Base64Variant;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.events.DocumentEndEvent;
-import org.yaml.snakeyaml.events.DocumentStartEvent;
 import org.yaml.snakeyaml.events.ImplicitTuple;
 import org.yaml.snakeyaml.events.ScalarEvent;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Arrays;
-import java.util.Collections;
 
 public class MidpointYAMLGenerator extends YAMLGenerator {
 
@@ -66,7 +61,8 @@ protected ScalarEvent _scalarEvent(String value, DumperOptions.ScalarStyle style
     }
 
     public void newDocument() throws IOException {
-        _emitter.emit(new DocumentEndEvent(null, null, false));
-        _emitter.emit(new DocumentStartEvent(null, null, true, version, Collections.emptyMap()));
+        // NOOP, snakeyaml 1.27 handles startDocument, endDocument
+        // with startObject and endObject in document root, which
+        // we use.
     }
 }
diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -219,6 +219,24 @@
             <artifactId>spring-boot-starter-amqp</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <!--
+        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
+        -> 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>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- Test -->
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -64,9 +64,9 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.3.3.RELEASE</version>
+        <version>2.4.2</version>
         <!-- This parent also declares dependencies listed here:
-        https://docs.spring.io/spring-boot/docs/2.3.3.RELEASE/reference/html/appendix-dependency-versions.html
+        https://docs.spring.io/spring-boot/docs/2.4.2/reference/html/appendix-dependency-versions.html
         Or for current version of Spring Boot:
         https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-dependency-versions.html
         -->
@@ -206,16 +206,17 @@
         org.yaml.snakeyaml.emitter.EmitterException: expected NodeEvent, but got <org.yaml.snakeyaml.events.DocumentEndEvent()>
         It is unclear now what the core problem is.
         -->
-        <jackson.version>2.10.0</jackson.version>
-        <snakeyaml.version>1.23</snakeyaml.version>
+        <!--<jackson.version>2.10.0</jackson.version>-->
+        <!--<snakeyaml.version>1.27</snakeyaml.version>-->
         <surefire.version>3.0.0-M3</surefire.version>
         <reflections.version>0.9.11</reflections.version>
-        <guava.version>28.1-jre</guava.version>
-        <!--<guava.version>30.0-jre</guava.version> TODO: possible upgrade, passes tests -->
+        <!--<guava.version>28.1-jre</guava.version>-->
+        <!--TODO: possible upgrade, passes tests-->
+        <guava.version>30.1-jre</guava.version>
         <jcommander.version>1.72</jcommander.version>
         <failsafe.version>3.0.0-M3</failsafe.version>
         <qpid-broker.version>7.1.1</qpid-broker.version>
-        <apache-artemis.version>2.12.0</apache-artemis.version> <!-- matching Spring Boot Artemis dependency -->
+        <apache-artemis.version>2.15.0</apache-artemis.version> <!-- matching Spring Boot Artemis dependency -->
         <asm.version>7.0</asm.version>
         <geronimo-ws-metadata_2.0_spec.version>1.1.3</geronimo-ws-metadata_2.0_spec.version>
         <jetty.version>9.4.20.v20190813</jetty.version>
@@ -1160,6 +1161,7 @@
                 <artifactId>poi</artifactId>
                 <version>3.17</version>
             </dependency>
+            <!--
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
@@ -1175,11 +1177,13 @@
                 <artifactId>jackson-jaxrs-base</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
+            -->
+            <!--<dependency>-->
+            <!--    <groupId>org.yaml</groupId>-->
+            <!--    <artifactId>snakeyaml</artifactId>-->
+            <!--    <version>${snakeyaml.version}</version>-->
+            <!--</dependency>-->
+            <!--
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
@@ -1190,7 +1194,7 @@
                 <artifactId>jackson-module-jaxb-annotations</artifactId>
                 <version>${jackson.version}</version>
                 <exclusions>
-                    <!-- will be declared as needed to avoid collisions with superset non-API JAR -->
+                    &lt;!&ndash; will be declared as needed to avoid collisions with superset non-API JAR &ndash;&gt;
                     <exclusion>
                         <groupId>jakarta.activation</groupId>
                         <artifactId>jakarta.activation-api</artifactId>
@@ -1202,6 +1206,7 @@
                 <artifactId>jackson-dataformat-yaml</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
+            -->
             <!-- Used by cxf-core, can go away with CXF -->
             <dependency>
                 <groupId>org.apache.ws.xmlschema</groupId>