diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
index 82a17ffb7cd..ffa4004e1e4 100644
--- a/dist/javadoc/pom.xml
+++ b/dist/javadoc/pom.xml
@@ -42,8 +42,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-annotations-api</artifactId>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
index 0d3a5d03e12..82d76970773 100644
--- a/dist/midpoint-api/pom.xml
+++ b/dist/midpoint-api/pom.xml
@@ -52,6 +52,10 @@
             <artifactId>util</artifactId>
             <version>4.2-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index f1a520a025e..aae68b218f9 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -45,28 +45,26 @@
         <dependency>
             <groupId>org.springframework.security.extensions</groupId>
             <artifactId>spring-security-saml2-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <!-- Replaced by tomcat-annotations-api -->
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- Equivalent of: javax.annotation:javax.annotation-api -->
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-annotations-api</artifactId>
@@ -266,21 +264,7 @@
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-api</artifactId>
-            <version>4.2-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jaxb-impl</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jaxb-core</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>asm</groupId>
-                </exclusion>
-            </exclusions>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -364,16 +348,6 @@
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-cache</artifactId>
             <version>4.2-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jaxb-impl</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jaxb-core</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -404,12 +378,6 @@
             <artifactId>model-impl</artifactId>
             <version>4.2-SNAPSHOT</version>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jaxb-impl</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
@@ -446,16 +414,6 @@
             <artifactId>report-impl</artifactId>
             <version>4.2-SNAPSHOT</version>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jaxb-impl</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>asm</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -535,12 +493,6 @@
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-ioc</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.wicket</groupId>
@@ -658,16 +610,6 @@
         <dependency>
             <groupId>org.opensaml</groupId>
             <artifactId>opensaml-security-impl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -721,11 +663,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -803,7 +740,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -819,6 +756,14 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <!-- Optional for development only (not packaged) -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -900,6 +845,38 @@
                     <offline>true</offline>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <!--<version>${spring.boot.version}</version>-->
