directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1647393 - in /directory/shared/trunk: ./ dsml/engine/ dsml/parser/ integ-osgi/ integ-osgi/src/test/java/org/apache/directory/api/osgi/ ldap/extras/aci/ ldap/extras/trigger/ ldap/model/ ldap/schema/converter/
Date Mon, 22 Dec 2014 20:06:52 GMT
Author: seelmann
Date: Mon Dec 22 20:06:52 2014
New Revision: 1647393

URL: http://svn.apache.org/r1647393
Log:
Replace original antlr, dom4j, xpp3 artifacts with OSGi-ified versions provided by ServiceMix.

Modified:
    directory/shared/trunk/dsml/engine/pom.xml
    directory/shared/trunk/dsml/parser/pom.xml
    directory/shared/trunk/integ-osgi/pom.xml
    directory/shared/trunk/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java
    directory/shared/trunk/ldap/extras/aci/pom.xml
    directory/shared/trunk/ldap/extras/trigger/pom.xml
    directory/shared/trunk/ldap/model/pom.xml
    directory/shared/trunk/ldap/schema/converter/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/shared/trunk/dsml/engine/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/pom.xml (original)
+++ directory/shared/trunk/dsml/engine/pom.xml Mon Dec 22 20:06:52 2014
@@ -46,13 +46,13 @@
     </dependency>
     
     <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/shared/trunk/dsml/parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/pom.xml (original)
+++ directory/shared/trunk/dsml/parser/pom.xml Mon Dec 22 20:06:52 2014
@@ -53,13 +53,13 @@
     </dependency>
     
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/shared/trunk/integ-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ-osgi/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/integ-osgi/pom.xml (original)
+++ directory/shared/trunk/integ-osgi/pom.xml Mon Dec 22 20:06:52 2014
@@ -70,22 +70,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>org.antlr.antlr</artifactId>
-            <version>2.7.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>org.dom4j.dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>org.xpp3.xpp3</artifactId>
-            <version>1.1.4.c</version>
-        </dependency>
-
         <!-- Test and PAX dependencies -->
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

Modified: directory/shared/trunk/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java
(original)
+++ directory/shared/trunk/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java
Mon Dec 22 20:06:52 2014
@@ -34,6 +34,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -63,9 +64,9 @@ public abstract class ApiOsgiTestBase
     private static Set<String> SKIPS = new HashSet<String>();
     static
     {
-        SKIPS.add( "antlr-2.7.7.jar" );
-        SKIPS.add( "xpp3-1.1.4c.jar" );
-        SKIPS.add( "dom4j-1.6.1.jar" );
+        // SKIPS.add( "antlr-2.7.7.jar" );
+        // SKIPS.add( "xpp3-1.1.4c.jar" );
+        // SKIPS.add( "dom4j-1.6.1.jar" );
     }
 
 
@@ -86,6 +87,9 @@ public abstract class ApiOsgiTestBase
             }
         }
 
+        // shuffle dependencies, there mustn't be any dependency on order
+        Collections.shuffle( dependencies );
+
         return options(
             systemProperty( "org.ops4j.pax.logging.DefaultServiceLog.level" ).value( "WARN"
),
             systemProperty( "logback.configurationFile" ).value(

Modified: directory/shared/trunk/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/aci/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/aci/pom.xml Mon Dec 22 20:06:52 2014
@@ -50,11 +50,20 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>api-ldap-model</artifactId>
-    </dependency> 
+    </dependency>
 
+  <!-- The original antlr artifact is needed by the antlr-maven-plugin which 
+    checks for its existence within the classpath. Use scope provided to avoid 
+    propagation to dependent projects. Choosen artifact is a valid OSGi bundle 
+    repackaged by ServiceMix team, kudos to them. -->
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/shared/trunk/ldap/extras/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/trigger/pom.xml Mon Dec 22 20:06:52 2014
@@ -50,11 +50,20 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>api-ldap-model</artifactId>
-    </dependency> 
-    
+    </dependency>
+
+  <!-- The original antlr artifact is needed by the antlr-maven-plugin which 
+    checks for its existence within the classpath. Use scope provided to avoid 
+    propagation to dependent projects. Choosen artifact is a valid OSGi bundle 
+    repackaged by ServiceMix team, kudos to them. -->
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/shared/trunk/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/pom.xml (original)
+++ directory/shared/trunk/ldap/model/pom.xml Mon Dec 22 20:06:52 2014
@@ -61,12 +61,21 @@
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>
-    
+
+  <!-- The original antlr artifact is needed by the antlr-maven-plugin which 
+    checks for its existence within the classpath. Use scope provided to avoid 
+    propagation to dependent projects. Choosen artifact is a valid OSGi bundle 
+    repackaged by ServiceMix team, kudos to them. -->
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
+      <scope>provided</scope>
     </dependency>
-    
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

Modified: directory/shared/trunk/ldap/schema/converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/converter/pom.xml Mon Dec 22 20:06:52 2014
@@ -56,10 +56,19 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>api-util</artifactId>
     </dependency>
-    
+
+  <!-- The original antlr artifact is needed by the antlr-maven-plugin which 
+    checks for its existence within the classpath. Use scope provided to avoid 
+    propagation to dependent projects. Choosen artifact is a valid OSGi bundle 
+    repackaged by ServiceMix team, kudos to them. -->
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1647393&r1=1647392&r2=1647393&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Mon Dec 22 20:06:52 2014
@@ -677,11 +677,23 @@
         <artifactId>antlr</artifactId>
         <version>${antlr.version}</version>
       </dependency>
-      
+
+      <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
+        <version>${antlr.version}_5</version>
+      </dependency>
+
       <dependency>
-        <groupId>dom4j</groupId>
-        <artifactId>dom4j</artifactId>
-        <version>${dom4j.version}</version>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+        <version>${dom4j.version}_5</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <version>${xpp3.version}_6</version>
       </dependency>
 
       <dependency>
@@ -701,12 +713,6 @@
         <artifactId>xml-apis</artifactId>
         <version>${xml.apis.version}</version>
       </dependency>
-      
-      <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3</artifactId>
-        <version>${xpp3.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 



Mime
View raw message