directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r638220 - in /directory/sandbox/akarasulu/bigbang/installers: LAST_BIG_BANG_MERGE pom.xml
Date Tue, 18 Mar 2008 05:10:51 GMT
Author: akarasulu
Date: Mon Mar 17 22:10:50 2008
New Revision: 638220

URL: http://svn.apache.org/viewvc?rev=638220&view=rev
Log:
[MERGE] pulling in changes from the bigbang branch to minimize conflicts

Modified:
    directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE   (contents, props
changed)
    directory/sandbox/akarasulu/bigbang/installers/pom.xml

Modified: directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE?rev=638220&r1=638219&r2=638220&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE Mon Mar 17 22:10:50
2008
@@ -3,10 +3,17 @@
 
    https://svn.apache.org/repos/asf/directory/installers/branches/bigbang/
 
+$Rev$
+$Date$
+
 
 Sun Jan 20 12:02:09 EST 2008
 ----------------------------
 svn merge -r 604349:613609 https://svn.apache.org/repos/asf/directory/installers/branches/bigbang
.
 NOTHING CHANGED ...
 
+
+Tue Mar 18 01:02:23 EDT 2008
+----------------------------
+svn merge -r 613609:638217 https://svn.apache.org/repos/asf/directory/installers/branches/bigbang
.
 

Propchange: directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 17 22:10:50 2008
@@ -0,0 +1,2 @@
+Revision
+Date

Modified: directory/sandbox/akarasulu/bigbang/installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/pom.xml?rev=638220&r1=638219&r2=638220&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/installers/pom.xml Mon Mar 17 22:10:50 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>9-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.directory.installers</groupId>
@@ -110,19 +110,19 @@
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-asn1-codec</artifactId>
-        <version>0.9.8-SNAPSHOT</version>
+        <version>0.9.9-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap</artifactId>
-        <version>0.9.8-SNAPSHOT</version>
+        <version>0.9.9-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap-constants</artifactId>
-        <version>0.9.8-SNAPSHOT</version>
+        <version>0.9.9-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -134,13 +134,13 @@
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.6</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-filter-ssl</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.6</version>
       </dependency>
 
       <dependency>



Mime
View raw message