+                <configuration>
+                    <fork>true</fork>
+                    <skip>false</skip>
+                    <!-- <jvmArguments>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments> -->
+                    <!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
+                    <jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>executable</classifier>
+                            <layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.evolveum.midpoint.tools</groupId>
+                        <artifactId>midpoint-war-layout</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
             <!-- reference failsafe to run integration tests (surefire/units run by default) -->
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -928,95 +905,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>executable</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-maven-plugin</artifactId>
-                        <version>${spring.boot.version}</version>
-                        <configuration>
-                            <fork>true</fork>
-                            <skip>false</skip>
-                            <!-- <jvmArguments>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments> -->
-                            <!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
-                            <jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>repackage</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>executable</classifier>
-                                    <layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.evolveum.midpoint.tools</groupId>
-                                <artifactId>midpoint-war-layout</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>tomcat</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <artifactId>jaxb-impl</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <artifactId>jaxb-api</artifactId>
-                    <groupId>javax.xml.bind</groupId>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <artifactId>jaxb-core</artifactId>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <!-- can be used for development e.g. in Intellij Idea -->
-            <id>ide</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.tomcat.embed</groupId>
-                    <artifactId>tomcat-embed-core</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.tomcat</groupId>
-                    <artifactId>tomcat-annotations-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
index 18e764aa785..1672faa5641 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
@@ -457,7 +457,10 @@ public static <T extends ObjectType> int countObjects(Class<T> type, ObjectQuery
         OperationResult parentResult = new OperationResult(OPERATION_COUNT_OBJECT);
         int count = 0;
         try {
-            count = page.getModelService().countObjects(type, query, null, task, parentResult);
+            Collection<SelectorOptions<GetOperationOptions>> options = page.getOperationOptionsBuilder()
+                    .distinct(true)
+                    .build();
+            count = page.getModelService().countObjects(type, query, options, task, parentResult);
         } catch (SchemaException | ObjectNotFoundException | SecurityViolationException
                 | ConfigurationException | CommunicationException | ExpressionEvaluationException ex) {
             parentResult.recordFatalError(page.createStringResource("WebModelUtils.couldntCountObjects").getString(), ex);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
index ec6bbefa718..2811027ea34 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
@@ -181,7 +181,7 @@ protected void onError(AjaxRequestTarget target) {
             target.add(getFeedbackPanel());
         }
         };
-
+        form.setDefaultButton(confirmPasswrod);
         form.add(confirmPasswrod);
 
         WebMarkupContainer confirmationContainer = new WebMarkupContainer(ID_CONFIRMATION_CONTAINER);
diff --git a/infra/prism-impl/pom.xml b/infra/prism-impl/pom.xml
index 92482efd0f2..6d707f84b46 100644
--- a/infra/prism-impl/pom.xml
+++ b/infra/prism-impl/pom.xml
@@ -44,8 +44,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>xsom</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml
index aff532b9c29..1d05e810701 100644
--- a/infra/schema/pom.xml
+++ b/infra/schema/pom.xml
@@ -90,14 +90,11 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <!-- Needed only for #toStrings of prism classes. -->
         <dependency>
             <groupId>org.apache.cxf.xjc-utils</groupId>
             <artifactId>cxf-xjc-runtime</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
         <dependency>
             <groupId>net.sf.jasperreports</groupId>
             <artifactId>jasperreports</artifactId>
@@ -296,11 +293,6 @@
                         <artifactId>xjc-plugin</artifactId>
                         <version>4.2-SNAPSHOT</version>
                     </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-xjc</artifactId>
-                        <version>${jaxb-xjc.version}</version>
-                    </dependency>
                 </dependencies>
             </plugin>
             <plugin>
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
index 50470203ac7..81962b5de6f 100644
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
+++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
@@ -32,8 +32,6 @@
 import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceSchema;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ActivationCapabilityType;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ActivationLockoutStatusCapabilityType;
@@ -54,7 +52,6 @@
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.TestConnectionCapabilityType;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.UpdateCapabilityType;
 import com.evolveum.prism.xml.ns._public.types_3.SchemaDefinitionType;
-import com.sun.tools.xjc.reader.RawTypeSet.Ref;
 
 /**
  * Methods that would belong to the ResourceType class but cannot go there
diff --git a/model/certification-impl/pom.xml b/model/certification-impl/pom.xml
index d2061bcb64e..44c8c7307f2 100644
--- a/model/certification-impl/pom.xml
+++ b/model/certification-impl/pom.xml
@@ -267,7 +267,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
index e1b2a56e9f3..ca2b9164940 100644
--- a/model/model-api/pom.xml
+++ b/model/model-api/pom.xml
@@ -100,8 +100,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>compile</scope>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
index 0125bd69ebf..a9033f1a2de 100644
--- a/model/model-impl/pom.xml
+++ b/model/model-impl/pom.xml
@@ -386,9 +386,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <!-- TODO: compile scope for ModelRestService - I think it should go to more infrastructural module (Virgo) -->
-            <!--<scope>test</scope>-->
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.googlecode.java-diff-utils</groupId>
diff --git a/model/model-intest/pom.xml b/model/model-intest/pom.xml
index 48b7fe73fc2..64b6969d7d6 100644
--- a/model/model-intest/pom.xml
+++ b/model/model-intest/pom.xml
@@ -267,7 +267,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/model/model-test/pom.xml b/model/model-test/pom.xml
index 2b6ccf49c2b..ce2d2c2b480 100644
--- a/model/model-test/pom.xml
+++ b/model/model-test/pom.xml
@@ -182,7 +182,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.forgerock.opendj</groupId>
diff --git a/model/notifications-impl/pom.xml b/model/notifications-impl/pom.xml
index cfe847b683c..fa624221441 100644
--- a/model/notifications-impl/pom.xml
+++ b/model/notifications-impl/pom.xml
@@ -236,7 +236,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/model/report-impl/pom.xml b/model/report-impl/pom.xml
index 17289b25056..6980d5cfafc 100644
--- a/model/report-impl/pom.xml
+++ b/model/report-impl/pom.xml
@@ -298,7 +298,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/model/workflow-impl/pom.xml b/model/workflow-impl/pom.xml
index 89e18a7be11..0fb596249fa 100644
--- a/model/workflow-impl/pom.xml
+++ b/model/workflow-impl/pom.xml
@@ -282,7 +282,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
diff --git a/pom.xml b/pom.xml
index 5f7ffa3c0b8..8e0d0376d8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,12 @@
     mvn clean install -P -dist -DskipTests -DskipSchrodingerTests=false -DwebdriverLocation=/c/work/tools/bin/chromedriver.exe
     -->
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>2.1.13.RELEASE</version>
+    </parent>
+
     <groupId>com.evolveum.midpoint</groupId>
     <artifactId>midpoint</artifactId>
     <version>4.2-SNAPSHOT</version>
@@ -154,16 +160,12 @@
         <cxf-xjc.version>3.3.0</cxf-xjc.version>
         <wss4j.version>2.2.0</wss4j.version>
         <dbunit.version>2.4.7</dbunit.version>
-        <jaxb-api.version>2.3.1</jaxb-api.version>
-        <jaxb.version>2.3.0.1</jaxb.version>
-        <jaxb-xjc.version>2.3.0.1</jaxb-xjc.version>
         <opendj.version>2.6.2</opendj.version>
         <quartz.version>2.3.0.e3</quartz.version>
         <selenium.version>3.141.59</selenium.version>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.3</logback.version>
-        <spring.boot.version>2.1.8.RELEASE</spring.boot.version>
-        <!-- Check the names of properties in Spring Boot BOM and let's try to use the same names. -->
+        <!-- TODO: Check the names of properties in Spring Boot parent and let's try to use the same names. -->
         <spring.version>5.1.9.RELEASE</spring.version>
         <spring.security.version>5.1.6.RELEASE</spring.security.version>
         <spring.security.saml2.version>2.0.0.M30</spring.security.saml2.version>
@@ -198,11 +200,9 @@
         <antrun.version>1.8</antrun.version>
         <javax.xml.soap.version>1.4.0</javax.xml.soap.version>
         <qpid-broker.version>7.1.1</qpid-broker.version>
-        <jakarta.jaxb.version>2.3.2</jakarta.jaxb.version>
         <asm.version>7.0</asm.version>
         <jaxws-api.version>2.3.1</jaxws-api.version>
         <geronimo-ws-metadata_2.0_spec.version>1.1.3</geronimo-ws-metadata_2.0_spec.version>
-        <activation.version>1.2.0</activation.version>
         <jetty.version>9.4.20.v20190813</jetty.version>
         <maven.api.version>3.6.2</maven.api.version>
         <checkstyle.version>3.1.0</checkstyle.version>
@@ -229,36 +229,39 @@
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
                 <version>${geronimo-ws-metadata_2.0_spec.version}</version>
             </dependency>
+            <!-- TODO: remove after update to Spring Boot 2.2, which will have this in parent-->
             <dependency>
-                <groupId>com.sun.activation</groupId>
-                <artifactId>javax.activation</artifactId>
-                <version>${activation.version}</version>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>1.2.2</version>
             </dependency>
-
             <dependency>
-                <!-- Import dependency management from Spring Boot -->
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring.boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <groupId>com.sun.activation</groupId>
+                <artifactId>javax.activation</artifactId>
+                <version>${javax-activation.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-test</artifactId>
-                <version>${spring.boot.version}</version>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${glassfish-jaxb.version}</version>
                 <exclusions>
+                    <!-- in favor of Jakarta version -->
                     <exclusion>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>javax.activation-api</artifactId>
                     </exclusion>
-                    <!--
-                    I'd love to do it, WicketTester from wicket-core (and perhaps others) uses it, so we rather leave it here.
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${javax-jaxb.version}</version>
+                <exclusions>
+                    <!-- in favor of Jakarta version -->
                     <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>javax.activation-api</artifactId>
                     </exclusion>
-                    -->
                 </exclusions>
             </dependency>
 
@@ -469,26 +472,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>${jaxb-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>${jaxb.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-xjc</artifactId>
-                <version>${jaxb-xjc.version}</version>
-            </dependency>
             <dependency>
                 <groupId>net.sourceforge.ccxjc</groupId>
                 <artifactId>cc-xjc-plugin</artifactId>
@@ -608,8 +591,8 @@
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${servlet-api.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -674,7 +657,7 @@
                         <groupId>javax.xml.soap</groupId>
                         <artifactId>javax.xml.soap-api</artifactId>
                     </exclusion>
-                    <!-- Conflicting version with sun jaxb-xjc -->
+                    <!-- This should be safe to exclude, if we don't generate from WSDL. -->
                     <exclusion>
                         <groupId>org.glassfish.jaxb</groupId>
                         <artifactId>jaxb-xjc</artifactId>
@@ -1002,6 +985,10 @@
                         <groupId>org.bouncycastle</groupId>
                         <artifactId>bcprov-jdk15on</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -1379,6 +1366,12 @@
                 <groupId>org.opensaml</groupId>
                 <artifactId>opensaml-security-impl</artifactId>
                 <version>3.3.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- webjars -->
@@ -1491,7 +1484,7 @@
             <dependency>
                 <groupId>org.seleniumhq.selenium</groupId>
                 <artifactId>selenium-java</artifactId>
-                <version>3.14.0</version>
+                <version>${selenium.version}</version>
                 <exclusions>
                     <!-- replaced by org.slf4j:jcl-over-slf4j -->
                     <exclusion>
@@ -1686,7 +1679,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
                 <executions>
                     <execution>
                         <id>enforce</id>
@@ -1698,9 +1690,16 @@
                                 <dependencyConvergence/>
                                 <bannedDependencies>
                                     <excludes>
-                                        <!-- replaced by org.slf4j:jcl-over-slf4j -->
+                                        <!-- both replaced by org.slf4j:jcl-over-slf4j -->
                                         <exclude>commons-logging:commons-logging</exclude>
                                         <exclude>org.springframework:spring-jcl</exclude>
+                                        <!--
+                                        jaxb-core replaced by Glassfish jaxb-runtime + txw2
+                                        jaxb-xjc replaced by Glassfish jaxb-xjc + xsom + codemodel
+                                        -->
+                                        <exclude>com.sun.xml.bind:*</exclude>
+                                        <!-- in favor of jakarta.activation:jakarta.activation-api -->
+                                        <exclude>javax.activation:javax.activation-api</exclude>
                                         <!-- package with multiple XML APIs, conflicts assured
                                         (WE CAN'T YET see todo at the xalan/xerces dep declarations above) -->
                                         <!--<exclude>xml-apis:xml-apis</exclude>-->
@@ -1729,7 +1728,10 @@
                             <failOnWarning>true</failOnWarning>
                             <ignoreNonCompile>true</ignoreNonCompile>
                             <ignoredUnusedDeclaredDependencies>
-                                <!-- We don't want anything here, except for test support... -->
+                                <!--
+                                We don't want anything here, except for test support...
+                                In case of false report, check that the dependency is not used only in unused imports.
+                                -->
                                 <ignoredUnusedDeclaredDependency>org.assertj:assertj-core</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
                             <ignoredUsedUndeclaredDependencies>
@@ -1829,6 +1831,14 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.8.2</version>
+                    <!--
+                    With 3.0.0-M1 javadoc module fails with:
+                    The packaging plugin for this project did not assign a main file to the project but it has attachments. Change packaging to 'pom'.
+                    -->
+                    <!--<version>3.0.0-M1</version>-->
+                    <configuration>
+                        <deployAtEnd>true</deployAtEnd>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
diff --git a/repo/security-api/pom.xml b/repo/security-api/pom.xml
index cf23b72e765..5fd55d467ab 100644
--- a/repo/security-api/pom.xml
+++ b/repo/security-api/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/repo/security-enforcer-api/pom.xml b/repo/security-enforcer-api/pom.xml
index 2234f6f9e1b..dd4e663e353 100644
--- a/repo/security-enforcer-api/pom.xml
+++ b/repo/security-enforcer-api/pom.xml
@@ -50,10 +50,5 @@
             <artifactId>task-api</artifactId>
             <version>4.2-SNAPSHOT</version>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
index 896d21aa9b5..dd178f1561a 100644
--- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
+++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
@@ -62,7 +62,7 @@ public class StartupConfiguration implements MidpointConfiguration {
      * Normalized name of midPoint home directory.
      * After successful initialization (see {@link #init()} it always ends with /.
      * TODO: this normalization is safe, but ugly when used in XML configs like
-     * ${midpoint.home}/keystore.jceks - which, on the ohter hand, would be ugly without /.
+     * ${midpoint.home}/keystore.jceks - which, on the other hand, would be ugly without /.
      * Better yet is to normalize home directory NOT to end with / and use Paths.get(...)
      * and similar constructs in Java code and never string concatenation.
      * Also - maybe even this can be typed to Path in the end.
diff --git a/repo/task-quartz-impl/pom.xml b/repo/task-quartz-impl/pom.xml
index 73e7f3c98e3..96fd84d0747 100644
--- a/repo/task-quartz-impl/pom.xml
+++ b/repo/task-quartz-impl/pom.xml
@@ -132,16 +132,6 @@
             <artifactId>spring-context</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.hibernate</groupId>-->
-            <!--<artifactId>hibernate-core</artifactId>-->
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.javassist</groupId>-->
-                    <!--<artifactId>javassist</artifactId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
-        <!--</dependency>-->
         <!-- this one is needed to get SQL configuration from the repository -->
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
diff --git a/testing/conntest/pom.xml b/testing/conntest/pom.xml
index 3190deb308a..7f5d7a521ed 100644
--- a/testing/conntest/pom.xml
+++ b/testing/conntest/pom.xml
@@ -212,7 +212,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/longtest/pom.xml b/testing/longtest/pom.xml
index d6d39f0b7c1..1940bf69169 100644
--- a/testing/longtest/pom.xml
+++ b/testing/longtest/pom.xml
@@ -204,7 +204,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
index 7541cf66d32..1f4d5fb8bfd 100644
--- a/testing/rest/pom.xml
+++ b/testing/rest/pom.xml
@@ -135,11 +135,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
@@ -236,7 +231,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/testing/sanity/pom.xml b/testing/sanity/pom.xml
index 145d8726d56..a01857855cc 100644
--- a/testing/sanity/pom.xml
+++ b/testing/sanity/pom.xml
@@ -225,7 +225,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
index c9f4b40fe7a..4f94c30b177 100644
--- a/testing/schrodingertest/pom.xml
+++ b/testing/schrodingertest/pom.xml
@@ -53,16 +53,6 @@
         <dependency>
             <groupId>com.codeborne</groupId>
             <artifactId>selenide</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-all</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/testing/story/pom.xml b/testing/story/pom.xml
index baefd5c27fb..ece0c3b981f 100644
--- a/testing/story/pom.xml
+++ b/testing/story/pom.xml
@@ -272,7 +272,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/tools/ninja/pom.xml b/tools/ninja/pom.xml
index d48539730f3..5613e8e1f2c 100644
--- a/tools/ninja/pom.xml
+++ b/tools/ninja/pom.xml
@@ -242,7 +242,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/tools/xjc-plugin/pom.xml b/tools/xjc-plugin/pom.xml
index 363af921995..93c30c447b1 100644
--- a/tools/xjc-plugin/pom.xml
+++ b/tools/xjc-plugin/pom.xml
@@ -40,9 +40,13 @@
             <version>4.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>codemodel</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>