Merge remote-tracking branch 'origin/master'

Evolveum · Apr 29, 2022 · e8a9151 · e8a9151
2 parents d3ab9a7 + 610bfbf
commit e8a9151
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 44 deletions.
diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
@@ -27,7 +27,7 @@
         <maven.install.skip>true</maven.install.skip>
         <!-- This enables build without -DskipTests option (e.g. full build). -->
         <maven.test.skip>true</maven.test.skip>
-        <!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+ -->
+        <!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+). -->
         <javadoc.options></javadoc.options>
     </properties>
 

diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
@@ -23,7 +23,7 @@
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
-        <!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+ -->
+        <!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+). -->
         <javadoc.options></javadoc.options>
     </properties>
 

diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml
@@ -50,10 +50,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>

diff --git a/model/authentication-impl/pom.xml b/model/authentication-impl/pom.xml
@@ -219,10 +219,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>

diff --git a/...m/midpoint/authentication/impl/evaluator/SecurityQuestionAuthenticationEvaluatorImpl.java b/...m/midpoint/authentication/impl/evaluator/SecurityQuestionAuthenticationEvaluatorImpl.java
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;

diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -137,10 +137,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>

diff --git a/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java b/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
@@ -50,7 +50,7 @@
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 import com.google.common.base.Preconditions;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.jetbrains.annotations.Contract;

diff --git a/.../src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluationOrderImpl.java b/.../src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluationOrderImpl.java
@@ -22,7 +22,7 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrderConstraintsType;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MultiSet;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionResourceResolver.java b/...java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionResourceResolver.java
@@ -25,7 +25,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.prism.xml.ns._public.types_3.ReferentialIntegrityType;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;

diff --git a/...com/evolveum/midpoint/model/impl/lens/projector/focus/ProjectionValueMetadataCreator.java b/...com/evolveum/midpoint/model/impl/lens/projector/focus/ProjectionValueMetadataCreator.java
@@ -34,7 +34,7 @@
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.*;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/.../model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java b/.../model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java
@@ -38,7 +38,7 @@
 
 import static com.evolveum.midpoint.schema.constants.ObjectTypes.*;
 import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createObjectRef;
-import static org.apache.commons.collections.CollectionUtils.addIgnoreNull;
+import static org.apache.commons.collections4.CollectionUtils.addIgnoreNull;
 import static org.testng.AssertJUnit.*;
 
 @UnusedTestElement("reason unknown, 2 tests FAIL")

diff --git a/model/report-impl/pom.xml b/model/report-impl/pom.xml
@@ -113,8 +113,8 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
 
         <dependency>

diff --git a/model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java b/model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
@@ -26,7 +26,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventStageType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 

diff --git a/model/rest-impl/pom.xml b/model/rest-impl/pom.xml
@@ -100,8 +100,8 @@
             <artifactId>annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/ModelRestController.java b/model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/ModelRestController.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/pom.xml b/pom.xml
@@ -251,6 +251,7 @@
         <j2html.version>1.4.0</j2html.version>
         <bouncycastle.version>1.69</bouncycastle.version>
         <javax.persistence.version>2.2</javax.persistence.version>
+        <keycloak.version>18.0.0</keycloak.version>
 
         <maven.api.version>3.8.5</maven.api.version>
         <surefire.version>3.0.0-M6</surefire.version>
@@ -548,6 +549,11 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <!-- use org.apache.commons:commons-collections4 instead -->
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>commons-digester</groupId>
                         <artifactId>commons-digester</artifactId>
@@ -564,18 +570,18 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <!-- use org.apache.commons:commons-collections4 instead -->
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
                 <version>1.15</version>
             </dependency>
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-configuration2</artifactId>
@@ -1625,13 +1631,13 @@
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-authz-client</artifactId>
-                <version>16.1.1</version>
+                <version>${keycloak.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-core</artifactId>
-                <version>16.1.1</version>
+                <version>${keycloak.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>

diff --git a/repo/repo-common/pom.xml b/repo/repo-common/pom.xml
@@ -83,10 +83,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency> <!-- TEMPORARY: see CircularFifoBuffer -->
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>

diff --git a/...o-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/MockRecorder.java b/...o-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/MockRecorder.java
@@ -16,7 +16,7 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import java.util.*;
 
-import static org.apache.commons.collections.ListUtils.synchronizedList;
+import static org.apache.commons.collections4.ListUtils.synchronizedList;
 
 @Component
 public class MockRecorder implements DebugDumpable {

diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
@@ -39,12 +39,6 @@
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>schema</artifactId>
             <version>${project.version}</version>
-            <exclusions> <!-- we dont want bouncy castle to include into midPoint -->
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>

diff --git a/tools/jenkins/midpoint-conntest → tools/jenkins/midpoint-conntest-pipeline b/tools/jenkins/midpoint-conntest → tools/jenkins/midpoint-conntest-pipeline