浏览代码

SEC-2580: Include ApacheDS in samples/ldap-xml

Rob Winch 11 年之前
父节点
当前提交
3be2f375f6
共有 4 个文件被更改,包括 40 次插入3 次删除
  1. 1 1
      gradle/javaprojects.gradle
  2. 1 1
      samples/ldap-jc/build.gradle
  3. 2 1
      samples/ldap-xml/ldap.gradle
  4. 36 0
      samples/ldap-xml/pom.xml

+ 1 - 1
gradle/javaprojects.gradle

@@ -48,7 +48,7 @@ ext.powerMockDependencies = [
     "org.powermock:powermock-reflect:$powerMockVersion"
     "org.powermock:powermock-reflect:$powerMockVersion"
 ]
 ]
 
 
-ext.apacheds_libs = [
+ext.apachedsDependencies = [
          "org.apache.directory.server:apacheds-core:$apacheDsVersion",
          "org.apache.directory.server:apacheds-core:$apacheDsVersion",
          "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
          "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
          "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion",
          "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion",

+ 1 - 1
samples/ldap-jc/build.gradle

@@ -6,7 +6,7 @@ dependencies {
                     'javax.servlet.jsp:jsp-api:2.1'
                     'javax.servlet.jsp:jsp-api:2.1'
 
 
     compile project(":spring-security-ldap"),
     compile project(":spring-security-ldap"),
-            apacheds_libs,
+            apachedsDependencies,
             project(":spring-security-config"),
             project(":spring-security-config"),
             project(":spring-security-samples-messages-jc"),
             project(":spring-security-samples-messages-jc"),
             project(":spring-security-core"),
             project(":spring-security-core"),

+ 2 - 1
samples/ldap-xml/ldap.gradle

@@ -17,5 +17,6 @@ dependencies {
             project(':spring-security-config'),
             project(':spring-security-config'),
             project(':spring-security-ldap'),
             project(':spring-security-ldap'),
             "org.slf4j:jcl-over-slf4j:$slf4jVersion",
             "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "ch.qos.logback:logback-classic:$logbackVersion"
+            "ch.qos.logback:logback-classic:$logbackVersion",
+            apachedsDependencies
 }
 }

+ 36 - 0
samples/ldap-xml/pom.xml

@@ -82,6 +82,42 @@
       <version>0.9.29</version>
       <version>0.9.29</version>
       <scope>runtime</scope>
       <scope>runtime</scope>
     </dependency>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-entry</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.15</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
       <artifactId>jcl-over-slf4j</artifactId>