aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hugh...@apache.org
Subject svn commit: r1186089 - in /aries/branches/oct-2011-release: ./ application/application-api/ application/application-api/src/main/java/org/apache/aries/application/management/ application/application-api/src/main/java/org/apache/aries/application/manage...
Date Wed, 19 Oct 2011 11:00:44 GMT
Author: hughesj
Date: Wed Oct 19 11:00:42 2011
New Revision: 1186089

URL: http://svn.apache.org/viewvc?rev=1186089&view=rev
Log:
Moving branch up to trunk@1186088

Modified:
    aries/branches/oct-2011-release/   (props changed)
    aries/branches/oct-2011-release/application/application-api/pom.xml
    aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java   (props changed)
    aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java   (props changed)
    aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java   (props changed)
    aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java   (props changed)
    aries/branches/oct-2011-release/application/application-bundle/pom.xml
    aries/branches/oct-2011-release/application/application-converters/pom.xml
    aries/branches/oct-2011-release/application/application-default-local-platform/pom.xml
    aries/branches/oct-2011-release/application/application-deployment-management/pom.xml
    aries/branches/oct-2011-release/application/application-install/pom.xml
    aries/branches/oct-2011-release/application/application-itest-interface/pom.xml
    aries/branches/oct-2011-release/application/application-itests/pom.xml
    aries/branches/oct-2011-release/application/application-management/pom.xml
    aries/branches/oct-2011-release/application/application-modeller-common-test/   (props changed)
    aries/branches/oct-2011-release/application/application-modeller-standalone/   (props changed)
    aries/branches/oct-2011-release/application/application-noop-resolver/pom.xml
    aries/branches/oct-2011-release/application/application-obr-resolver/pom.xml
    aries/branches/oct-2011-release/application/application-runtime-framework-management/pom.xml
    aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java
    aries/branches/oct-2011-release/application/application-runtime-framework/pom.xml
    aries/branches/oct-2011-release/application/application-runtime-isolated/pom.xml
    aries/branches/oct-2011-release/application/application-runtime-repository/pom.xml
    aries/branches/oct-2011-release/application/application-runtime/pom.xml
    aries/branches/oct-2011-release/application/application-tooling-repository-generator/pom.xml
    aries/branches/oct-2011-release/application/application-tooling-repository-generator/src/main/assembly/createzip.xml
    aries/branches/oct-2011-release/application/application-utils/pom.xml
    aries/branches/oct-2011-release/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java   (props changed)
    aries/branches/oct-2011-release/blueprint/   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-annotation-api/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-annotation-impl/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-api/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-cm/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/resources/org/apache/aries/   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/resources/org/apache/aries/   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-itests/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-itests/src/test/java/org/apache/aries/   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-parser/   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-parser/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-sample/   (props changed)
    aries/branches/oct-2011-release/blueprint/blueprint-sample/src/main/java/org/apache/aries/   (props changed)
    aries/branches/oct-2011-release/eba-maven-plugin/pom.xml
    aries/branches/oct-2011-release/ejb/ejb-modeller/   (props changed)
    aries/branches/oct-2011-release/ejb/ejb-modeller-itest/   (props changed)
    aries/branches/oct-2011-release/ejb/ejb-modeller-itest/pom.xml
    aries/branches/oct-2011-release/ejb/openejb-extender/   (props changed)
    aries/branches/oct-2011-release/ejb/openejb-extender-itest/   (props changed)
    aries/branches/oct-2011-release/ejb/openejb-extender-itest/pom.xml
    aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-itests/pom.xml
    aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java   (props changed)
    aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/   (props changed)
    aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/   (props changed)
    aries/branches/oct-2011-release/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java   (props changed)
    aries/branches/oct-2011-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/   (props changed)
    aries/branches/oct-2011-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi/   (props changed)
    aries/branches/oct-2011-release/jpa/jpa-container-context/pom.xml
    aries/branches/oct-2011-release/jpa/jpa-container-eclipselink-adapter/pom.xml
    aries/branches/oct-2011-release/jpa/jpa-container-itest/pom.xml
    aries/branches/oct-2011-release/jpa/jpa-container/pom.xml
    aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/   (props changed)
    aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/   (props changed)
    aries/branches/oct-2011-release/transaction/   (props changed)
    aries/branches/oct-2011-release/util/src/test/java/org/apache/aries/util/VersionRangeTest.java   (props changed)

