You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2014/12/20 19:42:38 UTC
svn commit: r1647032 - in /directory/shared/trunk: integ-osgi/pom.xml pom.xml
Author: seelmann
Date: Sat Dec 20 18:42:37 2014
New Revision: 1647032
URL: http://svn.apache.org/r1647032
Log:
Add integ-osgi module, establish dependency management, downgrade to pax 3.5.0 for Java6 compatibility
Modified:
directory/shared/trunk/integ-osgi/pom.xml
directory/shared/trunk/pom.xml
Modified: directory/shared/trunk/integ-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ-osgi/pom.xml?rev=1647032&r1=1647031&r2=1647032&view=diff
==============================================================================
--- directory/shared/trunk/integ-osgi/pom.xml (original)
+++ directory/shared/trunk/integ-osgi/pom.xml Sat Dec 20 18:42:37 2014
@@ -21,60 +21,47 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory.osgitesting</groupId>
- <artifactId>osgitesting-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-parent</artifactId>
+ <version>1.0.0-M27-SNAPSHOT</version>
</parent>
- <artifactId>api-paxexam-osgi-test</artifactId>
- <properties>
- <logback.version>1.1.2</logback.version>
- <slf4j.api.version>1.7.7</slf4j.api.version>
- <exam.version>4.4.0</exam.version>
- <url.version>2.2.0</url.version>
- <felix.version>4.4.1</felix.version>
- </properties>
+ <artifactId>api-integ-osgi</artifactId>
+ <name>Apache Directory API OSGi Integration Tests</name>
<dependencies>
+ <!-- Bundles under test -->
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-client-api</artifactId>
- <version>${api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-net-mina</artifactId>
- <version>${api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-schema-converter</artifactId>
- <version>${api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-aci</artifactId>
- <version>${api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-util</artifactId>
- <version>${api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-sp</artifactId>
- <version>${api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-trigger</artifactId>
- <version>${api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-dsml-engine</artifactId>
- <version>${api.version}</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
@@ -98,37 +85,31 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId>
- <version>${exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
<scope>test</scope>
</dependency>
<!-- <dependency> -->
@@ -139,16 +120,6 @@
<!-- </dependency> -->
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.api.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
<plugin>
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1647032&r1=1647031&r2=1647032&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sat Dec 20 18:42:37 2014
@@ -56,9 +56,9 @@
<slf4j.log4j12.version>1.7.7</slf4j.log4j12.version>
<xml.apis.version>2.0.2</xml.apis.version>
<xpp3.version>1.1.4c</xpp3.version>
- <pax-exam.version>4.3.0</pax-exam.version>
- <pax-exam-container-default.version>1.2.4</pax-exam-container-default.version>
- <pax-exam-junit.version>1.2.4</pax-exam-junit.version>
+ <pax-exam.version>3.5.0</pax-exam.version>
+ <pax-url.version>2.2.0</pax-url.version>
+ <logback.version>1.1.2</logback.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
</properties>
@@ -82,6 +82,7 @@
<module>ldap</module>
<module>dsml</module>
<module>integ</module>
+ <module>integ-osgi</module>
<module>distribution</module>
</modules>
@@ -620,24 +621,33 @@
</dependency>
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <version>${pax-exam.version}</version>
- <scope>test</scope>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-forked</artifactId>
+ <version>${pax-exam.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${pax-exam.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${pax-exam.version}</version>
+ </dependency>
+
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <version>${pax-exam-junit.version}</version>
- <scope>test</scope>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${pax-url.version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <version>${pax-exam-container-default.version}</version>
- <scope>test</scope>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
</dependency>
<!-- Logging dependencies -->