directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1005022 - in /directory/studio/branches/shared-trunk-merge: ./ libraries/ libraries/org.apache.directory.shared.asn1/ libraries/org.apache.directory.shared.dsmlparser/ libraries/org.apache.directory.shared.i18n/ libraries/org.apache.direct...
Date Wed, 06 Oct 2010 13:20:10 GMT
Author: pamarcelot
Date: Wed Oct  6 13:20:10 2010
New Revision: 1005022

URL: http://svn.apache.org/viewvc?rev=1005022&view=rev
Log:
Updated versions of Shared. Added/Removed required projects.

Added:
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/pom.xml
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.xml.commons.xmlapis/
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.xml.commons.xmlapis/pom.xml
Removed:
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.asn1/
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.ldapconstants/
Modified:
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.dsmlparser/pom.xml
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.ldap/pom.xml
    directory/studio/branches/shared-trunk-merge/libraries/org.apache.mina.core/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/plugins/aciitemeditor/pom.xml
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/pom.xml
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/pom.xml
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/pom.xml
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/pom.xml
    directory/studio/branches/shared-trunk-merge/pom.xml

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=1005022&r1=1005021&r2=1005022&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
Wed Oct  6 13:20:10 2010
@@ -86,12 +86,11 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
-            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+            <Require-Bundle>org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ 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}",
@@ -129,20 +128,12 @@
       <artifactId>shared-dsml-parser</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>antlr</groupId>
-          <artifactId>antlr</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>dom4j</groupId>
           <artifactId>dom4j</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
-          <artifactId>shared-asn1</artifactId>
+          <artifactId>shared-i18n</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
@@ -153,6 +144,10 @@
           <artifactId>slf4j-api</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>xpp3</groupId>
           <artifactId>xpp3</artifactId>
         </exclusion>

Added: directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/pom.xml?rev=1005022&view=auto
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/pom.xml
(added)
+++ directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/pom.xml
Wed Oct  6 13:20:10 2010
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent-libraries</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.apache.directory.shared.i18n</artifactId>
+  <version>${org.apache.directory.shared.version}</version>
+  
+  <name>Apache Directory Shared i18n (for Apache Directory Studio)</name>
+  <packaging>jar</packaging>
+
+  <description />
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      <!-- MANIFEST.MF Generation -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
+            <Export-Package>*</Export-Package>
+            <Import-Package>!</Import-Package>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- No tests to run -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
+    </dependency>
+  </dependencies>
+  
+</project>

Modified: directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.ldap/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.ldap/pom.xml
(original)
+++ directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.ldap/pom.xml
Wed Oct  6 13:20:10 2010
@@ -88,8 +88,7 @@
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
  org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
  org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.slf4j.api;bundle-version="${org.slf4j.version}",
  org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>

Modified: directory/studio/branches/shared-trunk-merge/libraries/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/libraries/org.apache.mina.core/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/org.apache.mina.core/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/libraries/org.apache.mina.core/pom.xml Wed
Oct  6 13:20:10 2010
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.mina.core</artifactId>
-  <version>${org.apache.mina.core.validversion}</version>
+  <version>${org.apache.mina.core.version}</version>
   
   <name>Apache MINA Core (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Added: directory/studio/branches/shared-trunk-merge/libraries/org.apache.xml.commons.xmlapis/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/libraries/org.apache.xml.commons.xmlapis/pom.xml?rev=1005022&view=auto
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/org.apache.xml.commons.xmlapis/pom.xml
(added)
+++ directory/studio/branches/shared-trunk-merge/libraries/org.apache.xml.commons.xmlapis/pom.xml
Wed Oct  6 13:20:10 2010
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent-libraries</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.apache.xml.commons.xmlapis</artifactId>
+  <version>${org.apache.xml.commons.xmlapis.validversion}</version>
+  
+  <name>XML Commons External Components XML APIs (for Apache Directory Studio)</name>
+  <packaging>jar</packaging>
+
+  <description />
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      <!-- MANIFEST.MF Generation -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
+            <Export-Package>*</Export-Package>
+            <Import-Package>!</Import-Package>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- No tests to run -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+  	<dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
+  </dependencies>
+  
+</project>

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=1005022&r1=1005021&r2=1005022&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 Wed Oct
 6 13:20:10 2010
@@ -86,6 +86,7 @@
           <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=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/libraries/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/libraries/pom.xml Wed Oct  6 13:20:10 2010
@@ -37,14 +37,14 @@
     <module>org.apache.commons.io</module>
     <module>org.apache.commons.lang</module>
     <module>org.apache.commons.logging</module>
-    <module>org.apache.directory.shared.asn1</module>
     <module>org.apache.directory.shared.dsmlparser</module>
+    <module>org.apache.directory.shared.i18n</module>
     <module>org.apache.directory.shared.ldap</module>
-    <module>org.apache.directory.shared.ldapconstants</module>
     <module>org.apache.httpcomponents.httpclient</module>
     <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/plugins/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/aciitemeditor/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/aciitemeditor/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/aciitemeditor/pom.xml Wed Oct  6
13:20:10 2010
@@ -110,8 +110,7 @@
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.aciitemeditor.Activator</Bundle-Activator>
             <Require-Bundle>
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
@@ -158,11 +157,6 @@
       <artifactId>org.apache.directory.shared.ldap</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
-      <scope>provided</scope>
-    </dependency>
     
   	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/pom.xml Wed Oct
 6 13:20:10 2010
@@ -118,8 +118,7 @@
  org.apache.directory.studio.ldifparser,
  org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
  org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.jface.text,
@@ -172,11 +171,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.slf4j.log4j12</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/pom.xml Wed Oct
 6 13:20:10 2010
@@ -111,10 +111,8 @@
  org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
  org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
  org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.dsmlparser;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.dsmlparser;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.ldifparser,
@@ -192,21 +190,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.asn1</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.apache.directory.shared.ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.apache.directory.shared.dsmlparser</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/pom.xml Wed Oct  6
13:20:10 2010
@@ -119,8 +119,7 @@
             <Require-Bundle>
  org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
  org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
@@ -183,11 +182,6 @@
       <artifactId>org.apache.directory.shared.ldap</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
-      <scope>provided</scope>
-    </dependency>
     
   	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/pom.xml Wed Oct  6 13:20:10
2010
@@ -116,7 +116,6 @@
             <Require-Bundle>
  org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
  org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
@@ -153,26 +152,6 @@
   </build>
 
   <dependencies>
-  	<!-- Libraries dependencies -->
-  	<dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-converter</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>antlr</groupId>
-          <artifactId>antlr</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.directory.shared</groupId>
-          <artifactId>shared-ldap</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
@@ -186,11 +165,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.asn1</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.apache.directory.shared.ldap</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: directory/studio/branches/shared-trunk-merge/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/pom.xml?rev=1005022&r1=1005021&r2=1005022&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/pom.xml Wed Oct  6 13:20:10 2010
@@ -75,9 +75,11 @@
     <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.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>
@@ -209,22 +211,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 +242,12 @@
       <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>
+        <artifactId>org.apache.xml.commons.xmlapis</artifactId>
+        <version>${org.apache.xml.commons.xmlapis.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
@@ -1140,22 +1142,12 @@
       <!-- Apache Directory Shared -->
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-constants</artifactId>
+        <artifactId>shared-i18n</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>
@@ -1181,6 +1173,11 @@
         <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>



Mime
View raw message