directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1071198 - in /directory/shared/branches/m1: ldap-codec/pom.xml pom.xml
Date Wed, 16 Feb 2011 10:42:45 GMT
Author: pamarcelot
Date: Wed Feb 16 10:42:44 2011
New Revision: 1071198

URL: http://svn.apache.org/viewvc?rev=1071198&view=rev
Log:
Removed 'org.apache.felix.framework' dependency on 'shared-ldap-codec' module. Replaced by
a more generic provided dependency on 'org.osgi'.

Modified:
    directory/shared/branches/m1/ldap-codec/pom.xml
    directory/shared/branches/m1/pom.xml

Modified: directory/shared/branches/m1/ldap-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/pom.xml?rev=1071198&r1=1071197&r2=1071198&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/pom.xml (original)
+++ directory/shared/branches/m1/ldap-codec/pom.xml Wed Feb 16 10:42:44 2011
@@ -68,11 +68,6 @@
     </dependency>
     
     <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
@@ -81,6 +76,12 @@
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -99,25 +100,6 @@
       </plugin>
 
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <configuration>
-          <systemPropertyVariables>
-            <workingDirectory>${basedir}/target</workingDirectory>
-            <felix.cache.rootdir>
-              ${project.build.directory}
-            </felix.cache.rootdir>
-            <felix.cache.locking>
-              false
-            </felix.cache.locking>
-            <org.osgi.framework.storage>
-              ${project.build.directory}/osgi-cache
-            </org.osgi.framework.storage>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>

Modified: directory/shared/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/pom.xml?rev=1071198&r1=1071197&r2=1071198&view=diff
==============================================================================
--- directory/shared/branches/m1/pom.xml (original)
+++ directory/shared/branches/m1/pom.xml Wed Feb 16 10:42:44 2011
@@ -51,8 +51,9 @@
     <junit.version>4.8.2</junit.version>
     <log4j.version>1.2.16</log4j.version>
     <mina.core.version>2.0.2</mina.core.version>
+    <org.osgi.version>3.0.0</org.osgi.version>
+    <org.osgi.core.version>4.2.0</org.osgi.core.version>
     <org.apache.felix.version>3.0.2</org.apache.felix.version>
-    <org.osgi.version>4.2.0</org.osgi.version>
     <slf4j.api.version>1.6.1</slf4j.api.version>
     <slf4j.log4j12.version>1.6.1</slf4j.log4j12.version>
     <xml.apis.version>2.0.2</xml.apis.version>
@@ -498,11 +499,17 @@
 
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
+        <artifactId>org.osgi</artifactId>
         <version>${org.osgi.version}</version>
       </dependency>
 
       <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>${org.osgi.core.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.framework</artifactId>
         <version>${org.apache.felix.version}</version>



Mime
View raw message