Merge remote-tracking branch 'origin/master'

Evolveum · May 25, 2023 · 235df5a · 235df5a
2 parents a5754af + 4d4425f
commit 235df5a
Show file tree

Hide file tree

Showing 588 changed files with 1,564 additions and 1,246 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -74,10 +74,6 @@
             <artifactId>spring-boot-starter-security</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -117,14 +113,32 @@
         <dependency>
             <groupId>com.evolveum.commons</groupId>
             <artifactId>util</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.prism</groupId>
             <artifactId>prism-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.prism</groupId>
             <artifactId>prism-impl</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -141,6 +155,12 @@
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
@@ -161,6 +181,12 @@
             <groupId>com.evolveum.midpoint.model</groupId>
             <artifactId>model-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -204,6 +230,12 @@
             <artifactId>repo-sql-impl</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -221,10 +253,16 @@
             <groupId>com.evolveum.midpoint.model</groupId>
             <artifactId>rest-impl</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <type>pom</type>
             <scope>runtime</scope>
@@ -297,6 +335,12 @@
             <artifactId>provisioning-impl</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.provisioning</groupId>
@@ -309,6 +353,12 @@
             <artifactId>report-impl</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
@@ -374,13 +424,38 @@
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-request</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-commons-fileupload</artifactId>
+            <version>${wicket.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-ioc</artifactId>
+            <exclusions>
+              <exclusion>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject-api</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-util</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.wicket</groupId>
@@ -453,10 +528,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -539,12 +610,24 @@
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>test-util</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-test-util</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -620,6 +703,12 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -635,10 +724,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
@@ -10,7 +10,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 
 import org.apache.commons.lang3.BooleanUtils;

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java b/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
@@ -9,7 +9,7 @@
 
 import java.util.*;
 import java.util.stream.Collectors;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.*;

diff --git a/...va/com/evolveum/midpoint/gui/impl/factory/panel/AssociationAndExpressionPanelFactory.java b/...va/com/evolveum/midpoint/gui/impl/factory/panel/AssociationAndExpressionPanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import com.evolveum.midpoint.gui.impl.component.input.expression.ExpressionPanel;
 

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AssociationRefPanelFactory.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AssociationRefPanelFactory.java
@@ -33,7 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 import java.io.Serializable;
 import java.util.List;

diff --git a/...va/com/evolveum/midpoint/gui/impl/factory/panel/AttributeMappingItemPathPanelFactory.java b/...va/com/evolveum/midpoint/gui/impl/factory/panel/AttributeMappingItemPathPanelFactory.java
@@ -49,7 +49,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 import java.io.Serializable;
 import java.util.*;

diff --git a/.../java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java b/.../java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java
@@ -20,7 +20,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * @author lskublik

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ConditionPanelFactory.java b/...gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ConditionPanelFactory.java
@@ -7,7 +7,7 @@
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
 import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.wicket.markup.html.panel.Panel;
 import org.springframework.stereotype.Component;

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/factory/panel/CorrelatorItemRefPanelFactory.java b/...main/java/com/evolveum/midpoint/gui/impl/factory/panel/CorrelatorItemRefPanelFactory.java
@@ -34,7 +34,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DatePanelFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DatePanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.apache.wicket.extensions.yui.calendar.DateTimeField;

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/factory/panel/DefaultContainerablePanelFactory.java b/...n/java/com/evolveum/midpoint/gui/impl/factory/panel/DefaultContainerablePanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DropDownChoicePanelFactory.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DropDownChoicePanelFactory.java
@@ -7,7 +7,7 @@
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
 import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.path.ItemPath;

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DurationPanelFactory.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DurationPanelFactory.java
@@ -16,7 +16,7 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.datatype.Duration;
 import javax.xml.namespace.QName;
 

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/EnumPanelFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/EnumPanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ExecuteScriptPanelFactory.java b/...src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ExecuteScriptPanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ExpressionModel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ExpressionModel.java
@@ -21,7 +21,7 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.util.List;
 
 public class ExpressionModel implements IModel<String> {

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemPathPanelFactory.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemPathPanelFactory.java
@@ -8,7 +8,7 @@
 
 import java.io.Serializable;
 import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
 import com.evolveum.midpoint.web.component.input.validator.NotNullValidator;

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LabelPanelFactory.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LabelPanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import com.evolveum.midpoint.gui.api.component.autocomplete.LookupAutocompletePanel;
 

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LinkedReferencePanelFactory.java b/...c/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LinkedReferencePanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.wicket.behavior.AttributeAppender;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LockoutStatusPanelFactory.java b/...src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LockoutStatusPanelFactory.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;