Propchange: aries/branches/oct-2011-release/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -1 +1 @@
-/aries/trunk:1185252-1185271
+/aries/trunk:1185252-1186088

Modified: aries/branches/oct-2011-release/application/application-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-api/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-api/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-api/pom.xml Wed Oct 19 11:00:42 2011
@@ -51,7 +51,9 @@
             org.apache.aries.application.modelling.utils;
         </aries.osgi.export.pkg>
         <aries.osgi.private.pkg />
-        <aries.osgi.import.pkg> *
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
         </aries.osgi.import.pkg>
         
         

Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java:1185252-1186088

Modified: aries/branches/oct-2011-release/application/application-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-bundle/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-bundle/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-bundle/pom.xml Wed Oct 19 11:00:42 2011
@@ -48,7 +48,7 @@
         <aries.osgi.import>
             org.osgi.framework;version="[1.5,2)",
             org.slf4j;version="[1.5,2)",
-            org.apache.aries.application*;version="[0.3,0.4)",
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
             *
         </aries.osgi.import>
         <aries.osgi.export.pkg>

Modified: aries/branches/oct-2011-release/application/application-converters/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-converters/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-converters/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-converters/pom.xml Wed Oct 19 11:00:42 2011
@@ -43,6 +43,10 @@
         <aries.osgi.private.pkg>
             org.apache.aries.application.converters;
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
 
     <dependencies>

Modified: aries/branches/oct-2011-release/application/application-default-local-platform/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-default-local-platform/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-default-local-platform/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-default-local-platform/pom.xml Wed Oct 19 11:00:42 2011
@@ -44,6 +44,10 @@
         <aries.osgi.private.pkg>
             org.apache.aries.application.local.platform.impl
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     <dependencies>
         <dependency>

Modified: aries/branches/oct-2011-release/application/application-deployment-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-deployment-management/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-deployment-management/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-deployment-management/pom.xml Wed Oct 19 11:00:42 2011
@@ -42,6 +42,10 @@
 
     <properties>
         <aries.osgi.export.pkg/>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
 
     <dependencies>

Modified: aries/branches/oct-2011-release/application/application-install/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-install/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-install/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-install/pom.xml Wed Oct 19 11:00:42 2011
@@ -42,6 +42,13 @@
          <url>http://svn.apache.org/viewvc/aries/trunk/application/application-install</url>
      </scm>
     
+    <properties>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
+    </properties>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.felix</groupId>

Modified: aries/branches/oct-2011-release/application/application-itest-interface/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-itest-interface/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-itest-interface/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-itest-interface/pom.xml Wed Oct 19 11:00:42 2011
@@ -48,8 +48,10 @@
 		</aries.osgi.export.pkg>
 
 		<aries.osgi.private.pkg />
-		<aries.osgi.import.pkg>*
-		</aries.osgi.import.pkg>
+		<aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
 	</properties>
 
 </project>

Modified: aries/branches/oct-2011-release/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-itests/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-itests/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-itests/pom.xml Wed Oct 19 11:00:42 2011
@@ -65,7 +65,7 @@
         <dependency>
 			<groupId>org.apache.aries</groupId>
 			<artifactId>org.apache.aries.util</artifactId>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -77,7 +77,7 @@
 		<dependency>
 			<groupId>org.apache.aries.proxy</groupId>
 			<artifactId>org.apache.aries.proxy</artifactId>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -211,7 +211,7 @@
         <dependency>
           <groupId>org.apache.aries.testsupport</groupId>
           <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>0.4</version>
+          <version>0.4-SNAPSHOT</version>
           <scope>test</scope>
         </dependency>
         <dependency>

