Replace original antlr, dom4j, xpp3 artifacts with OSGi-ified versions provided by ServiceMix.
git-svn-id: https://svn.apache.org/repos/asf/directory/shared/trunk@1647393 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
index 6cbb8de..5915a0f 100644
--- a/dsml/engine/pom.xml
+++ b/dsml/engine/pom.xml
@@ -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>
diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
index 2d3bcf9..a9e9055 100644
--- a/dsml/parser/pom.xml
+++ b/dsml/parser/pom.xml
@@ -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>
diff --git a/integ-osgi/pom.xml b/integ-osgi/pom.xml
index b098677..a87ba03 100644
--- a/integ-osgi/pom.xml
+++ b/integ-osgi/pom.xml
@@ -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>
diff --git a/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java b/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java
index 0f4ad5a..cf4551b 100644
--- a/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java
+++ b/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiOsgiTestBase.java
@@ -34,6 +34,7 @@
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 @@
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 @@
}
}
+ // 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(
diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
index f51e9e0..981f0d5 100644
--- a/ldap/extras/aci/pom.xml
+++ b/ldap/extras/aci/pom.xml
@@ -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>
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index ce15705..5f39a04 100644
--- a/ldap/extras/trigger/pom.xml
+++ b/ldap/extras/trigger/pom.xml
@@ -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>
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index 69f3235..8bd4b22 100644
--- a/ldap/model/pom.xml
+++ b/ldap/model/pom.xml
@@ -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>
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index c0b0461..57979ad 100644
--- a/ldap/schema/converter/pom.xml
+++ b/ldap/schema/converter/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index c7c5867..b2a0587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -677,11 +677,23 @@
<artifactId>antlr</artifactId>
<version>${antlr.version}</version>
</dependency>
-
+
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
+ <version>${antlr.version}_5</version>
+ </dependency>
+
+ <dependency>
+ <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>
