Dependency convergence fix after LDAP connector changes.

Evolveum · Feb 13, 2017 · 6a9cef8 · 6a9cef8
1 parent 31356cd
commit 6a9cef8
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 0 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -441,6 +441,22 @@
                 <artifactId>Saxon-HE</artifactId>
                 <version>9.5.1-6</version>
             </dependency>
+            <dependency>
+	            <!-- In LDAP/AD connector we use custom build of HTTP client with CredSSP support.
+                  	 As AD/LDAP connector is bundled then this triggers a conflict in dependency convergence.
+	                 Therefore explicitly use the custom version. -->
+	            <groupId>org.apache.httpcomponents</groupId>
+	            <artifactId>httpclient</artifactId>
+	            <version>4.5.3.e1</version>
+            </dependency>
+            <dependency>
+	            <!-- In LDAP/AD connector we use custom build of HTTP client with CredSSP support.
+                  	 As AD/LDAP connector is bundled then this triggers a conflict in dependency convergence.
+	                 Therefore explicitly use the custom version. -->
+	            <groupId>org.apache.httpcomponents</groupId>
+	            <artifactId>httpcore</artifactId>
+	            <version>4.4.6</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-core</artifactId>
@@ -497,6 +513,22 @@
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-transports-http</artifactId>
                 <version>${cxf.version}</version>
+                <exclusions>
+                    <exclusion>
+                    	<!-- In LDAP/AD connector we use custom build of HTTP client with CredSSP support.
+                    	     As AD/LDAP connector is bundled then this triggers a conflict in dependency convergence.
+	                         Therefore explicitly use the custom version. -->
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                    </exclusion>
+                    <exclusion>
+                    	<!-- In LDAP/AD connector we use custom build of HTTP client with CredSSP support.
+                    	     As AD/LDAP connector is bundled then this triggers a conflict in dependency convergence.
+	                         Therefore explicitly use the custom version. -->
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpcore</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.cxf</groupId>

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -539,6 +539,23 @@
             <artifactId>commons-validator</artifactId>
         </dependency>
 
+ 		<dependency>
+	        <!-- In LDAP/AD connector we use custom build of HTTP client with CredSSP support.
+	             As AD/LDAP connector is bundled then this triggers a conflict in dependency convergence.
+	             Therefore explicitly use the custom version. -->
+	        <groupId>org.apache.httpcomponents</groupId>
+	        <artifactId>httpclient</artifactId>
+	        <scope>runtime</scope>
+        </dependency>
+        <dependency>
+	        <!-- In LDAP/AD connector we use custom build of HTTP client with CredSSP support.
+	             As AD/LDAP connector is bundled then this triggers a conflict in dependency convergence.
+	             Therefore explicitly use the custom version. -->
+	        <groupId>org.apache.httpcomponents</groupId>
+	        <artifactId>httpcore</artifactId>
+	        <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.ocpsoft.prettytime</groupId>
             <artifactId>prettytime</artifactId>