mirror of
https://github.com/bmlong137/alfresco-keycloak.git
synced 2025-05-12 21:24:43 +00:00
Merge branch 'feature/acs23' into feature/login-plugin
This commit is contained in:
commit
564f14dc7f
10
pom.xml
10
pom.xml
@ -85,6 +85,8 @@
|
||||
<!-- lowest common denominator of Repository / Share in 6.0 -->
|
||||
<apache.httpclient.version>4.5.13</apache.httpclient.version>
|
||||
<apache.httpcore.version>4.4.16</apache.httpcore.version>
|
||||
<!-- parent is including 6.11 erroneously -->
|
||||
<surf.version>9.0</surf.version>
|
||||
|
||||
<acosix.utility.version>1.4.3</acosix.utility.version>
|
||||
<ootbee.support-tools.version>1.1.0.0</ootbee.support-tools.version>
|
||||
@ -108,6 +110,7 @@
|
||||
<docker.tests.repositoryImageBuilder.postRun>USER alfresco</docker.tests.repositoryImageBuilder.postRun>
|
||||
<acosix.utility.version>1.3.0</acosix.utility.version>
|
||||
-->
|
||||
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
@ -194,6 +197,13 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.alfresco.surf</groupId>
|
||||
<artifactId>spring-surf</artifactId>
|
||||
<version>${surf.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>de.acosix.alfresco.utility</groupId>
|
||||
<artifactId>de.acosix.alfresco.utility.common</artifactId>
|
||||
|
@ -45,8 +45,8 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcpkix-jdk15on</artifactId>
|
||||
<version>1.68</version>
|
||||
<artifactId>bcpkix-jdk18on</artifactId>
|
||||
<version>1.77</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
@ -132,7 +132,7 @@
|
||||
<!-- BouncyCastle cannot be made part of an uber-JAR -->
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcpkix-jdk15on</artifactId>
|
||||
<artifactId>bcpkix-jdk18on</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
Loading…
x
Reference in New Issue
Block a user