Shouldn't we upgrade pax-runner (or provide our own platform.xml) instead?

kind regards,
andreas

On Wed, Dec 22, 2010 at 01:46:13PM -0000, [email protected] wrote:
> Author: gnodet
> Date: Wed Dec 22 13:46:13 2010
> New Revision: 1051896
> 
> URL: http://svn.apache.org/viewvc?rev=1051896&view=rev
> Log:
> Make sure we have the felix main in the local repo for pax-runner
> 
> Modified:
>     karaf/trunk/itests/dependencies/pom.xml
>     
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
>     
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
> 
> Modified: karaf/trunk/itests/dependencies/pom.xml
> URL: 
> http://svn.apache.org/viewvc/karaf/trunk/itests/dependencies/pom.xml?rev=1051896&r1=1051895&r2=1051896&view=diff
> ==============================================================================
> --- karaf/trunk/itests/dependencies/pom.xml (original)
> +++ karaf/trunk/itests/dependencies/pom.xml Wed Dec 22 13:46:13 2010
> @@ -39,12 +39,12 @@
>      </repositories>
>  
>      <dependencies>
> -        <!--
>          <dependency>
>                       <groupId>org.apache.felix</groupId>
>                       <artifactId>org.apache.felix.main</artifactId>
> -                     <version>2.0.2</version>
> +                     <version>3.0.2</version>
>          </dependency>
> +        <!--
>          <dependency>
>                       <groupId>org.eclipse</groupId>
>                       <artifactId>osgi</artifactId>
> 
> Modified: 
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
> URL: 
> http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java?rev=1051896&r1=1051895&r2=1051896&view=diff
> ==============================================================================
> --- 
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
>  (original)
> +++ 
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
>  Wed Dec 22 13:46:13 2010
> @@ -130,7 +130,10 @@ public class CoreTest extends AbstractIn
>              waitForFrameworkStartup(),
>  
>              // Test on both equinox and felix
> -            equinox(), felix(),
> +            // TODO: pax-exam does not support the latest felix version :-(
> +            // TODO: so we use the higher supported which should be the same
> +            // TODO: as the one specified in itests/dependencies/pom.xml
> +            equinox(), felix().version("3.0.2"),
>  
>              felixProvisionalApis()
>          );
> 
> Modified: 
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
> URL: 
> http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java?rev=1051896&r1=1051895&r2=1051896&view=diff
> ==============================================================================
> --- 
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
>  (original)
> +++ 
> karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
>  Wed Dec 22 13:46:13 2010
> @@ -81,7 +81,10 @@ public class FeaturesTest extends Abstra
>              waitForFrameworkStartup(),
>              
>              // Test on both equinox and felix
> -            equinox(), felix(),
> +            // TODO: pax-exam does not support the latest felix version :-(
> +            // TODO: so we use the higher supported which should be the same
> +            // TODO: as the one specified in itests/dependencies/pom.xml
> +            equinox(), felix().version("3.0.2"),
>  
>              felixProvisionalApis()
>          );
> 
> 

Attachment: pgpydpbedgLFy.pgp
Description: PGP signature

Reply via email to