Author: clement
Date: Mon Aug 11 02:55:34 2008
New Revision: 684696
URL: http://svn.apache.org/viewvc?rev=684696&view=rev
Log:
Change the maven-bundle-plugin version to use the 1.4.2.
Add the <parent> element to the JMX handler and to the event admin handler pom
files.
Modified:
felix/trunk/ipojo/annotations/pom.xml
felix/trunk/ipojo/ant/pom.xml
felix/trunk/ipojo/arch/obr.xml
felix/trunk/ipojo/arch/pom.xml
felix/trunk/ipojo/composite/pom.xml
felix/trunk/ipojo/core/pom.xml
felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml
felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml
felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml
felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml
felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml
felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml
felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml
felix/trunk/ipojo/handler/eventadmin/pom.xml
felix/trunk/ipojo/handler/jmx/pom.xml
felix/trunk/ipojo/handler/temporal/pom.xml
felix/trunk/ipojo/manipulator/pom.xml
felix/trunk/ipojo/metadata/pom.xml
felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
felix/trunk/ipojo/pom.xml
felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml
felix/trunk/ipojo/tests/composite/import-export/pom.xml
felix/trunk/ipojo/tests/composite/service-instance/pom.xml
felix/trunk/ipojo/tests/composite/service-providing/pom.xml
felix/trunk/ipojo/tests/core/annotations/pom.xml
felix/trunk/ipojo/tests/core/bad-configurations/pom.xml
felix/trunk/ipojo/tests/core/configuration/pom.xml
felix/trunk/ipojo/tests/core/external-handlers/pom.xml
felix/trunk/ipojo/tests/core/factories/pom.xml
felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml
felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml
felix/trunk/ipojo/tests/core/service-dependency/pom.xml
felix/trunk/ipojo/tests/core/service-providing/pom.xml
felix/trunk/ipojo/tests/handler/eventadmin/pom.xml
felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
felix/trunk/ipojo/tests/handler/temporal/pom.xml
felix/trunk/ipojo/tests/handler/whiteboard/pom.xml
felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml
Modified: felix/trunk/ipojo/annotations/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/pom.xml (original)
+++ felix/trunk/ipojo/annotations/pom.xml Mon Aug 11 02:55:34 2008
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/ant/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/pom.xml (original)
+++ felix/trunk/ipojo/ant/pom.xml Mon Aug 11 02:55:34 2008
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/arch/obr.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/obr.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/obr.xml (original)
+++ felix/trunk/ipojo/arch/obr.xml Mon Aug 11 02:55:34 2008
@@ -20,5 +20,5 @@
<require extend="false"
filter="(service=org.apache.felix.ipojo.architecture.Architecture)"
multiple="true" name="service" optional="true">Import Service
org.apache.felix.ipojo.architecture.Architecture</require>
<require extend="false"
filter="(service=org.apache.felix.ipojo.Factory)" multiple="false"
name="service" optional="true">Import Service
org.apache.felix.ipojo.Factory</require>
<require extend="false"
filter="(service=org.apache.felix.ipojo.HandlerFactory)" multiple="false"
name="service" optional="true">Import Service
org.apache.felix.ipojo.HandlerFactory</require>
- <require extend="false"
filter="(&(name=requires)(namespace=org.apache.felix.ipojo))"
multiple="false" optional="false" name="ipojo.handler">Require Handler</require>
+ <require extend="false"
filter="(&(name=requires)(namespace=org.apache.felix.ipojo))"
multiple="false" optional="false" name="ipojo.handler">Requires
Handler</require>
</obr>
\ No newline at end of file
Modified: felix/trunk/ipojo/arch/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/pom.xml (original)
+++ felix/trunk/ipojo/arch/pom.xml Mon Aug 11 02:55:34 2008
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/composite/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/pom.xml (original)
+++ felix/trunk/ipojo/composite/pom.xml Mon Aug 11 02:55:34 2008
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/core/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/core/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/core/pom.xml (original)
+++ felix/trunk/ipojo/core/pom.xml Mon Aug 11 02:55:34 2008
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml Mon Aug 11
02:55:34 2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml Mon Aug 11
02:55:34 2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml Mon Aug 11
02:55:34 2008
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml Mon Aug 11
02:55:34 2008
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml
(original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml Mon Aug
11 02:55:34 2008
@@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
(original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml Mon
Aug 11 02:55:34 2008
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.client/pom.xml Mon Aug 11
02:55:34 2008
@@ -53,7 +53,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<configuration>
<instructions>
<Bundle-SymbolicName>
Modified: felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.impl/pom.xml Mon Aug 11
02:55:34 2008
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml (original)
+++ felix/trunk/ipojo/examples/tutorial-maven/hello.service/pom.xml Mon Aug 11
02:55:34 2008
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/handler/eventadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/pom.xml (original)
+++ felix/trunk/ipojo/handler/eventadmin/pom.xml Mon Aug 11 02:55:34 2008
@@ -17,11 +17,16 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Event Admin Handler</name>
<artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>
- <groupId>org.apache.felix</groupId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
@@ -52,15 +57,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.apache.felix.ipojo.handlers.event.*;
version="0.9.0"</Export-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-SymbolicName>
ipojo.event.admin.handler
- </Bundle-SymbolicName>
+ <Bundle-SymbolicName>
+
org.apache.felix.ipojo.handler.eventadmin
+ </Bundle-SymbolicName>
<Bundle-Vendor>The Apache
Software
Foundation</Bundle-Vendor>
<Include-Resource>
Modified: felix/trunk/ipojo/handler/jmx/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/pom.xml (original)
+++ felix/trunk/ipojo/handler/jmx/pom.xml Mon Aug 11 02:55:34 2008
@@ -17,11 +17,16 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO JMX Handler</name>
<artifactId>org.apache.felix.ipojo.handler.jmx</artifactId>
- <groupId>org.apache.felix</groupId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
@@ -52,8 +57,8 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
+ <version>1.4.2</version>
<configuration>
<instructions>
<Private-Package>
Modified: felix/trunk/ipojo/handler/temporal/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/handler/temporal/pom.xml Mon Aug 11 02:55:34 2008
@@ -58,7 +58,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Mon Aug 11 02:55:34 2008
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/pom.xml (original)
+++ felix/trunk/ipojo/metadata/pom.xml Mon Aug 11 02:55:34 2008
@@ -34,7 +34,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
(original)
+++ felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/pom.xml Mon
Aug 11 02:55:34 2008
@@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/pom.xml (original)
+++ felix/trunk/ipojo/pom.xml Mon Aug 11 02:55:34 2008
@@ -39,7 +39,6 @@
<module>composite</module>
<module>arch</module>
<module>ant</module>
- <!--<module>white.board.pattern.handler</module>-->
<module>handler/extender</module>
<module>handler/temporal</module>
<module>handler/eventadmin</module>
@@ -55,6 +54,7 @@
</activation>
<modules>
<module>annotations</module>
+ <module>handler/jmx</module>
</modules>
</profile>
<profile>
@@ -64,6 +64,7 @@
</activation>
<modules>
<module>annotations</module>
+ <module>handler/jmx</module>
</modules>
</profile>
<profile>
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml Mon Aug 11
02:55:34 2008
@@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/composite/import-export/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/import-export/pom.xml Mon Aug 11 02:55:34
2008
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/composite/service-instance/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/pom.xml Mon Aug 11
02:55:34 2008
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/composite/service-providing/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/pom.xml Mon Aug 11
02:55:34 2008
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/annotations/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/annotations/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/annotations/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/annotations/pom.xml Mon Aug 11 02:55:34 2008
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/bad-configurations/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/bad-configurations/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/bad-configurations/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/bad-configurations/pom.xml Mon Aug 11 02:55:34
2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/configuration/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/configuration/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/configuration/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/configuration/pom.xml Mon Aug 11 02:55:34 2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/external-handlers/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/external-handlers/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/external-handlers/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/external-handlers/pom.xml Mon Aug 11 02:55:34
2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/factories/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factories/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factories/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/factories/pom.xml Mon Aug 11 02:55:34 2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml Mon Aug 11 02:55:34
2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml Mon Aug 11
02:55:34 2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
(original)
+++ felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml Mon
Aug 11 02:55:34 2008
@@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml Mon Aug 11
02:55:34 2008
@@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/service-dependency/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency/pom.xml Mon Aug 11 02:55:34
2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/core/service-providing/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-providing/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-providing/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-providing/pom.xml Mon Aug 11 02:55:34
2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/handler/eventadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/eventadmin/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/eventadmin/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/eventadmin/pom.xml Mon Aug 11 02:55:34 2008
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.ipojo.handler.eventadmins</artifactId>
+
<artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>
<version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
---
felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
(original)
+++
felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
Mon Aug 11 02:55:34 2008
@@ -636,7 +636,6 @@
m_fooBarNutConsumer.clearDonuts();
// Send donuts
- Donut sentDonut;
for (int i = 0; i < EahTestUtils.NUMBER_OF_TESTS; i++) {
m_fooProvider.sellDonut();
foos++;
@@ -647,19 +646,19 @@
m_nutProvider.sellDonut();
nuts++;
- sentDonut = m_fooBarProvider.sellDonut();
+ m_fooBarProvider.sellDonut();
foos++;
bars++;
- sentDonut = m_barNutProvider.sellDonut();
+ m_barNutProvider.sellDonut();
bars++;
nuts++;
- sentDonut = m_fooNutProvider.sellDonut();
+ m_fooNutProvider.sellDonut();
foos++;
nuts++;
- sentDonut = m_fooBarNutProvider.sellDonut();
+ m_fooBarNutProvider.sellDonut();
foos++;
bars++;
nuts++;
Modified: felix/trunk/ipojo/tests/handler/temporal/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/temporal/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/temporal/pom.xml Mon Aug 11 02:55:34 2008
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/handler/whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/whiteboard/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/whiteboard/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/whiteboard/pom.xml Mon Aug 11 02:55:34 2008
@@ -32,7 +32,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml?rev=684696&r1=684695&r2=684696&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml Mon Aug 11
02:55:34 2008
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
