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 10:37:22 UTC
svn commit: r1005730 - in /directory/studio/branches/shared-trunk-merge: ./
application/application-plugins/ libraries/
libraries/org.apache.directory.shared.dsmlparser/
libraries/org.apache.xml.commons.xmlapis/ libraries/org.dom4j.dom4j/
Author: pamarcelot
Date: Fri Oct 8 08:37:22 2010
New Revision: 1005730
URL: http://svn.apache.org/viewvc?rev=1005730&view=rev
Log:
Fixed the xmlapis issue (it has been removed completely and is probably already included by the JVM or an existing Eclipse plugin we use).
Removed:
directory/studio/branches/shared-trunk-merge/libraries/org.apache.xml.commons.xmlapis/
Modified:
directory/studio/branches/shared-trunk-merge/application/application-plugins/pom.xml
directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.dsmlparser/pom.xml
directory/studio/branches/shared-trunk-merge/libraries/org.dom4j.dom4j/pom.xml
directory/studio/branches/shared-trunk-merge/libraries/pom.xml
directory/studio/branches/shared-trunk-merge/pom.xml
Modified: directory/studio/branches/shared-trunk-merge/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/application/application-plugins/pom.xml?rev=1005730&r1=1005729&r2=1005730&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/application/application-plugins/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/application/application-plugins/pom.xml Fri Oct 8 08:37:22 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>
Modified: directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.dsmlparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.dsmlparser/pom.xml?rev=1005730&r1=1005729&r2=1005730&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.dsmlparser/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.dsmlparser/pom.xml Fri Oct 8 08:37:22 2010
@@ -90,7 +90,6 @@
org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.apache.xml.commons.xmlapis;bundle-version="${org.apache.xml.commons.xmlapis.validversion}",
org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
org.slf4j.api;bundle-version="${org.slf4j.version}",
Modified: directory/studio/branches/shared-trunk-merge/libraries/org.dom4j.dom4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/libraries/org.dom4j.dom4j/pom.xml?rev=1005730&r1=1005729&r2=1005730&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/org.dom4j.dom4j/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/libraries/org.dom4j.dom4j/pom.xml Fri Oct 8 08:37:22 2010
@@ -86,7 +86,6 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.apache.xml.commons.xmlapis;bundle-version="${org.apache.xml.commons.xmlapis.validversion}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
Modified: directory/studio/branches/shared-trunk-merge/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/libraries/pom.xml?rev=1005730&r1=1005729&r2=1005730&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/libraries/pom.xml Fri Oct 8 08:37:22 2010
@@ -44,7 +44,6 @@
<module>org.apache.httpcomponents.httpcore</module>
<module>org.apache.logging.log4j</module>
<module>org.apache.mina.core</module>
- <module>org.apache.xml.commons.xmlapis</module>
<module>org.bouncycastle.bcprovjdk15</module>
<module>org.dom4j.dom4j</module>
<module>org.slf4j.api</module>
Modified: directory/studio/branches/shared-trunk-merge/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/pom.xml?rev=1005730&r1=1005729&r2=1005730&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/pom.xml Fri Oct 8 08:37:22 2010
@@ -78,8 +78,6 @@
<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.apache.xml.commons.xmlapis.version>1.0.b2</org.apache.xml.commons.xmlapis.version>
- <org.apache.xml.commons.xmlapis.validversion>1.0.0.b2</org.apache.xml.commons.xmlapis.validversion>
<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>
@@ -246,11 +244,6 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.xml.commons.xmlapis</artifactId>
- <version>${org.apache.xml.commons.xmlapis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.bouncycastle.bcprovjdk15</artifactId>
<version>${org.bouncycastle.bcprovjdk15.version}</version>
</dependency>
@@ -1173,11 +1166,6 @@
<version>${org.apache.mina.core.version}</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${org.apache.xml.commons.xmlapis.version}</version>
- </dependency>
- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>