You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@directory.apache.org by Pierre-Arnaud Marcelot <pa...@marcelot.net> on 2008/09/08 13:48:54 UTC
Re: svn commit: r693032 - in /directory/studio/trunk: apacheds-launcher/pom.xml pom.xml
Hi Felix,
As for the 'apacheds' plugin project, I would have left this dependency
management tags in the pom.xml file of the 'apacheds-launcher' project.
This project is only used in the 'apacheds' plugin project and refers to a
specific version of ApacheDS and Shared for its dependencies, which could
cause some problems with the version of Shared were using in the common
build.
Regards,
Pierre-Arnaud
On Mon, Sep 8, 2008 at 11:07 AM, <fe...@apache.org> wrote:
> Author: felixk
> Date: Mon Sep 8 02:07:03 2008
> New Revision: 693032
>
> URL: http://svn.apache.org/viewvc?rev=693032&view=rev
> Log:
> Refactor dependencyManagement section to project root pom.xml
>
> Modified:
> directory/studio/trunk/apacheds-launcher/pom.xml
> directory/studio/trunk/pom.xml
>
> Modified: directory/studio/trunk/apacheds-launcher/pom.xml
> URL:
> http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-launcher/pom.xml?rev=693032&r1=693031&r2=693032&view=diff
>
> ==============================================================================
> --- directory/studio/trunk/apacheds-launcher/pom.xml (original)
> +++ directory/studio/trunk/apacheds-launcher/pom.xml Mon Sep 8 02:07:03
> 2008
> @@ -40,7 +40,7 @@
> <artifactId>maven-eclipse-plugin</artifactId>
> <configuration>
> <skip>false</skip>
> - <pde>false</pde>
> + <pde>false</pde>
> <projectnatures>
> <projectnature>org.eclipse.jdt.core.javanature</projectnature>
> </projectnatures>
> @@ -49,195 +49,6 @@
> </plugins>
> </build>
>
> - <dependencyManagement>
> - <dependencies>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-xbean-spring</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-server-xml</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.daemon</groupId>
> - <artifactId>daemon-bootstrappers</artifactId>
> - <version>1.1.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-server-jndi</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-protocol-ntp</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-protocol-kerberos</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-protocol-changepw</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-protocol-dns</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-schema-extras</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.server</groupId>
> - <artifactId>apacheds-bootstrap-partition</artifactId>
> - <version>1.5.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.shared</groupId>
> - <artifactId>shared-asn1-codec</artifactId>
> - <version>0.9.11</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.shared</groupId>
> - <artifactId>shared-ldap</artifactId>
> - <version>0.9.11</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.directory.shared</groupId>
> - <artifactId>shared-ldap-constants</artifactId>
> - <version>0.9.11</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.mina</groupId>
> - <artifactId>mina-core</artifactId>
> - <version>1.1.6</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.mina</groupId>
> - <artifactId>mina-filter-ssl</artifactId>
> - <version>1.1.6</version>
> - </dependency>
> - <dependency>
> - <groupId>commons-collections</groupId>
> - <artifactId>commons-collections</artifactId>
> - <version>3.2</version>
> - </dependency>
> - <dependency>
> - <groupId>commons-daemon</groupId>
> - <artifactId>commons-daemon</artifactId>
> - <version>1.0.1</version>
> - </dependency>
> - <dependency>
> - <groupId>commons-lang</groupId>
> - <artifactId>commons-lang</artifactId>
> - <version>2.3</version>
> - </dependency>
> - <dependency>
> - <groupId>commons-cli</groupId>
> - <artifactId>commons-cli</artifactId>
> - <version>1.1</version>
> - </dependency>
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>slf4j-api</artifactId>
> - <version>1.4.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>jcl104-over-slf4j</artifactId>
> - <version>1.4.3</version>
> - </dependency>
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>slf4j-log4j12</artifactId>
> - <version>1.4.3</version>
> - </dependency>
> - <dependency>
> - <groupId>log4j</groupId>
> - <artifactId>log4j</artifactId>
> - <version>1.2.14</version>
> - </dependency>
> - <dependency>
> - <groupId>antlr</groupId>
> - <artifactId>antlr</artifactId>
> - <version>2.7.7</version>
> - </dependency>
> - <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-core</artifactId>
> - <version>2.0.6</version>
> - <exclusions>
> - <exclusion>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </exclusion>
> - </exclusions>
> - </dependency>
> - <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-beans</artifactId>
> - <version>2.0.6</version>
> - <exclusions>
> - <exclusion>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </exclusion>
> - </exclusions>
> - </dependency>
> - <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-context</artifactId>
> - <version>2.0.6</version>
> - <exclusions>
> - <exclusion>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </exclusion>
> - <exclusion>
> - <groupId>aopalliance</groupId>
> - <artifactId>aopalliance</artifactId>
> - </exclusion>
> - </exclusions>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.xbean</groupId>
> - <artifactId>xbean-spring</artifactId>
> - <version>3.3</version>
> - <exclusions>
> - <exclusion>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </exclusion>
> - <exclusion>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-beans</artifactId>
> - </exclusion>
> - <exclusion>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-context</artifactId>
> - </exclusion>
> - <exclusion>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-web</artifactId>
> - </exclusion>
> - <exclusion>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-jmx</artifactId>
> - </exclusion>
> - </exclusions>
> - </dependency>
> - </dependencies>
> - </dependencyManagement>
> -
> <dependencies>
> <dependency>
> <groupId>org.apache.directory.server</groupId>
>
> Modified: directory/studio/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=693032&r1=693031&r2=693032&view=diff
>
> ==============================================================================
> --- directory/studio/trunk/pom.xml (original)
> +++ directory/studio/trunk/pom.xml Mon Sep 8 02:07:03 2008
> @@ -92,7 +92,9 @@
>
> <test.integration.ui.version>1.3.0.SNAPSHOT</test.integration.ui.version>
>
> <!-- Set versions for depending projects -->
> + <org.apache.mina.version>1.1.6</org.apache.mina.version>
>
> <org.apache.directory.shared.version>0.9.12-SNAPSHOT</org.apache.directory.shared.version>
> +
> <org.apache.directory.apacheds.version>1.5.3</org.apache.directory.apacheds.version>
> </properties>
>
> <profiles>
> @@ -264,6 +266,60 @@
> <version>${test.integration.ui.version}</version>
> </dependency>
>
> + <!-- Apache Directory ApacheDS -->
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-xbean-spring</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-server-xml</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-server-jndi</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-protocol-ntp</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-protocol-kerberos</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-protocol-changepw</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-protocol-dns</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-schema-extras</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.server</groupId>
> + <artifactId>apacheds-bootstrap-partition</artifactId>
> + <version>${org.apache.directory.apacheds.version}</version>
> + </dependency>
> +
> + <!-- Apache Directory Daemon -->
> + <dependency>
> + <groupId>org.apache.directory.daemon</groupId>
> + <artifactId>daemon-bootstrappers</artifactId>
> + <version>1.1.3</version>
> + </dependency>
> +
> <!-- Maven -->
> <dependency>
> <groupId>org.apache.maven</groupId>
> @@ -870,9 +926,31 @@
> <version>1.71.1</version>
> </dependency>
>
> + <!-- Apache Mina -->
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-core</artifactId>
> + <version>${org.apache.mina.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-filter-ssl</artifactId>
> + <version>${org.apache.mina.version}</version>
> + </dependency>
> +
> <!-- Apache Directory Shared -->
> <dependency>
> <groupId>org.apache.directory.shared</groupId>
> + <artifactId>shared-asn1-codec</artifactId>
> + <version>${org.apache.directory.shared.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.shared</groupId>
> + <artifactId>shared-ldap-constants</artifactId>
> + <version>${org.apache.directory.shared.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.directory.shared</groupId>
> <artifactId>shared-ldap</artifactId>
> <version>${org.apache.directory.shared.version}</version>
> </dependency>
> @@ -887,6 +965,72 @@
> <version>${org.apache.directory.shared.version}</version>
> </dependency>
>
> + <!-- Spring framework -->
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-core</artifactId>
> + <version>2.0.6</version>
> + <exclusions>
> + <exclusion>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-beans</artifactId>
> + <version>2.0.6</version>
> + <exclusions>
> + <exclusion>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-context</artifactId>
> + <version>2.0.6</version>
> + <exclusions>
> + <exclusion>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>aopalliance</groupId>
> + <artifactId>aopalliance</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.xbean</groupId>
> + <artifactId>xbean-spring</artifactId>
> + <version>3.3</version>
> + <exclusions>
> + <exclusion>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-beans</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-context</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-web</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-jmx</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> +
> <!-- Other dependencies -->
> <dependency>
> <groupId>org.apache.xmlgraphics</groupId>
> @@ -926,6 +1070,16 @@
> <version>1.6.1</version>
> </dependency>
> <dependency>
> + <groupId>commons-cli</groupId>
> + <artifactId>commons-cli</artifactId>
> + <version>1.1</version>
> + </dependency>
> + <dependency>
> + <groupId>commons-daemon</groupId>
> + <artifactId>commons-daemon</artifactId>
> + <version>1.0.1</version>
> + </dependency>
> + <dependency>
> <groupId>commons-io</groupId>
> <artifactId>commons-io</artifactId>
> <version>1.3.1</version>
> @@ -961,10 +1115,30 @@
> <version>3.0.1-FINAL</version>
> </dependency>
> <dependency>
> + <groupId>log4j</groupId>
> + <artifactId>log4j</artifactId>
> + <version>1.2.14</version>
> + </dependency>
> + <dependency>
> <groupId>org.slf4j</groupId>
> <artifactId>nlog4j</artifactId>
> <version>1.2.25</version>
> </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-api</artifactId>
> + <version>1.4.3</version>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>jcl104-over-slf4j</artifactId>
> + <version>1.4.3</version>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-log4j12</artifactId>
> + <version>1.4.3</version>
> + </dependency>
>
> </dependencies>
> </dependencyManagement>
>
>
>