Modified: aries/branches/oct-2011-release/application/application-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-management/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-management/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-management/pom.xml Wed Oct 19 11:00:42 2011
@@ -48,6 +48,10 @@
 			org.apache.aries.application.management.internal;
 			org.apache.aries.application.management.repository
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
 
     <dependencies>

Propchange: aries/branches/oct-2011-release/application/application-modeller-common-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 19 11:00:42 2011
@@ -1 +1,4 @@
 target
+.settings
+.classpath
+.project

Propchange: aries/branches/oct-2011-release/application/application-modeller-standalone/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 19 11:00:42 2011
@@ -1 +1,4 @@
 target
+.settings
+.classpath
+.project

Modified: aries/branches/oct-2011-release/application/application-noop-resolver/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-noop-resolver/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-noop-resolver/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-noop-resolver/pom.xml Wed Oct 19 11:00:42 2011
@@ -44,6 +44,10 @@
         <aries.osgi.private.pkg>
             org.apache.aries.application.resolver.noop.impl
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     <dependencies>
         <dependency>

Modified: aries/branches/oct-2011-release/application/application-obr-resolver/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-obr-resolver/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-obr-resolver/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-obr-resolver/pom.xml Wed Oct 19 11:00:42 2011
@@ -48,6 +48,10 @@
             org.apache.aries.application.resolver.obr.impl;
             org.apache.aries.application.resolver.internal;
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     <dependencies>
         <dependency>

Modified: aries/branches/oct-2011-release/application/application-runtime-framework-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-runtime-framework-management/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-runtime-framework-management/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-runtime-framework-management/pom.xml Wed Oct 19 11:00:42 2011
@@ -47,6 +47,10 @@
         <aries.osgi.private.pkg>
 			org.apache.aries.application.runtime.framework.management
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     
     <dependencies>

Modified: aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java (original)
+++ aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java Wed Oct 19 11:00:42 2011
@@ -146,8 +146,11 @@ public class SharedBundleFramework
       
       compositeManifest.put(Constants.BUNDLE_SYMBOLICNAME, BundleFramework.SHARED_BUNDLE_FRAMEWORK);
 
-      // Add blueprint so that it is available to applications.
-      compositeManifest.put(Constants.IMPORT_PACKAGE, RUNTIME_PACKAGES);
+      // Add blueprint so that it is available to applications, unless configuration has already been provided.
+      String existingImports = (String) compositeManifest.get(Constants.IMPORT_PACKAGE);
+      if (existingImports == null){
+        compositeManifest.put(Constants.IMPORT_PACKAGE, RUNTIME_PACKAGES);
+      }
       
       return compositeManifest;
     }

Modified: aries/branches/oct-2011-release/application/application-runtime-framework/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-runtime-framework/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-runtime-framework/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-runtime-framework/pom.xml Wed Oct 19 11:00:42 2011
@@ -51,6 +51,10 @@
             org.apache.aries.application.runtime.framework;
 			org.apache.aries.application.runtime.framework.config
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     
     <dependencies>

Modified: aries/branches/oct-2011-release/application/application-runtime-isolated/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-runtime-isolated/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-runtime-isolated/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-runtime-isolated/pom.xml Wed Oct 19 11:00:42 2011
@@ -47,6 +47,10 @@
         <aries.osgi.private.pkg>
 			org.apache.aries.application.runtime.isolated.impl
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     
     <dependencies>

Modified: aries/branches/oct-2011-release/application/application-runtime-repository/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-runtime-repository/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-runtime-repository/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-runtime-repository/pom.xml Wed Oct 19 11:00:42 2011
@@ -47,6 +47,10 @@
         <aries.osgi.private.pkg>
 			org.apache.aries.application.runtime.repository
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     
     <dependencies>

Modified: aries/branches/oct-2011-release/application/application-runtime/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-runtime/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-runtime/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-runtime/pom.xml Wed Oct 19 11:00:42 2011
@@ -44,6 +44,10 @@
 
      <properties>
      <aries.osgi.export.pkg />
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
      </properties>
 
     <dependencies>

