From 4111b33b8b59bf24fb1b46df4e1e59fe789fc53b Mon Sep 17 00:00:00 2001 From: Mattias Hellborg Arthursson Date: Thu, 7 Nov 2013 15:02:11 +0100 Subject: [PATCH] Added generated pom files to other samples projects. --- gradle/sample-war.gradle | 2 + samples/odm/pom.xml | 147 +++++++++++++++++++ samples/plain/build.gradle | 3 +- samples/plain/pom.xml | 147 +++++++++++++++++++ samples/plain/src/main/resources/logback.xml | 14 ++ samples/user-admin/pom.xml | 12 +- 6 files changed, 318 insertions(+), 7 deletions(-) create mode 100644 samples/odm/pom.xml create mode 100644 samples/plain/pom.xml create mode 100644 samples/plain/src/main/resources/logback.xml diff --git a/gradle/sample-war.gradle b/gradle/sample-war.gradle index a7adde3c..64f9548c 100644 --- a/gradle/sample-war.gradle +++ b/gradle/sample-war.gradle @@ -7,3 +7,5 @@ apply plugin: 'jetty' sonarRunner { skipProject = true } + +build.dependsOn generatePom \ No newline at end of file diff --git a/samples/odm/pom.xml b/samples/odm/pom.xml new file mode 100644 index 00000000..92a56469 --- /dev/null +++ b/samples/odm/pom.xml @@ -0,0 +1,147 @@ + + + 4.0.0 + org.springframework.ldap + spring-ldap-odm-sample + 2.0.0.CI-SNAPSHOT + war + spring-ldap-odm-sample + spring-ldap-odm-sample + http://www.springframework.org/ldap + + SpringSource + http://springsource.org/ + + + + The Apache Software License, Version 2.0 + http://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 + http://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 + + + + + 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 + + + + + + + + spring-snasphot + http://repo.springsource.org/libs-snapshot + + + + + ch.qos.logback + logback-classic + 1.0.13 + runtime + + + org.springframework.ldap + spring-ldap-test + 2.0.0.CI-SNAPSHOT + compile + + + javax.servlet + jstl + 1.2 + compile + + + junit + junit + 4.10 + test + + + org.springframework + spring-webmvc + 3.2.4.RELEASE + compile + + + org.springframework + spring-context + 3.2.4.RELEASE + compile + + + org.springframework + spring-test + 3.2.4.RELEASE + test + + + diff --git a/samples/plain/build.gradle b/samples/plain/build.gradle index c1e636d4..87635a77 100644 --- a/samples/plain/build.gradle +++ b/samples/plain/build.gradle @@ -2,13 +2,14 @@ apply from: SAMPLE_WAR_GRADLE dependencies { compile project(':spring-ldap-test'), - 'log4j:log4j:1.2.9', 'javax.servlet:jstl:1.2', "org.springframework:spring-context:$springVersion", "org.springframework:spring-webmvc:$springVersion" provided "javax.servlet:servlet-api:2.5" + runtime 'ch.qos.logback:logback-classic:1.0.13' + testCompile "org.springframework:spring-test:$springVersion", "junit:junit:$junitVersion" } \ No newline at end of file diff --git a/samples/plain/pom.xml b/samples/plain/pom.xml new file mode 100644 index 00000000..3a86f1c7 --- /dev/null +++ b/samples/plain/pom.xml @@ -0,0 +1,147 @@ + + + 4.0.0 + org.springframework.ldap + spring-ldap-plain-sample + 2.0.0.CI-SNAPSHOT + war + spring-ldap-plain-sample + spring-ldap-plain-sample + http://www.springframework.org/ldap + + SpringSource + http://springsource.org/ + + + + The Apache Software License, Version 2.0 + http://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 + http://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 + + + + + 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 + + + + + + + + spring-snasphot + http://repo.springsource.org/libs-snapshot + + + + + ch.qos.logback + logback-classic + 1.0.13 + runtime + + + javax.servlet + jstl + 1.2 + compile + + + junit + junit + 4.10 + test + + + org.springframework.ldap + spring-ldap-test + 2.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-webmvc + 3.2.4.RELEASE + compile + + + org.springframework + spring-context + 3.2.4.RELEASE + compile + + + org.springframework + spring-test + 3.2.4.RELEASE + test + + + diff --git a/samples/plain/src/main/resources/logback.xml b/samples/plain/src/main/resources/logback.xml new file mode 100644 index 00000000..afaebf8e --- /dev/null +++ b/samples/plain/src/main/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + \ No newline at end of file diff --git a/samples/user-admin/pom.xml b/samples/user-admin/pom.xml index 55f5dd91..a8bd33aa 100644 --- a/samples/user-admin/pom.xml +++ b/samples/user-admin/pom.xml @@ -101,12 +101,6 @@ - - org.springframework.ldap - spring-ldap-test - 2.0.0.CI-SNAPSHOT - compile - ch.qos.logback logback-classic @@ -125,6 +119,12 @@ 15.0 compile + + org.springframework.ldap + spring-ldap-test + 2.0.0.CI-SNAPSHOT + compile + javax.servlet jstl