You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/08 18:35:04 UTC
svn commit: r1005886 - in /directory/studio/trunk: ./
application/application-plugins/ helps/rcp.help/src/main/docbook/
Author: pamarcelot
Date: Fri Oct 8 16:35:04 2010
New Revision: 1005886
URL: http://svn.apache.org/viewvc?rev=1005886&view=rev
Log:
Merged the 'shared-trunk-merge' branch back into trunk.
It includes all changes related to the use of the current Shared trunk into Studio (which was stuck at version 0.9.17 until now).
Modified:
directory/studio/trunk/application/application-plugins/pom.xml
directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.2.1_network_connections.xml (props changed)
directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.3_help.xml (props changed)
directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.4.1_automatic_updates.xml (props changed)
directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.4_install_update.xml (props changed)
directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.5_installed_jres.xml (props changed)
directory/studio/trunk/pom.xml
Modified: directory/studio/trunk/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-plugins/pom.xml?rev=1005886&r1=1005885&r2=1005886&view=diff
==============================================================================
--- directory/studio/trunk/application/application-plugins/pom.xml (original)
+++ directory/studio/trunk/application/application-plugins/pom.xml Fri Oct 8 16:35:04 2010
@@ -80,7 +80,7 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.asn1</artifactId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
@@ -92,10 +92,6 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.httpcomponents.httpclient</artifactId>
</artifactItem>
<artifactItem>
Propchange: directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.2.1_network_connections.xml
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.3_help.xml
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.4.1_automatic_updates.xml
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.4_install_update.xml
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/helps/rcp.help/src/main/docbook/3.1.5_installed_jres.xml
('svn:mergeinfo' removed)
Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1005886&r1=1005885&r2=1005886&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Fri Oct 8 16:35:04 2010
@@ -75,9 +75,9 @@
<org.apache.commons.logging.version>1.1.1</org.apache.commons.logging.version>
<org.apache.logging.log4j.version>1.2.14</org.apache.logging.log4j.version>
<org.apache.httpcomponents.version>4.0</org.apache.httpcomponents.version>
- <org.apache.directory.shared.version>0.9.17</org.apache.directory.shared.version>
- <org.apache.mina.core.version>2.0.0-M6</org.apache.mina.core.version>
- <org.apache.mina.core.validversion>2.0.0.M6</org.apache.mina.core.validversion>
+ <org.apache.directory.shared.version>0.9.20-SNAPSHOT</org.apache.directory.shared.version>
+ <org.apache.directory.shared.validversion>0.9.20.SNAPSHOT</org.apache.directory.shared.validversion>
+ <org.apache.mina.core.version>2.0.0</org.apache.mina.core.version>
<org.bouncycastle.bcprovjdk15.version>140</org.bouncycastle.bcprovjdk15.version>
<org.dom4j.version>1.6.1</org.dom4j.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
@@ -209,22 +209,17 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.asn1</artifactId>
- <version>${org.apache.directory.shared.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.shared.dsmlparser</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
@@ -245,7 +240,7 @@
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.mina.core</artifactId>
- <version>${org.apache.mina.core.validversion}</version>
+ <version>${org.apache.mina.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
@@ -1140,22 +1135,12 @@
<!-- Apache Directory Shared -->
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap</artifactId>
+ <artifactId>shared-i18n</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-asn1</artifactId>
- <version>${org.apache.directory.shared.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-converter</artifactId>
+ <artifactId>shared-ldap</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>