Modified: aries/branches/oct-2011-release/application/application-tooling-repository-generator/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-tooling-repository-generator/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-tooling-repository-generator/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-tooling-repository-generator/pom.xml Wed Oct 19 11:00:42 2011
@@ -42,6 +42,10 @@
         <aries.osgi.private.pkg>
             org.apache.aries.application.repository.generator
         </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
     <dependencies>
         <dependency>
@@ -204,7 +208,7 @@
             <!--  assembly a zip -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.2.1</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/main/assembly/createzip.xml</descriptor>

Modified: aries/branches/oct-2011-release/application/application-tooling-repository-generator/src/main/assembly/createzip.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-tooling-repository-generator/src/main/assembly/createzip.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-tooling-repository-generator/src/main/assembly/createzip.xml (original)
+++ aries/branches/oct-2011-release/application/application-tooling-repository-generator/src/main/assembly/createzip.xml Wed Oct 19 11:00:42 2011
@@ -7,7 +7,6 @@
   </formats>
   <fileSets>
     <fileSet>
-     <directory>/</directory>
       <outputDirectory>META-INF/</outputDirectory>
       <includes>
         <include>LICENSE</include>

Modified: aries/branches/oct-2011-release/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-utils/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-utils/pom.xml (original)
+++ aries/branches/oct-2011-release/application/application-utils/pom.xml Wed Oct 19 11:00:42 2011
@@ -51,10 +51,11 @@
             org.apache.aries.application.utils.service;
             org.apache.aries.application.utils.runtime            
         </aries.osgi.export.pkg>
-        <aries.osgi.import>
+        <aries.osgi.import.pkg>
             org.osgi.service.blueprint;resolution:=optional,
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
             *
-        </aries.osgi.import>
+        </aries.osgi.import.pkg>
         <aries.osgi.private.pkg>
             org.apache.aries.application.impl;
             org.apache.aries.application.utils.internal;

Propchange: aries/branches/oct-2011-release/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/blueprint/
            ('svn:mergeinfo' removed)

Modified: aries/branches/oct-2011-release/blueprint/blueprint-annotation-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-annotation-api/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-annotation-api/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-annotation-api/pom.xml Wed Oct 19 11:00:42 2011
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5</version>
+        <version>0.5-SNAPSHOT</version>
         <relativePath />
     </parent>
 
@@ -27,7 +27,7 @@
     <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Blueprint Annotation API</name>
-    <version>0.3.2</version>
+    <version>0.3.2-SNAPSHOT</version>
     <description>
         This bundle contains the blueprint annotation api and the corresponding xml schema.
     </description>

Modified: aries/branches/oct-2011-release/blueprint/blueprint-annotation-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-annotation-impl/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-annotation-impl/pom.xml Wed Oct 19 11:00:42 2011
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.aries</groupId>
     <artifactId>java6-parent</artifactId>
-    <version>0.5</version>
+    <version>0.5-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -29,7 +29,7 @@
   <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Aries Blueprint Annotation Impl</name>
-  <version>0.3.2</version>
+  <version>0.3.2-SNAPSHOT</version>
   <description>
       This bundle contains an implementation of Blueprint annotation support 
   </description>
@@ -72,7 +72,7 @@
       <dependency>
           <groupId>org.apache.aries</groupId>
           <artifactId>org.apache.aries.util</artifactId>
-          <version>0.4</version>
+          <version>0.4-SNAPSHOT</version>
       </dependency>
       <dependency>
           <groupId>org.osgi</groupId>

Modified: aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest/pom.xml Wed Oct 19 11:00:42 2011
@@ -61,7 +61,7 @@
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>

Modified: aries/branches/oct-2011-release/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-api/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-api/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-api/pom.xml Wed Oct 19 11:00:42 2011
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5</version>
+        <version>0.5-SNAPSHOT</version>
         <relativePath />
     </parent>
 

Modified: aries/branches/oct-2011-release/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-cm/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-cm/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-cm/pom.xml Wed Oct 19 11:00:42 2011
@@ -21,7 +21,7 @@
  <parent>
     <groupId>org.apache.aries</groupId>
      <artifactId>java5-parent</artifactId>
