aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hugh...@apache.org
Subject svn commit: r1222293 - in /aries/branches/dec-2011-jndi-release/jndi: ./ jndi-bundle/pom.xml jndi-url/src/main/java/org/apache/aries/jndi/services/packageinfo
Date Thu, 22 Dec 2011 15:52:45 GMT
Author: hughesj
Date: Thu Dec 22 15:52:45 2011
New Revision: 1222293

URL: http://svn.apache.org/viewvc?rev=1222293&view=rev
Log:
Merging ARIES-803 into release branch

Modified:
    aries/branches/dec-2011-jndi-release/jndi/   (props changed)
    aries/branches/dec-2011-jndi-release/jndi/jndi-bundle/pom.xml
    aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/packageinfo

Propchange: aries/branches/dec-2011-jndi-release/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 15:52:45 2011
@@ -1 +1 @@
-/aries/trunk/jndi:1209408-1209629
+/aries/trunk/jndi:1209408-1222289

Modified: aries/branches/dec-2011-jndi-release/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/dec-2011-jndi-release/jndi/jndi-bundle/pom.xml?rev=1222293&r1=1222292&r2=1222293&view=diff
==============================================================================
--- aries/branches/dec-2011-jndi-release/jndi/jndi-bundle/pom.xml (original)
+++ aries/branches/dec-2011-jndi-release/jndi/jndi-bundle/pom.xml Thu Dec 22 15:52:45 2011
@@ -47,7 +47,7 @@
             org.apache.aries.jndi.spi
         </aries.osgi.export.pkg>
         <aries.osgi.import>
-            net.sf.cglib*;resolution:=optional,
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
             *
         </aries.osgi.import>
         <aries.osgi.private.pkg>

Modified: aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/packageinfo
URL: http://svn.apache.org/viewvc/aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/packageinfo?rev=1222293&r1=1222292&r2=1222293&view=diff
==============================================================================
--- aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/packageinfo
(original)
+++ aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/packageinfo
Thu Dec 22 15:52:45 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.3.0
+version 0.3.1



Mime
View raw message