From e96293708c8c613cc71e5bec6da660638864b7c1 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Sat, 20 Feb 2010 00:58:30 +0000 Subject: [PATCH] Worked on LDAP-200, Add pluginManagement to parent pom. --- odm/pom.xml | 10 ---- parent/pom.xml | 146 +++++++++++++++++++++++++++++++++++++++++-------- pom.xml | 121 +++++++++++++++++++++++++++++++--------- test/pom.xml | 28 +++++----- 4 files changed, 234 insertions(+), 71 deletions(-) diff --git a/odm/pom.xml b/odm/pom.xml index a0d56c79..345d85eb 100644 --- a/odm/pom.xml +++ b/odm/pom.xml @@ -25,9 +25,6 @@ - - - @@ -49,13 +46,6 @@ 1.5 - - org.apache.maven.plugins - maven-surefire-report-plugin - - always - - diff --git a/parent/pom.xml b/parent/pom.xml index 90df4452..50ccda56 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -76,6 +76,130 @@ + + + + maven-jxr-plugin + 2.1 + + true + + + + maven-surefire-report-plugin + 2.4.3 + + true + + + + maven-surefire-plugin + 2.4.2 + + once + false + + + + maven-resources-plugin + 2.3 + + + maven-project-info-reports-plugin + 2.1.2 + + + maven-site-plugin + 2.1 + + + maven-install-plugin + 2.2 + + + maven-deploy-plugin + 2.4 + + + maven-dependency-plugin + 2.0 + + + maven-clean-plugin + 2.2 + + + maven-assembly-plugin + 2.2-beta-2 + + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.6 + + + maven-javadoc-plugin + 2.5 + + true + true +
Spring LDAP Framework
+ true + ${basedir}/src/main/javadoc/javadoc.css + ${basedir}/src/main/javadoc/overview.html + ${basedir}/src/main/javadoc + org.springframework.ldap.samples:org.springframework.ldap.itest + + http://java.sun.com/j2se/1.4.2/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + http://static.springframework.org/spring/docs/2.5.x/api/ + http://logging.apache.org/log4j/1.2/apidocs/ + http://commons.apache.org/logging/apidocs/ + http://commons.apache.org/dbcp/apidocs/ + http://commons.apache.org/pool/apidocs/ + http://junit.sourceforge.net/javadoc/ + +
+
+ + maven-eclipse-plugin + 2.7 + + true + + package.html + + + + + maven-idea-plugin + 2.2 + + true + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.3 + + + org.codehaus.mojo + findbugs-maven-plugin + 1.2 + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.21 + + + org.apache.maven.plugins + maven-war-plugin + 2.1-beta-1 + +
+
org.springframework.build.aws @@ -94,11 +218,6 @@ maven-surefire-plugin - 2.4.2 - - once - false - maven-jar-plugin @@ -116,16 +235,9 @@ maven-eclipse-plugin - - true - maven-idea-plugin - - true - true - org.codehaus.mojo @@ -159,28 +271,18 @@ org.codehaus.mojo findbugs-maven-plugin - 1.2 maven-jxr-plugin - - true - maven-surefire-report-plugin - - true - maven-project-info-reports-plugin maven-javadoc-plugin - - true - diff --git a/pom.xml b/pom.xml index 86f2fae5..a8356309 100644 --- a/pom.xml +++ b/pom.xml @@ -261,6 +261,89 @@ + + + + maven-jxr-plugin + 2.1 + + true + + + + maven-surefire-report-plugin + 2.4.3 + + true + + + + maven-project-info-reports-plugin + 2.1.2 + + + maven-site-plugin + 2.1 + + + maven-install-plugin + 2.2 + + + maven-deploy-plugin + 2.4 + + + maven-dependency-plugin + 2.0 + + + maven-clean-plugin + 2.2 + + + maven-assembly-plugin + 2.2-beta-2 + + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.6 + + + maven-javadoc-plugin + 2.5 + + true + true +
Spring LDAP Framework
+ true + ${basedir}/src/main/javadoc/javadoc.css + ${basedir}/src/main/javadoc/overview.html + ${basedir}/src/main/javadoc + org.springframework.ldap.samples:org.springframework.ldap.itest + + http://java.sun.com/j2se/1.4.2/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + http://static.springframework.org/spring/docs/2.5.x/api/ + http://logging.apache.org/log4j/1.2/apidocs/ + http://commons.apache.org/logging/apidocs/ + http://commons.apache.org/dbcp/apidocs/ + http://commons.apache.org/pool/apidocs/ + http://junit.sourceforge.net/javadoc/ + +
+
+ + maven-project-info-reports-plugin + + + org.codehaus.mojo + versions-maven-plugin + 1.1 + +
+
maven-assembly-plugin @@ -324,7 +407,6 @@ com.agilejava.docbkx docbkx-maven-plugin - 2.0.6 @@ -378,35 +460,24 @@
+ + org.codehaus.mojo + versions-maven-plugin + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + maven-jxr-plugin - - true - - - - maven-surefire-report-plugin - - true - maven-javadoc-plugin - - true - true -
Spring LDAP Framework
- true - ${basedir}/src/main/javadoc/javadoc.css - ${basedir}/src/main/javadoc/overview.html - ${basedir}/src/main/javadoc - org.springframework.ldap.samples:org.springframework.ldap.itest - - http://java.sun.com/j2se/1.5.0/docs/api - http://static.springframework.org/spring/docs/2.5.x/api/ - http://commons.apache.org/pool/apidocs/ - -
diff --git a/test/pom.xml b/test/pom.xml index ac41c6cc..faf59867 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -16,20 +16,20 @@ integration-tests - - - openldap - - integration-tests-openldap - - - - sunone - - integration-tests-sunone - - - + + + openldap + + integration-tests-openldap + + + + sunone + + integration-tests-sunone + + + spring-milestone