-     <version>0.5</version>
+     <version>0.5-SNAPSHOT</version>
      <relativePath />
   </parent>
 

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries:1185252-1186088

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
            ('svn:mergeinfo' removed)

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries:1185252-1186088

Modified: aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml Wed Oct 19 11:00:42 2011
@@ -21,7 +21,7 @@
   <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5</version>
+        <version>0.5-SNAPSHOT</version>
         <relativePath />
   </parent>
 
@@ -107,7 +107,7 @@
       <dependency>
           <groupId>org.apache.aries</groupId>
           <artifactId>org.apache.aries.util</artifactId>
-          <version>0.4</version>
+          <version>0.4-SNAPSHOT</version>
       </dependency>
       <dependency>
           <groupId>org.osgi</groupId>

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries:1185252-1186088

Modified: aries/branches/oct-2011-release/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-itests/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-itests/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-itests/pom.xml Wed Oct 19 11:00:42 2011
@@ -72,7 +72,7 @@
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-itests/src/test/java/org/apache/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries:1185252-1186088

Modified: aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator/pom.xml Wed Oct 19 11:00:42 2011
@@ -21,7 +21,7 @@
   <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5</version>
+        <version>0.5-SNAPSHOT</version>
         <relativePath />
   </parent>
 

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-parser/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 19 11:00:42 2011
@@ -1 +1,4 @@
 target
+.settings
+.classpath
+.project

Modified: aries/branches/oct-2011-release/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-parser/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-parser/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-parser/pom.xml Wed Oct 19 11:00:42 2011
@@ -21,7 +21,7 @@
   <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5</version>
+        <version>0.5-SNAPSHOT</version>
         <relativePath />
   </parent>
 
@@ -29,7 +29,7 @@
   <artifactId>blueprint-parser</artifactId>
   <packaging>jar</packaging>
   <name>Apache Aries Blueprint Parser</name>
-  <version>0.4</version>
+  <version>0.4-SNAPSHOT</version>
   <description>
       This bundle contains the blueprint parser in a plain jar.
   </description>

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-sample/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/blueprint/blueprint-sample:1185252-1186088

Propchange: aries/branches/oct-2011-release/blueprint/blueprint-sample/src/main/java/org/apache/aries/
            ('svn:mergeinfo' removed)

Modified: aries/branches/oct-2011-release/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/eba-maven-plugin/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/eba-maven-plugin/pom.xml (original)
+++ aries/branches/oct-2011-release/eba-maven-plugin/pom.xml Wed Oct 19 11:00:42 2011
@@ -25,7 +25,7 @@ under the License.
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5</version>
+        <version>0.5-SNAPSHOT</version>
         <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
     </parent>
     

Propchange: aries/branches/oct-2011-release/ejb/ejb-modeller/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 19 11:00:42 2011
@@ -1 +1,4 @@
 target
+.settings
+.classpath
+.project

Propchange: aries/branches/oct-2011-release/ejb/ejb-modeller-itest/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 19 11:00:42 2011
@@ -1 +1,4 @@
 target
+.settings
+.classpath
+.project

Modified: aries/branches/oct-2011-release/ejb/ejb-modeller-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/ejb/ejb-modeller-itest/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/ejb/ejb-modeller-itest/pom.xml (original)
+++ aries/branches/oct-2011-release/ejb/ejb-modeller-itest/pom.xml Wed Oct 19 11:00:42 2011
@@ -112,7 +112,7 @@
         <dependency>
           <groupId>org.apache.aries.testsupport</groupId>
           <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>0.3.1-SNAPSHOT</version>
+          <version>0.4-SNAPSHOT</version>
           <scope>test</scope>
         </dependency>        
         <dependency>

Propchange: aries/branches/oct-2011-release/ejb/openejb-extender/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 19 11:00:42 2011
@@ -1 +1,4 @@
 target
+.settings
+.classpath
+.project

Propchange: aries/branches/oct-2011-release/ejb/openejb-extender-itest/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 19 11:00:42 2011
@@ -1 +1,4 @@
 target
