diff --git a/gradle/sample-war.gradle b/gradle/sample-war.gradle index 5cca2729..3c84cada 100644 --- a/gradle/sample-war.gradle +++ b/gradle/sample-war.gradle @@ -1,5 +1,4 @@ apply from: JAVA_SCRIPT -apply from: MAVEN_DEPLOYMENT_SCRIPT apply plugin: 'war' apply plugin: 'jetty' @@ -7,5 +6,3 @@ apply plugin: 'jetty' sonarqube { skipProject = true } - -build.dependsOn generatePom diff --git a/samples/odm/pom.xml b/samples/odm/pom.xml deleted file mode 100644 index d0321163..00000000 --- a/samples/odm/pom.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - 4.0.0 - org.springframework.ldap - spring-ldap-odm-sample - 2.3.3.BUILD-SNAPSHOT - war - spring-ldap-odm-sample - spring-ldap-odm-sample - https://www.springframework.org/ldap - - SpringSource - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - rwinch - Rob Winch - rwinch@gopivotal.com - - - marthursson - Mattias Hellborg Arthursson - mattias@261consulting.com - 261 Consulting - http://www.261consulting.com - - - ulsa - Ulrik Sandberg - ulrik.sandberg@jayway.com - Jayway - https://www.jayway.com - - - - - Eric Dalquist - - - Marius Scurtescu - - - Tim Terry - - - Keith Barlow - - - Paul Harvey - - - Marvin S. Addison - - - - scm:git:git://github.com/SpringSource/spring-ldap - scm:git:git://github.com/SpringSource/spring-ldap - https://github.com/SpringSource/spring-ldap - - - - commons-lang - commons-lang - 2.6 - compile - - - javax.servlet - jstl - 1.2 - compile - - - org.springframework.data - spring-data-commons - 1.13.18.RELEASE - compile - - - org.springframework.ldap - spring-ldap-test - 2.3.3.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context - 4.3.4.RELEASE - compile - - - org.springframework - spring-webmvc - 4.3.4.RELEASE - compile - - - javax.servlet - servlet-api - 2.5 - provided - - - ch.qos.logback - logback-classic - 1.0.13 - runtime - - - junit - junit - 4.12 - test - - - org.apache.directory.server - apacheds-core - 1.5.5 - test - - - org.apache.directory.server - apacheds-core-entry - 1.5.5 - test - - - org.apache.directory.server - apacheds-protocol-ldap - 1.5.5 - test - - - org.apache.directory.server - apacheds-protocol-shared - 1.5.5 - test - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - test - - - org.apache.directory.shared - shared-ldap - 0.9.15 - test - - - org.assertj - assertj-core - 2.3.0 - test - - - org.springframework - spring-test - 4.3.4.RELEASE - test - - - - - spring-snasphot - https://repo.springsource.org/libs-snapshot - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-war-plugin - 2.3 - - false - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /spring-ldap-odm-sample - - - - - - diff --git a/samples/odm/readme.md b/samples/odm/readme.md index c479f35e..43e02941 100644 --- a/samples/odm/readme.md +++ b/samples/odm/readme.md @@ -6,4 +6,4 @@ The core Spring application context of the sample is defined in resources/applic This ApplicationContext will start an in-process Apache Directory Server instance, automatically populated with some test data. The data will be reset every time the application is restarted. -To run the example, do `gradle jettyRun` or `mvn jetty:run`, and then navigate to `http://localhost:8080/spring-ldap-plain-sample` +To run the example, do `gradle jettyRun`, and then navigate to `http://localhost:8080/spring-ldap-plain-sample` diff --git a/samples/plain/pom.xml b/samples/plain/pom.xml deleted file mode 100644 index fb1628d9..00000000 --- a/samples/plain/pom.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - 4.0.0 - org.springframework.ldap - spring-ldap-plain-sample - 2.3.3.BUILD-SNAPSHOT - war - spring-ldap-plain-sample - spring-ldap-plain-sample - https://www.springframework.org/ldap - - SpringSource - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - rwinch - Rob Winch - rwinch@gopivotal.com - - - marthursson - Mattias Hellborg Arthursson - mattias@261consulting.com - 261 Consulting - http://www.261consulting.com - - - ulsa - Ulrik Sandberg - ulrik.sandberg@jayway.com - Jayway - https://www.jayway.com - - - - - Eric Dalquist - - - Marius Scurtescu - - - Tim Terry - - - Keith Barlow - - - Paul Harvey - - - Marvin S. Addison - - - - scm:git:git://github.com/SpringSource/spring-ldap - scm:git:git://github.com/SpringSource/spring-ldap - https://github.com/SpringSource/spring-ldap - - - - javax.servlet - jstl - 1.2 - compile - - - org.springframework.data - spring-data-commons - 1.13.18.RELEASE - compile - - - org.springframework.ldap - spring-ldap-test - 2.3.3.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context - 4.3.4.RELEASE - compile - - - org.springframework - spring-webmvc - 4.3.4.RELEASE - compile - - - org.apache.directory.server - apacheds-core - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-core-entry - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-protocol-ldap - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-protocol-shared - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - compile - true - - - org.apache.directory.shared - shared-ldap - 0.9.15 - compile - true - - - javax.servlet - servlet-api - 2.5 - provided - - - ch.qos.logback - logback-classic - 1.0.13 - runtime - - - junit - junit - 4.12 - test - - - org.assertj - assertj-core - 2.3.0 - test - - - org.springframework - spring-test - 4.3.4.RELEASE - test - - - - - spring-snasphot - https://repo.springsource.org/libs-snapshot - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-war-plugin - 2.3 - - false - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /spring-ldap-plain-sample - - - - - - diff --git a/samples/plain/readme.md b/samples/plain/readme.md index 1c3ff08a..3f8d8977 100644 --- a/samples/plain/readme.md +++ b/samples/plain/readme.md @@ -6,4 +6,4 @@ The core Spring application context of the sample is defined in resources/applic This ApplicationContext will start an in-process Apache Directory Server instance, automatically populated with some test data. The data will be reset every time the application is restarted. -To run the example, do `gradle jettyRun` or `mvn jetty:run`, and then navigate to `http://localhost:8080/spring-ldap-plain-sample` +To run the example, do `gradle jettyRun`, and then navigate to `http://localhost:8080/spring-ldap-plain-sample` diff --git a/samples/user-admin/pom.xml b/samples/user-admin/pom.xml deleted file mode 100644 index 54319558..00000000 --- a/samples/user-admin/pom.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - 4.0.0 - org.springframework.ldap - spring-ldap-user-admin-sample - 2.2.0.RC1 - war - spring-ldap-user-admin-sample - spring-ldap-user-admin-sample - https://www.springframework.org/ldap - - SpringSource - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - rwinch - Rob Winch - rwinch@gopivotal.com - - - marthursson - Mattias Hellborg Arthursson - mattias@261consulting.com - 261 Consulting - http://www.261consulting.com - - - ulsa - Ulrik Sandberg - ulrik.sandberg@jayway.com - Jayway - https://www.jayway.com - - - - - Eric Dalquist - - - Marius Scurtescu - - - Tim Terry - - - Keith Barlow - - - Paul Harvey - - - Marvin S. Addison - - - - scm:git:git://github.com/SpringSource/spring-ldap - scm:git:git://github.com/SpringSource/spring-ldap - https://github.com/SpringSource/spring-ldap - - - - com.fasterxml.jackson.core - jackson-databind - 2.9.8 - compile - - - com.google.guava - guava - 15.0 - compile - - - javax.servlet - jstl - 1.2 - compile - - - org.springframework.data - spring-data-commons - 1.13.18.RELEASE - compile - - - org.springframework.ldap - spring-ldap-test - 2.2.0.RC1 - compile - - - org.springframework - spring-context - 4.3.3.RELEASE - compile - - - org.springframework - spring-webmvc - 4.3.3.RELEASE - compile - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.0.13 - runtime - - - junit - junit - 4.12 - test - - - org.springframework - spring-test - 4.3.3.RELEASE - test - - - - - spring-snasphot - https://repo.springsource.org/libs-snapshot - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-war-plugin - 2.3 - - false - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /spring-ldap-user-admin-sample - - - - - - diff --git a/samples/user-admin/readme.md b/samples/user-admin/readme.md index 14101f32..2ce86ded 100644 --- a/samples/user-admin/readme.md +++ b/samples/user-admin/readme.md @@ -51,8 +51,4 @@ Example: -Dsample.ldap.userDn=CN=ldaptest,CN=Users,DC=261consulting,DC=local -Dsample.ldap.password=secret \ -Dsample.ldap.base=ou=test,dc=261consulting,dc=local -Dsample.ldap.directory.type=AD - mvn jetty:run -Dspring.profiles.active=no-apacheds -Dsample.ldap.url=ldaps://127.0.0.1:636 \ - -Dsample.ldap.userDn=CN=ldaptest,CN=Users,DC=261consulting,DC=local -Dsample.ldap.password=secret \ - -Dsample.ldap.base=ou=test,dc=261consulting,dc=local -Dsample.ldap.directory.type=AD - -This sample uses Bootstrap to present a decent web design - copyright 2013 Twitter, Inc; distributed under the Apache 2 License. \ No newline at end of file +This sample uses Bootstrap to present a decent web design - copyright 2013 Twitter, Inc; distributed under the Apache 2 License.