You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/02/28 13:25:53 UTC

svn commit: r1294619 - in /incubator/directmemory/trunk/itests/osgi: pom.xml src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java

Author: olamy
Date: Tue Feb 28 12:25:53 2012
New Revision: 1294619

URL: http://svn.apache.org/viewvc?rev=1294619&view=rev
Log:
make directmemory version dynamic (upgrading or make release could fail or not test the correct bundle)

Modified:
    incubator/directmemory/trunk/itests/osgi/pom.xml
    incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java

Modified: incubator/directmemory/trunk/itests/osgi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/itests/osgi/pom.xml?rev=1294619&r1=1294618&r2=1294619&view=diff
==============================================================================
--- incubator/directmemory/trunk/itests/osgi/pom.xml (original)
+++ incubator/directmemory/trunk/itests/osgi/pom.xml Tue Feb 28 12:25:53 2012
@@ -96,6 +96,7 @@ under the License.
             <osgi.debug>${osgi.debug}</osgi.debug>
             <osgi.debug.port>${osgi.debug.port}</osgi.debug.port>
             <osgi.debug.suspend>${osgi.debug.suspend}</osgi.debug.suspend>
+            <direct.memory.version>${project.version}</direct.memory.version>
           </systemPropertyVariables>
         </configuration>
       </plugin>

Modified: incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java?rev=1294619&r1=1294618&r2=1294619&view=diff
==============================================================================
--- incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java (original)
+++ incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java Tue Feb 28 12:25:53 2012
@@ -21,7 +21,6 @@ package org.apache.directmemory.tests.os
 
 import org.ops4j.pax.exam.Inject;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
 import org.ops4j.pax.exam.options.UrlProvisionOption;
 import org.ops4j.store.Store;
@@ -176,7 +175,7 @@ public class DirectMemoryOsgiTestSupport
                 "org.apache.servicemix.bundles.aspectj" ).version( "1.6.8_2" ),
             mavenBundle().groupId( "com.dyuproject.protostuff" ).artifactId( "protostuff-uberjar" ).version( "1.0.2" ),
             mavenBundle().groupId( "org.apache.directmemory" ).artifactId( "directmemory-cache" ).version(
-                "0.6.0-SNAPSHOT" ));
+                System.getProperty( "direct.memory.version" ) ) );
         List<Option> options = new ArrayList<Option>( mavenOptions );
         if ( Boolean.getBoolean( "osgi.debug" ) )
         {