You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/12/22 14:46:13 UTC
svn commit: r1051896 - in /karaf/trunk/itests: dependencies/pom.xml
tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
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()
);
Re: svn commit: r1051896 - in /karaf/trunk/itests:
dependencies/pom.xml
tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.javar
Posted by Andreas Pieber <an...@gmail.com>.
Thank you very much; I'll give it a shot tomorrow
kind regards,
andreas
On Thu, Dec 23, 2010 at 07:27:52AM +0100, Guillaume Nodet wrote:
> On Wed, Dec 22, 2010 at 23:32, Andreas Pieber <an...@gmail.com> wrote:
> > +1 for exam2; I've took a look at exam2 some weeks ago (and had a similar
> > thought). Can you push your local branch (into a dev-branch) to the github repo?
> > I would like to take a look at it.
>
> Done, see https://github.com/gnodet/karaf/tree/paxexam2 (i've given
> you karma on that repo)
> It's a few weeks old, so it may need to be rebased on trunk.
> I've also pushed a gnodet branch to pax-exam which contains a few
> improvements, but
> not sure how stable it is (hence the branch).
>
> >
> > @own platform.xml: I've tried this already some time ago for karaf-2.x and it
> > was anything but straight forward... I think I would prefer to push exam2 to
> > a 2.0.0.M2 release we can use for Karaf :)
>
> I had the exact same reaction. I'd like to make sure such things are
> way easier in pax-exam2.
>
> >
> > On Wed, Dec 22, 2010 at 11:05:53PM +0100, Guillaume Nodet wrote:
> >> Ideally, we should have our own platform.
> >> Though my real goal would be to start moving to pax-exam2 and enhance
> >> pax-exam2 in order to fix some those problems.
> >> I've already started on that in a local branch a few weeks ago, but
> >> haven't had any time to get back to it yet.
> >> In the case of karaf, we don't really need pax-runner, as we have our
> >> own provisioning mechanism, and i'd like the integration tests to be
> >> able to be run offline without too much pain.
> >> I didn't want to spent time on writing our own platform.xml if if
> >> you're fancy doing it, you'd be more than welcome.
> >>
> >> On Wed, Dec 22, 2010 at 22:54, Andreas Pieber <an...@gmail.com> wrote:
> >> > 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, gnodet@apache.org 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()
> >> >> );
> >> >>
> >> >>
> >> >
> >>
> >>
> >>
> >> --
> >> Cheers,
> >> Guillaume Nodet
> >> ------------------------
> >> Blog: http://gnodet.blogspot.com/
> >> ------------------------
> >> Open Source SOA
> >> http://fusesource.com
> >
>
>
>
> --
> Cheers,
> Guillaume Nodet
> ------------------------
> Blog: http://gnodet.blogspot.com/
> ------------------------
> Open Source SOA
> http://fusesource.com
Re: svn commit: r1051896 - in /karaf/trunk/itests:
dependencies/pom.xml tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.javar
Posted by Guillaume Nodet <gn...@gmail.com>.
On Wed, Dec 22, 2010 at 23:32, Andreas Pieber <an...@gmail.com> wrote:
> +1 for exam2; I've took a look at exam2 some weeks ago (and had a similar
> thought). Can you push your local branch (into a dev-branch) to the github repo?
> I would like to take a look at it.
Done, see https://github.com/gnodet/karaf/tree/paxexam2 (i've given
you karma on that repo)
It's a few weeks old, so it may need to be rebased on trunk.
I've also pushed a gnodet branch to pax-exam which contains a few
improvements, but
not sure how stable it is (hence the branch).
>
> @own platform.xml: I've tried this already some time ago for karaf-2.x and it
> was anything but straight forward... I think I would prefer to push exam2 to
> a 2.0.0.M2 release we can use for Karaf :)
I had the exact same reaction. I'd like to make sure such things are
way easier in pax-exam2.
>
> On Wed, Dec 22, 2010 at 11:05:53PM +0100, Guillaume Nodet wrote:
>> Ideally, we should have our own platform.
>> Though my real goal would be to start moving to pax-exam2 and enhance
>> pax-exam2 in order to fix some those problems.
>> I've already started on that in a local branch a few weeks ago, but
>> haven't had any time to get back to it yet.
>> In the case of karaf, we don't really need pax-runner, as we have our
>> own provisioning mechanism, and i'd like the integration tests to be
>> able to be run offline without too much pain.
>> I didn't want to spent time on writing our own platform.xml if if
>> you're fancy doing it, you'd be more than welcome.
>>
>> On Wed, Dec 22, 2010 at 22:54, Andreas Pieber <an...@gmail.com> wrote:
>> > 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, gnodet@apache.org 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()
>> >> );
>> >>
>> >>
>> >
>>
>>
>>
>> --
>> Cheers,
>> Guillaume Nodet
>> ------------------------
>> Blog: http://gnodet.blogspot.com/
>> ------------------------
>> Open Source SOA
>> http://fusesource.com
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com
Re: svn commit: r1051896 - in /karaf/trunk/itests:
dependencies/pom.xml
tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.javar
Posted by Andreas Pieber <an...@gmail.com>.
+1 for exam2; I've took a look at exam2 some weeks ago (and had a similar
thought). Can you push your local branch (into a dev-branch) to the github repo?
I would like to take a look at it.
@own platform.xml: I've tried this already some time ago for karaf-2.x and it
was anything but straight forward... I think I would prefer to push exam2 to
a 2.0.0.M2 release we can use for Karaf :)
On Wed, Dec 22, 2010 at 11:05:53PM +0100, Guillaume Nodet wrote:
> Ideally, we should have our own platform.
> Though my real goal would be to start moving to pax-exam2 and enhance
> pax-exam2 in order to fix some those problems.
> I've already started on that in a local branch a few weeks ago, but
> haven't had any time to get back to it yet.
> In the case of karaf, we don't really need pax-runner, as we have our
> own provisioning mechanism, and i'd like the integration tests to be
> able to be run offline without too much pain.
> I didn't want to spent time on writing our own platform.xml if if
> you're fancy doing it, you'd be more than welcome.
>
> On Wed, Dec 22, 2010 at 22:54, Andreas Pieber <an...@gmail.com> wrote:
> > 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, gnodet@apache.org 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()
> >> );
> >>
> >>
> >
>
>
>
> --
> Cheers,
> Guillaume Nodet
> ------------------------
> Blog: http://gnodet.blogspot.com/
> ------------------------
> Open Source SOA
> http://fusesource.com
Re: svn commit: r1051896 - in /karaf/trunk/itests:
dependencies/pom.xml tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
Posted by Guillaume Nodet <gn...@gmail.com>.
Ideally, we should have our own platform.
Though my real goal would be to start moving to pax-exam2 and enhance
pax-exam2 in order to fix some those problems.
I've already started on that in a local branch a few weeks ago, but
haven't had any time to get back to it yet.
In the case of karaf, we don't really need pax-runner, as we have our
own provisioning mechanism, and i'd like the integration tests to be
able to be run offline without too much pain.
I didn't want to spent time on writing our own platform.xml if if
you're fancy doing it, you'd be more than welcome.
On Wed, Dec 22, 2010 at 22:54, Andreas Pieber <an...@gmail.com> wrote:
> 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, gnodet@apache.org 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()
>> );
>>
>>
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com
Re: svn commit: r1051896 - in /karaf/trunk/itests:
dependencies/pom.xml
tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
Posted by Andreas Pieber <an...@gmail.com>.
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, gnodet@apache.org 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()
> );
>
>