From acac45e82014c255ddfb8d73fc2dcd6d6c326347 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Tue, 14 Apr 2020 23:36:23 +0200 Subject: [PATCH 1/9] POM: Spring Boot upgrade (2.1.8->13), now our parent, fixed Servlet API --- dist/midpoint-api/pom.xml | 4 +++ gui/admin-gui/pom.xml | 4 +-- model/certification-impl/pom.xml | 2 +- model/model-api/pom.xml | 3 +- model/model-impl/pom.xml | 4 +-- model/model-intest/pom.xml | 2 +- model/model-test/pom.xml | 2 +- model/notifications-impl/pom.xml | 2 +- model/report-impl/pom.xml | 2 +- model/workflow-impl/pom.xml | 2 +- pom.xml | 45 ++++++++---------------------- repo/security-api/pom.xml | 2 +- repo/security-enforcer-api/pom.xml | 5 ---- repo/task-quartz-impl/pom.xml | 10 ------- testing/conntest/pom.xml | 2 +- testing/longtest/pom.xml | 2 +- testing/rest/pom.xml | 2 +- testing/sanity/pom.xml | 2 +- testing/schrodingertest/pom.xml | 10 ------- testing/story/pom.xml | 2 +- tools/ninja/pom.xml | 1 - 21 files changed, 31 insertions(+), 79 deletions(-) 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 @@ util 4.2-SNAPSHOT + + javax.servlet + javax.servlet-api + diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml index f1a520a025e..6144d904371 100644 --- a/gui/admin-gui/pom.xml +++ b/gui/admin-gui/pom.xml @@ -803,7 +803,7 @@ javax.servlet - servlet-api + javax.servlet-api provided @@ -940,7 +940,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + true false 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 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ javax.servlet - servlet-api - compile + javax.servlet-api 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 @@ javax.servlet - servlet-api - - + javax.servlet-api com.googlecode.java-diff-utils 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 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ javax.servlet - servlet-api + javax.servlet-api org.forgerock.opendj 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 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ javax.servlet - servlet-api + javax.servlet-api test diff --git a/pom.xml b/pom.xml index 187abd88e07..6def157c324 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,12 @@ mvn clean install -DredirectTestOutputToFile=false -pl model/model-intest --> + + org.springframework.boot + spring-boot-dependencies + 2.1.13.RELEASE + + com.evolveum.midpoint midpoint 4.2-SNAPSHOT @@ -159,8 +165,7 @@ 3.141.59 1.7.25 1.2.3 - 2.1.8.RELEASE - + 5.1.9.RELEASE 5.1.6.RELEASE 2.0.0.M30 @@ -232,33 +237,6 @@ ${activation.version} - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - - - org.ow2.asm - asm - - - - - org.reflections reflections @@ -605,8 +583,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided @@ -1488,7 +1466,7 @@ org.seleniumhq.selenium selenium-java - 3.14.0 + ${selenium.version} @@ -1578,10 +1556,10 @@ + org.springframework.boot spring-boot-maven-plugin - 2.0.1.RELEASE true @@ -1692,7 +1670,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 enforce 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 @@ javax.servlet - servlet-api + javax.servlet-api org.apache.commons 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 @@ task-api 4.2-SNAPSHOT - - - javax.servlet - servlet-api - 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 @@ spring-context - - - - - - - - - - com.evolveum.midpoint.repo 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 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ javax.servlet - servlet-api + javax.servlet-api test diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml index 7541cf66d32..bb9210d5c13 100644 --- a/testing/rest/pom.xml +++ b/testing/rest/pom.xml @@ -236,7 +236,7 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ com.codeborne selenide - - - io.netty - netty-all - - - io.netty - netty-all - - org.slf4j 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 @@ javax.servlet - servlet-api + javax.servlet-api test 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 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} From af23b66e789ecb93b2fcd696b07401e9a0777f73 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 15 Apr 2020 18:47:54 +0200 Subject: [PATCH 2/9] admin-gui/pom.xml: removed profiles exacutable, ide and tomcat It should all just work if "provided" scope is used properly. --- gui/admin-gui/pom.xml | 199 +++++++++--------------------------------- pom.xml | 10 +++ 2 files changed, 51 insertions(+), 158 deletions(-) diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml index 6144d904371..0ac2b009ba5 100644 --- a/gui/admin-gui/pom.xml +++ b/gui/admin-gui/pom.xml @@ -45,16 +45,6 @@ org.springframework.security.extensions spring-security-saml2-core - - - org.bouncycastle - bcprov-jdk15on - - - com.google.code.findbugs - jsr305 - - @@ -266,21 +256,7 @@ com.evolveum.midpoint.repo repo-api - 4.2-SNAPSHOT - - - jaxb-impl - com.sun.xml.bind - - - jaxb-core - com.sun.xml.bind - - - asm - asm - - + ${project.version} com.evolveum.midpoint.repo @@ -364,16 +340,6 @@ com.evolveum.midpoint.repo repo-cache 4.2-SNAPSHOT - - - jaxb-impl - com.sun.xml.bind - - - jaxb-core - com.sun.xml.bind - - com.evolveum.midpoint.repo @@ -404,12 +370,6 @@ model-impl 4.2-SNAPSHOT runtime - - - jaxb-impl - com.sun.xml.bind - - com.evolveum.midpoint.model @@ -446,16 +406,6 @@ report-impl 4.2-SNAPSHOT runtime - - - jaxb-impl - com.sun.xml.bind - - - asm - asm - - @@ -535,12 +485,6 @@ org.apache.wicket wicket-ioc - - - org.apache.ant - ant - - org.apache.wicket @@ -658,16 +602,6 @@ org.opensaml opensaml-security-impl - - - org.bouncycastle - bcprov-jdk15on - - - org.bouncycastle - bcpkix-jdk15on - - org.bouncycastle @@ -819,6 +753,14 @@ org.slf4j slf4j-api + + + + mysql + mysql-connector-java + runtime + true + @@ -900,6 +842,38 @@ true + + + org.springframework.boot + spring-boot-maven-plugin + + + true + false + + + -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} + + + + + repackage + + + executable + + + + + + + com.evolveum.midpoint.tools + midpoint-war-layout + ${project.version} + + + + maven-failsafe-plugin @@ -928,95 +902,4 @@ - - - - executable - - true - - - - - org.springframework.boot - spring-boot-maven-plugin - - - true - false - - - -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} - - - - - repackage - - - executable - - - - - - - com.evolveum.midpoint.tools - midpoint-war-layout - ${project.version} - - - - - - - - - tomcat - - true - - - - jaxb-impl - com.sun.xml.bind - runtime - - - jaxb-api - javax.xml.bind - runtime - - - jaxb-core - com.sun.xml.bind - runtime - - - - - - - ide - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.apache.tomcat - tomcat-annotations-api - - - mysql - mysql-connector-java - runtime - - - - diff --git a/pom.xml b/pom.xml index c51883f79a8..af97b404d97 100644 --- a/pom.xml +++ b/pom.xml @@ -977,6 +977,10 @@ org.bouncycastle bcprov-jdk15on + + com.google.code.findbugs + jsr305 + @@ -1354,6 +1358,12 @@ org.opensaml opensaml-security-impl 3.3.0 + + + org.bouncycastle + bcprov-jdk15on + + From 34e9a4dc340f27ae675adc1322c5a2722c05960d Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Thu, 16 Apr 2020 00:10:55 +0200 Subject: [PATCH 3/9] ResourceTypeUtil.java: removed unused import dragging in useless dep Now com.sun.xml.bind:jaxb-xjc could be removed from deps in schema POM. --- infra/schema/pom.xml | 10 +--------- .../midpoint/schema/util/ResourceTypeUtil.java | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml index 5a04f9a9ceb..df89548d29c 100644 --- a/infra/schema/pom.xml +++ b/infra/schema/pom.xml @@ -90,14 +90,11 @@ commons-codec commons-codec + org.apache.cxf.xjc-utils cxf-xjc-runtime - - com.sun.xml.bind - jaxb-xjc - net.sf.jasperreports jasperreports @@ -295,11 +292,6 @@ xjc-plugin 4.2-SNAPSHOT - - com.sun.xml.bind - jaxb-xjc - ${jaxb-xjc.version} - 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 From 7f7b980252a77f6d8bcbc82bea93a3bb15cde320 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Thu, 16 Apr 2020 00:13:31 +0200 Subject: [PATCH 4/9] POMs: consolidation of JAXB libs and activation/annotation API --- dist/javadoc/pom.xml | 4 +-- gui/admin-gui/pom.xml | 13 ++++--- infra/prism-impl/pom.xml | 4 +-- pom.xml | 73 ++++++++++++++++++++++++---------------- testing/rest/pom.xml | 5 --- tools/xjc-plugin/pom.xml | 6 +++- 6 files changed, 61 insertions(+), 44 deletions(-) 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 @@ provided - org.apache.tomcat - tomcat-annotations-api + javax.annotation + javax.annotation-api provided diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml index 0ac2b009ba5..aae68b218f9 100644 --- a/gui/admin-gui/pom.xml +++ b/gui/admin-gui/pom.xml @@ -51,12 +51,20 @@ org.springframework.boot spring-boot-starter-tomcat provided + + + + javax.annotation + javax.annotation-api + + org.apache.tomcat.embed tomcat-embed-core provided + org.apache.tomcat tomcat-annotations-api @@ -655,11 +663,6 @@ spring-test test - - javax.annotation - javax.annotation-api - test - org.testng testng 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 @@ - com.sun.xml.bind - jaxb-xjc + org.glassfish.jaxb + xsom org.glassfish.jaxb diff --git a/pom.xml b/pom.xml index af97b404d97..0c8668e0784 100644 --- a/pom.xml +++ b/pom.xml @@ -157,9 +157,6 @@ 3.3.0 2.2.0 2.4.7 - 2.3.1 - 2.3.0.1 - 2.3.0.1 2.6.2 2.3.0.e3 3.141.59 @@ -200,11 +197,9 @@ 1.8 1.4.0 7.1.1 - 2.3.2 7.0 2.3.1 1.1.3 - 1.2.0 9.4.20.v20190813 3.6.2 3.1.0 @@ -231,10 +226,40 @@ geronimo-ws-metadata_2.0_spec ${geronimo-ws-metadata_2.0_spec.version} + + + jakarta.activation + jakarta.activation-api + 1.2.2 + com.sun.activation javax.activation - ${activation.version} + ${javax-activation.version} + + + org.glassfish.jaxb + jaxb-runtime + ${glassfish-jaxb.version} + + + + javax.activation + javax.activation-api + + + + + javax.xml.bind + jaxb-api + ${javax-jaxb.version} + + + + javax.activation + javax.activation-api + + @@ -444,26 +469,6 @@ - - javax.xml.bind - jaxb-api - ${jaxb-api.version} - - - com.sun.xml.bind - jaxb-impl - ${jaxb.version} - - - com.sun.xml.bind - jaxb-core - ${jaxb.version} - - - com.sun.xml.bind - jaxb-xjc - ${jaxb-xjc.version} - net.sourceforge.ccxjc cc-xjc-plugin @@ -649,7 +654,7 @@ javax.xml.soap javax.xml.soap-api - + org.glassfish.jaxb jaxb-xjc @@ -1682,9 +1687,16 @@ - + commons-logging:commons-logging org.springframework:spring-jcl + + com.sun.xml.bind:* + + javax.activation:javax.activation-api @@ -1713,7 +1725,10 @@ true true - + org.assertj:assertj-core diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml index bb9210d5c13..1f4d5fb8bfd 100644 --- a/testing/rest/pom.xml +++ b/testing/rest/pom.xml @@ -135,11 +135,6 @@ commons-lang commons-lang - - com.sun.xml.bind - jaxb-core - runtime - org.springframework spring-beans 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 @@ 4.2-SNAPSHOT - com.sun.xml.bind + org.glassfish.jaxb jaxb-xjc + + org.glassfish.jaxb + codemodel + commons-lang commons-lang From 8e1dea7b873826e7a50a4ad2a211269e3a12a6af Mon Sep 17 00:00:00 2001 From: kate Date: Wed, 29 Apr 2020 01:04:53 +0200 Subject: [PATCH 5/9] MID-6235 [enter] submits the form on the Account Activation page --- .../evolveum/midpoint/web/page/self/PageAccountActivation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From c6615adace2b4f380a710692bdd1a3fb6d3a8590 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 29 Apr 2020 09:04:18 +0200 Subject: [PATCH 6/9] StartupConfiguration.java: fixed "ohter" typo in comment --- .../java/com/evolveum/midpoint/init/StartupConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 54a643c44b745b56ccd74bdb85cf6e08d2224eb2 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 29 Apr 2020 09:06:27 +0200 Subject: [PATCH 7/9] POM: maven-deploy-plugin -> 3.0.0-M1 + deployAtEnd=true by default --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f7ffa3c0b8..53ebd772af1 100644 --- a/pom.xml +++ b/pom.xml @@ -1828,7 +1828,10 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + 3.0.0-M1 + + true + org.eclipse.m2e From 902c52158d6b364aac706c6d2e99645b493fa382 Mon Sep 17 00:00:00 2001 From: kate Date: Wed, 29 Apr 2020 09:44:49 +0200 Subject: [PATCH 8/9] MID-6234 added distinct option while counting objects --- .../evolveum/midpoint/gui/api/util/WebModelServiceUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 int countObjects(Class type, ObjectQuery OperationResult parentResult = new OperationResult(OPERATION_COUNT_OBJECT); int count = 0; try { - count = page.getModelService().countObjects(type, query, null, task, parentResult); + Collection> 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); From 89e8f06cc57b061154d718c97d8b93b390896ef5 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 29 Apr 2020 21:33:25 +0200 Subject: [PATCH 9/9] POMs: revert of maven-deploy-plugin to 2.8.2 It seems 3.0.0-M1 may be responsible for failure of "javadoc" module build during "deploy" phase. --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de03447852e..8e0d0376d8b 100644 --- a/pom.xml +++ b/pom.xml @@ -1830,7 +1830,12 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 2.8.2 + + true