mirror of
				https://github.com/gyurix1968/guacamole-client.git
				synced 2025-10-31 09:03:21 +00:00 
			
		
		
		
	GUACAMOLE-1859: Update to Apache Directory API v2.1.5.
This commit is contained in:
		| @@ -51,8 +51,19 @@ | ||||
|         <dependency> | ||||
|             <groupId>org.apache.directory.api</groupId> | ||||
|             <artifactId>api-all</artifactId> | ||||
|             <version>2.1.4</version> | ||||
|             <version>2.1.5</version> | ||||
|             <exclusions> | ||||
|  | ||||
|                 <!-- | ||||
|                     Replace slightly older commons-lang3 (3.13.0) with latest | ||||
|                     compatible version (3.14.0) so that we don't need two copies | ||||
|                     of the same license information. | ||||
|                 --> | ||||
|                 <exclusion> | ||||
|                     <groupId>org.apache.commons</groupId> | ||||
|                     <artifactId>commons-lang3</artifactId> | ||||
|                 </exclusion> | ||||
|  | ||||
|             </exclusions> | ||||
|         </dependency> | ||||
|  | ||||
| @@ -72,6 +83,13 @@ | ||||
|             <artifactId>jackson-dataformat-yaml</artifactId> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- Apache Commons Lang (see exclusions for api-all) --> | ||||
|         <dependency> | ||||
|             <groupId>org.apache.commons</groupId> | ||||
|             <artifactId>commons-lang3</artifactId> | ||||
|             <version>3.14.0</version> | ||||
|         </dependency> | ||||
|  | ||||
|     </dependencies> | ||||
|  | ||||
| </project> | ||||
|   | ||||
| @@ -65,6 +65,17 @@ | ||||
|                     <groupId>org.glassfish.jaxb</groupId> | ||||
|                     <artifactId>jaxb-core</artifactId> | ||||
|                 </exclusion> | ||||
|                  | ||||
|                 <!-- | ||||
|                     Replace slightly older commons-codec (1.15) with newer | ||||
|                     and identical version to that used by Apache Directory API | ||||
|                     for LDAP (1.16.0) so that we don't need two copies of the | ||||
|                     same license information. | ||||
|                 --> | ||||
|                 <exclusion> | ||||
|                     <groupId>commons-codec</groupId> | ||||
|                     <artifactId>commons-codec</artifactId> | ||||
|                 </exclusion> | ||||
|  | ||||
|             </exclusions> | ||||
|         </dependency> | ||||
| @@ -118,6 +129,13 @@ | ||||
|             <version>2.3.1</version> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- Apache Commons Codec (see exclusions for cas-client-core) --> | ||||
|         <dependency> | ||||
|             <groupId>commons-codec</groupId> | ||||
|             <artifactId>commons-codec</artifactId> | ||||
|             <version>1.16.0</version> | ||||
|         </dependency> | ||||
|  | ||||
|     </dependencies> | ||||
|  | ||||
| </project> | ||||
|   | ||||
| @@ -94,21 +94,70 @@ | ||||
|                     <artifactId>xmlsec</artifactId> | ||||
|                 </exclusion> | ||||
|  | ||||
|                 <!-- | ||||
|                     Replace slightly older commons-lang3 (3.12.0) with latest | ||||
|                     compatible version (3.14.0) so that we don't need two copies | ||||
|                     of the same license information. | ||||
|                 --> | ||||
|                 <exclusion> | ||||
|                     <groupId>org.apache.commons</groupId> | ||||
|                     <artifactId>commons-lang3</artifactId> | ||||
|                 </exclusion> | ||||
|  | ||||
|                 <!-- | ||||
|                     Replace slightly older commons-codec (1.15) with newer | ||||
|                     and identical version to that used by Apache Directory API | ||||
|                     for LDAP (1.16.0) so that we don't need two copies of the | ||||
|                     same license information. | ||||
|                 --> | ||||
|                 <exclusion> | ||||
|                     <groupId>commons-codec</groupId> | ||||
|                     <artifactId>commons-codec</artifactId> | ||||
|                 </exclusion> | ||||
|  | ||||
|             </exclusions> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- Woodstox --> | ||||
|         <!-- Woodstox (see exclusions for java-saml) --> | ||||
|         <dependency> | ||||
|             <groupId>com.fasterxml.woodstox</groupId> | ||||
|             <artifactId>woodstox-core</artifactId> | ||||
|             <version>5.4.0</version> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- Apache XML Security for Java --> | ||||
|         <!-- Apache XML Security for Java (see exclusions for java-saml) --> | ||||
|         <dependency> | ||||
|             <groupId>org.apache.santuario</groupId> | ||||
|             <artifactId>xmlsec</artifactId> | ||||
|             <version>2.2.6</version> | ||||
|             <exclusions> | ||||
|  | ||||
|                 <!-- | ||||
|                     Replace slightly older commons-codec (1.15) with newer | ||||
|                     and identical version to that used by Apache Directory API | ||||
|                     for LDAP (1.16.0) so that we don't need two copies of the | ||||
|                     same license information. | ||||
|                 --> | ||||
|                 <exclusion> | ||||
|                     <groupId>commons-codec</groupId> | ||||
|                     <artifactId>commons-codec</artifactId> | ||||
|                 </exclusion> | ||||
|  | ||||
|             </exclusions> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- Apache Commons Lang (see exclusions for java-saml) --> | ||||
|         <dependency> | ||||
|             <groupId>org.apache.commons</groupId> | ||||
|             <artifactId>commons-lang3</artifactId> | ||||
|             <version>3.14.0</version> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- Apache Commons Codec (see exclusions for java-saml and xmlsec) --> | ||||
|         <dependency> | ||||
|             <groupId>commons-codec</groupId> | ||||
|             <artifactId>commons-codec</artifactId> | ||||
|             <version>1.16.0</version> | ||||
|         </dependency> | ||||
|  | ||||
|     </dependencies> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user