+.settings
+.classpath
+.project

Modified: aries/branches/oct-2011-release/ejb/openejb-extender-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/ejb/openejb-extender-itest/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/ejb/openejb-extender-itest/pom.xml (original)
+++ aries/branches/oct-2011-release/ejb/openejb-extender-itest/pom.xml Wed Oct 19 11:00:42 2011
@@ -124,7 +124,7 @@
         <dependency>
           <groupId>org.apache.aries.testsupport</groupId>
           <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>0.3.1-SNAPSHOT</version>
+          <version>0.4-SNAPSHOT</version>
           <scope>test</scope>
         </dependency>        
         <dependency>

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java:1185252-1186088

Modified: aries/branches/oct-2011-release/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/jmx/jmx-itests/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/jmx/jmx-itests/pom.xml (original)
+++ aries/branches/oct-2011-release/jmx/jmx-itests/pom.xml Wed Oct 19 11:00:42 2011
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Propchange: aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework:1185252-1186088

Propchange: aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi:1185252-1186088

Propchange: aries/branches/oct-2011-release/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java:1185252-1186088

Propchange: aries/branches/oct-2011-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi:1185252-1186088

Propchange: aries/branches/oct-2011-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi:1185252-1186088

Modified: aries/branches/oct-2011-release/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/jpa/jpa-container-context/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/jpa/jpa-container-context/pom.xml (original)
+++ aries/branches/oct-2011-release/jpa/jpa-container-context/pom.xml Wed Oct 19 11:00:42 2011
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/branches/oct-2011-release/jpa/jpa-container-eclipselink-adapter/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/jpa/jpa-container-eclipselink-adapter/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/jpa/jpa-container-eclipselink-adapter/pom.xml (original)
+++ aries/branches/oct-2011-release/jpa/jpa-container-eclipselink-adapter/pom.xml Wed Oct 19 11:00:42 2011
@@ -82,7 +82,7 @@
     <dependency>
     	<groupId>org.apache.aries</groupId>
     	<artifactId>org.apache.aries.util</artifactId>
-    	<version>0.4</version>
+    	<version>0.4-SNAPSHOT</version>
     	<scope>provided</scope>
     </dependency>
   </dependencies>

Modified: aries/branches/oct-2011-release/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/jpa/jpa-container-itest/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/jpa/jpa-container-itest/pom.xml (original)
+++ aries/branches/oct-2011-release/jpa/jpa-container-itest/pom.xml Wed Oct 19 11:00:42 2011
@@ -85,19 +85,19 @@
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy.api</artifactId>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -312,7 +312,7 @@
         <dependency>
           <groupId>org.apache.aries.testsupport</groupId>
           <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>0.4</version>
+          <version>0.4-SNAPSHOT</version>
           <scope>test</scope>
         </dependency>        
         <dependency>

Modified: aries/branches/oct-2011-release/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/jpa/jpa-container/pom.xml?rev=1186089&r1=1186088&r2=1186089&view=diff
==============================================================================
--- aries/branches/oct-2011-release/jpa/jpa-container/pom.xml (original)
+++ aries/branches/oct-2011-release/jpa/jpa-container/pom.xml Wed Oct 19 11:00:42 2011
@@ -95,7 +95,7 @@
         <dependency>
             <artifactId>org.apache.aries.util</artifactId>
             <groupId>org.apache.aries</groupId>
-            <version>0.4</version>
+            <version>0.4-SNAPSHOT</version>
             <scope>provided</scope>
             </dependency>
         <dependency>

Propchange: aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks:1185252-1186088

Propchange: aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest:1185252-1186088

Propchange: aries/branches/oct-2011-release/transaction/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/transaction:1185252-1186088

Propchange: aries/branches/oct-2011-release/util/src/test/java/org/apache/aries/util/VersionRangeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 11:00:42 2011
@@ -0,0 +1 @@
+/aries/trunk/util/src/test/java/org/apache/aries/util/VersionRangeTest.java:1185252-1186088



Mime
View raw message