Author: clement
Date: Mon Mar 17 13:01:11 2008
New Revision: 638050
URL: http://svn.apache.org/viewvc?rev=638050&view=rev
Log:
Merge the sandbox version with the last commit from the trunk (from the 615742
to 620828 revisions). The merge generalizes the usage of the latest
maven-bundle-plugin (1.4.0).
Fix a bug in the maven plugin when using the archetype (the metadata files was
not copied correctly).
Added:
felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml
- copied unchanged from r636571,
felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/metadata.xml
Removed:
felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/metadata.xml
Modified:
felix/sandbox/clement/ipojo/ (props changed)
felix/sandbox/clement/ipojo/annotations/ (props changed)
felix/sandbox/clement/ipojo/annotations/pom.xml
felix/sandbox/clement/ipojo/ant/ (props changed)
felix/sandbox/clement/ipojo/ant/pom.xml
felix/sandbox/clement/ipojo/arch/ (props changed)
felix/sandbox/clement/ipojo/arch/pom.xml
felix/sandbox/clement/ipojo/composite/pom.xml
felix/sandbox/clement/ipojo/core/pom.xml
felix/sandbox/clement/ipojo/event.admin.handler/ (props changed)
felix/sandbox/clement/ipojo/event.admin.handler/pom.xml
felix/sandbox/clement/ipojo/examples/junit4osgi/felix-command/pom.xml
felix/sandbox/clement/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/pom.xml
felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml
felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml
felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml
felix/sandbox/clement/ipojo/jmx.handler/ (props changed)
felix/sandbox/clement/ipojo/jmx.handler/pom.xml
felix/sandbox/clement/ipojo/manipulator/ (props changed)
felix/sandbox/clement/ipojo/manipulator/pom.xml
felix/sandbox/clement/ipojo/metadata/ (props changed)
felix/sandbox/clement/ipojo/metadata/pom.xml
felix/sandbox/clement/ipojo/plugin/ (props changed)
felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
felix/sandbox/clement/ipojo/pom.xml
felix/sandbox/clement/ipojo/tests/tests.composite/pom.xml
felix/sandbox/clement/ipojo/tests/tests.core/pom.xml
Propchange: felix/sandbox/clement/ipojo/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -15,3 +15,7 @@
.wtpmodules
.deployables
.checkstyle
+
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
Propchange: felix/sandbox/clement/ipojo/annotations/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -1,6 +1,10 @@
-target
-bin
-.settings
-.checkstyle
-.classpath
-.project
+target
+bin
+.settings
+.checkstyle
+.classpath
+.project
+
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
Modified: felix/sandbox/clement/ipojo/annotations/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/annotations/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/annotations/pom.xml (original)
+++ felix/sandbox/clement/ipojo/annotations/pom.xml Mon Mar 17 13:01:11 2008
@@ -40,8 +40,8 @@
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/sandbox/clement/ipojo/ant/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -1,6 +1,10 @@
-target
-bin
-.settings
-.checkstyle
-.classpath
-.project
+target
+bin
+.settings
+.checkstyle
+.classpath
+.project
+
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
Modified: felix/sandbox/clement/ipojo/ant/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/ant/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/ant/pom.xml (original)
+++ felix/sandbox/clement/ipojo/ant/pom.xml Mon Mar 17 13:01:11 2008
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/sandbox/clement/ipojo/arch/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -15,3 +15,7 @@
.wtpmodules
.deployables
.checkstyle
+
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
Modified: felix/sandbox/clement/ipojo/arch/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/arch/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/arch/pom.xml (original)
+++ felix/sandbox/clement/ipojo/arch/pom.xml Mon Mar 17 13:01:11 2008
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/sandbox/clement/ipojo/composite/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/composite/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/composite/pom.xml (original)
+++ felix/sandbox/clement/ipojo/composite/pom.xml Mon Mar 17 13:01:11 2008
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/sandbox/clement/ipojo/core/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/pom.xml (original)
+++ felix/sandbox/clement/ipojo/core/pom.xml Mon Mar 17 13:01:11 2008
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/sandbox/clement/ipojo/event.admin.handler/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -1,6 +1,7 @@
-target
-bin
-.settings
-.checkstyle
-.classpath
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
+.checkstyle
+.classpath
.project
+target
Modified: felix/sandbox/clement/ipojo/event.admin.handler/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/event.admin.handler/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/event.admin.handler/pom.xml (original)
+++ felix/sandbox/clement/ipojo/event.admin.handler/pom.xml Mon Mar 17 13:01:11
2008
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/sandbox/clement/ipojo/examples/junit4osgi/felix-command/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/junit4osgi/felix-command/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/felix-command/pom.xml
(original)
+++ felix/sandbox/clement/ipojo/examples/junit4osgi/felix-command/pom.xml Mon
Mar 17 13:01:11 2008
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/sandbox/clement/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/junit4osgi/immediate-launcher/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
(original)
+++ felix/sandbox/clement/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
Mon Mar 17 13:01:11 2008
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/pom.xml
(original)
+++ felix/sandbox/clement/ipojo/examples/junit4osgi/junit4osgi/pom.xml Mon Mar
17 13:01:11 2008
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml
(original)
+++ felix/sandbox/clement/ipojo/examples/junit4osgi/swing-runner/pom.xml Mon
Mar 17 13:01:11 2008
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml
(original)
+++
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml
Mon Mar 17 13:01:11 2008
@@ -34,7 +34,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
(original)
+++
felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
Mon Mar 17 13:01:11 2008
@@ -34,7 +34,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml
(original)
+++ felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml
Mon Mar 17 13:01:11 2008
@@ -35,7 +35,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
Modified: felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml
(original)
+++ felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml Mon
Mar 17 13:01:11 2008
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified:
felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml
(original)
+++ felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml
Mon Mar 17 13:01:11 2008
@@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/sandbox/clement/ipojo/jmx.handler/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -1,6 +1,7 @@
-target
-bin
-.settings
-.checkstyle
-.classpath
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
+.classpath
.project
+.settings
+target
Modified: felix/sandbox/clement/ipojo/jmx.handler/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/jmx.handler/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/jmx.handler/pom.xml (original)
+++ felix/sandbox/clement/ipojo/jmx.handler/pom.xml Mon Mar 17 13:01:11 2008
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/sandbox/clement/ipojo/manipulator/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -15,3 +15,7 @@
.wtpmodules
.deployables
.checkstyle
+
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
Modified: felix/sandbox/clement/ipojo/manipulator/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/manipulator/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/manipulator/pom.xml (original)
+++ felix/sandbox/clement/ipojo/manipulator/pom.xml Mon Mar 17 13:01:11 2008
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/sandbox/clement/ipojo/metadata/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -15,3 +15,7 @@
.wtpmodules
.deployables
.checkstyle
+
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
Modified: felix/sandbox/clement/ipojo/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/metadata/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/metadata/pom.xml (original)
+++ felix/sandbox/clement/ipojo/metadata/pom.xml Mon Mar 17 13:01:11 2008
@@ -32,7 +32,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/sandbox/clement/ipojo/plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 17 13:01:11 2008
@@ -15,3 +15,7 @@
.wtpmodules
.deployables
.checkstyle
+
+*.patch
+.externalToolBuilders
+maven-eclipse.xml
Modified:
felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
(original)
+++
felix/sandbox/clement/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
Mon Mar 17 13:01:11 2008
@@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/sandbox/clement/ipojo/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/pom.xml (original)
+++ felix/sandbox/clement/ipojo/pom.xml Mon Mar 17 13:01:11 2008
@@ -21,7 +21,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<version>1.0.2</version>
- <relativePath>../pom/pom.xml</relativePath>
+ <!--<relativePath>../pom/pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -77,6 +77,5 @@
<module>tests</module>
</modules>
</profile>
- </profiles>
-
-</project>
\ No newline at end of file
+ </profiles>
+</project>
Modified: felix/sandbox/clement/ipojo/tests/tests.composite/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/tests/tests.composite/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/tests/tests.composite/pom.xml (original)
+++ felix/sandbox/clement/ipojo/tests/tests.composite/pom.xml Mon Mar 17
13:01:11 2008
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: felix/sandbox/clement/ipojo/tests/tests.core/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/tests/tests.core/pom.xml?rev=638050&r1=638049&r2=638050&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/tests/tests.core/pom.xml (original)
+++ felix/sandbox/clement/ipojo/tests/tests.core/pom.xml Mon Mar 17 13:01:11
2008
@@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
