knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject knox git commit: KNOX-1527 - Bump apacheds dependency version to 2.0.0-AM25
Date Thu, 13 Dec 2018 21:05:23 GMT
Repository: knox
Updated Branches:
  refs/heads/master 89caa5fee -> ecbbbd00a


KNOX-1527 - Bump apacheds dependency version to 2.0.0-AM25

Signed-off-by: Kevin Risden <krisden@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/ecbbbd00
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/ecbbbd00
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/ecbbbd00

Branch: refs/heads/master
Commit: ecbbbd00a2240b8e25677ec5548916ea189cd87f
Parents: 89caa5f
Author: Kevin Risden <krisden@apache.org>
Authored: Thu Dec 13 15:37:56 2018 -0500
Committer: Kevin Risden <krisden@apache.org>
Committed: Thu Dec 13 15:40:53 2018 -0500

----------------------------------------------------------------------
 gateway-provider-security-pac4j/pom.xml | 10 ----------
 pom.xml                                 | 17 +++++++++--------
 2 files changed, 9 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/ecbbbd00/gateway-provider-security-pac4j/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/pom.xml b/gateway-provider-security-pac4j/pom.xml
index 8fcd9cf..cdafdd6 100644
--- a/gateway-provider-security-pac4j/pom.xml
+++ b/gateway-provider-security-pac4j/pom.xml
@@ -29,7 +29,6 @@
     <description>An extension of the gateway integrating pac4j as an authentication
provider.</description>
 
     <properties>
-        <bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>
         <j2e-pac4j.version>4.1.0</j2e-pac4j.version>
         <pac4j.version>3.4.0</pac4j.version>
         <spring-core.version>5.1.3.RELEASE</spring-core.version>
@@ -139,10 +138,6 @@
                     <artifactId>xalan</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-core</artifactId>
                 </exclusion>
@@ -151,11 +146,6 @@
 
         <!-- Upgrade pac4j-saml dependencies to avoid known CVEs -->
         <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>${bcprov-jdk15on.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>${spring-core.version}</version>

http://git-wip-us.apache.org/repos/asf/knox/blob/ecbbbd00/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a5fc9d7..7552b93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,11 +136,12 @@
         <maven.compiler.target>8</maven.compiler.target>
 
         <!-- Dependencies sorted alphabetically -->
-        <apacheds.directory.api.version>1.0.2</apacheds.directory.api.version>
-        <apacheds.directory.server.version>2.0.0-M24</apacheds.directory.server.version>
+        <apacheds.directory.api.version>2.0.0.AM2</apacheds.directory.api.version>
+        <apacheds.directory.server.version>2.0.0.AM25</apacheds.directory.server.version>
         <apacheds-jdbm.version>2.0.0-M5</apacheds-jdbm.version>
         <ant-nodeps.version>1.8.1</ant-nodeps.version>
         <asm.version>7.0</asm.version>
+        <bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>
         <buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
         <cglib.version>3.2.10</cglib.version>
         <checkstyle.version>8.15</checkstyle.version>
@@ -1045,12 +1046,6 @@
                 <groupId>com.nimbusds</groupId>
                 <artifactId>nimbus-jose-jwt</artifactId>
                 <version>${nimbus-jose-jwt.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.bouncycastle</groupId>
-                        <artifactId>bcprov-jdk15on</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>net.minidev</groupId>
@@ -1667,6 +1662,12 @@
                 <artifactId>gateway-demo-ldap-launcher</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bcprov-jdk15on.version}</version>
+            </dependency>
             
             <dependency>
                 <groupId>net.lingala.zip4j</groupId>


Mime
View raw message