Merge remote-tracking branch 'origin/master'

Evolveum · May 22, 2020 · 393baa9 · 393baa9
2 parents 5233ba6 + 3775584
commit 393baa9
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 795 deletions.
diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -166,24 +166,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>

diff --git a/...ain/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java b/...ain/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticator.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticator.java
diff --git a/...ain/java/com/evolveum/midpoint/model/impl/security/MidpointRestPasswordAuthenticator.java b/...ain/java/com/evolveum/midpoint/model/impl/security/MidpointRestPasswordAuthenticator.java