directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1336652 - in /directory: apacheds/branches/apacheds-osgi/pom.xml shared/branches/shared-osgi/pom.xml
Date Thu, 10 May 2012 12:54:32 GMT
Author: gokturk
Date: Thu May 10 12:54:32 2012
New Revision: 1336652

URL: http://svn.apache.org/viewvc?rev=1336652&view=rev
Log:
* IPojo and Maven related dependencyManagement declarations

Modified:
    directory/apacheds/branches/apacheds-osgi/pom.xml
    directory/shared/branches/shared-osgi/pom.xml

Modified: directory/apacheds/branches/apacheds-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/pom.xml?rev=1336652&r1=1336651&r2=1336652&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/pom.xml Thu May 10 12:54:32 2012
@@ -44,7 +44,7 @@
     <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/apacheds/gen-docs/${project.version}/</distMgmtSiteUrl>
 
     <!-- Set versions for depending projects -->
-    <org.apache.directory.shared.version>1.0.0-M12</org.apache.directory.shared.version>
+    <org.apache.directory.shared.version>1.0.0-M13</org.apache.directory.shared.version>
     <org.apache.directory.checkstyle-configuration.version>0.1</org.apache.directory.checkstyle-configuration.version>
     <org.apache.directory.junit.junit-addons.version>0.1</org.apache.directory.junit.junit-addons.version>
     <org.apache.directory.jdbm.version>2.0.0-M1</org.apache.directory.jdbm.version>
@@ -85,6 +85,9 @@
     <velocity.version>1.7-beta1</velocity.version>
     <wrapper.version>3.2.3</wrapper.version>
     <xercesImpl.version>2.10.0</xercesImpl.version>
+    <ipojo.version>1.9.0-SNAPSHOT</ipojo.version>
+    <ipojo.annotations.version>1.8.0</ipojo.annotations.version>
+    <bnd.ipojo.version>1.8.4</bnd.ipojo.version>
   </properties>
 
   <url>http://directory.apache.org/apacheds/1.5</url>
@@ -150,10 +153,10 @@
     <module>installers-maven-plugin</module>
     <module>installers</module>
     <!--Uncomment to build OSGi-related bundles-->
-    <!--<module>apache-felix</module>-->
-    <!--<module>dependencies</module>-->
-    <!--<module>service-osgi</module>-->
-    <!--<module>component-hub</module>-->
+    <module>apache-felix</module>
+    <module>dependencies</module>
+    <module>service-osgi</module>
+    <module>hub</module>
   </modules>
 
   <build>
@@ -894,6 +897,36 @@
         <version>${project.version}</version>
       </dependency>
       
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-hub-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-hub-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-hub-connector-ipojo-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-hub-connector-ipojo-handler</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-hub-connector-ds</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <!-- Shared dependencies -->
       
       <dependency>
@@ -1004,7 +1037,13 @@
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
-      <!-- Mina dependencies -->
+      <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ipojo-manager</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      
+     <!-- Mina dependencies -->
       
       <dependency>
         <groupId>org.apache.mina</groupId>
@@ -1223,6 +1262,18 @@
         <artifactId>ehcache-core</artifactId>
         <version>${ehcache.version}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.ipojo</artifactId>
+        <version>${ipojo.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+        <version>${ipojo.annotations.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

Modified: directory/shared/branches/shared-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/pom.xml?rev=1336652&r1=1336651&r2=1336652&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/pom.xml (original)
+++ directory/shared/branches/shared-osgi/pom.xml Thu May 10 12:54:32 2012
@@ -61,6 +61,10 @@
     <pax-exam-container-default.version>1.2.4</pax-exam-container-default.version>
     <pax-exam-junit.version>1.2.4</pax-exam-junit.version>
     <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
+    <maven.ipojo.version>1.8.0</maven.ipojo.version>
+    <bnd.ipojo.version>1.8.4</bnd.ipojo.version>
+    <ipojo.version>1.9.0-SNAPSHOT</ipojo.version>
+    <ipojo.annotations.version>1.8.0</ipojo.annotations.version>
   </properties>
   
   <distributionManagement>
@@ -84,6 +88,7 @@
     <module>dsml</module>
     <module>integ</module>
     <module>distribution</module>
+    <module>ipojo-manager</module>
   </modules>
 
   <build>
@@ -532,7 +537,13 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- Mina dependencies -->
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>shared-ipojo-manager</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+     <!-- Mina dependencies -->
 
       <dependency>
         <groupId>org.apache.mina</groupId>
@@ -672,6 +683,18 @@
         <artifactId>xpp3</artifactId>
         <version>${xpp3.version}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.ipojo</artifactId>
+        <version>${ipojo.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+        <version>${ipojo.annotations.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 



Mime
View raw message