You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/08/18 06:10:57 UTC
svn commit: r1374509 - in /karaf/trunk: ./ bundle/command/ config/command/
demos/command/ diagnostic/command/ http/command/ instance/command/
itests/tests/ jaas/command/ kar/command/ log/command/ obr/command/
package/command/ region/command/ scr/comman...
Author: jbonofre
Date: Sat Aug 18 04:10:56 2012
New Revision: 1374509
URL: http://svn.apache.org/viewvc?rev=1374509&view=rev
Log:
[KARAF-1048] Add support of Eclipse 3.7 m2e
Modified:
karaf/trunk/bundle/command/pom.xml
karaf/trunk/config/command/pom.xml
karaf/trunk/demos/command/pom.xml
karaf/trunk/diagnostic/command/pom.xml
karaf/trunk/http/command/pom.xml
karaf/trunk/instance/command/pom.xml
karaf/trunk/itests/tests/pom.xml
karaf/trunk/jaas/command/pom.xml
karaf/trunk/kar/command/pom.xml
karaf/trunk/log/command/pom.xml
karaf/trunk/obr/command/pom.xml
karaf/trunk/package/command/pom.xml
karaf/trunk/pom.xml
karaf/trunk/region/command/pom.xml
karaf/trunk/scr/command/pom.xml
karaf/trunk/service/command/pom.xml
karaf/trunk/shell/commands/pom.xml
karaf/trunk/shell/ssh/pom.xml
karaf/trunk/system/command/pom.xml
karaf/trunk/web/command/pom.xml
karaf/trunk/webconsole/gogo/pom.xml
karaf/trunk/wrapper/command/pom.xml
Modified: karaf/trunk/bundle/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/bundle/command/pom.xml (original)
+++ karaf/trunk/bundle/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -51,6 +51,12 @@
<artifactId>org.apache.karaf.bundle.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: karaf/trunk/config/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/config/command/pom.xml (original)
+++ karaf/trunk/config/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -48,6 +48,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/demos/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/demos/command/pom.xml (original)
+++ karaf/trunk/demos/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -39,6 +39,18 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: karaf/trunk/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -45,6 +45,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/http/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/http/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/http/command/pom.xml (original)
+++ karaf/trunk/http/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -50,6 +50,12 @@
<groupId>org.apache.karaf.http</groupId>
<artifactId>org.apache.karaf.http.core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
Modified: karaf/trunk/instance/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/instance/command/pom.xml (original)
+++ karaf/trunk/instance/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -50,6 +50,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/itests/tests/pom.xml (original)
+++ karaf/trunk/itests/tests/pom.xml Sat Aug 18 04:10:56 2012
@@ -37,6 +37,13 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
Modified: karaf/trunk/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/jaas/command/pom.xml (original)
+++ karaf/trunk/jaas/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -43,6 +43,13 @@
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.config</artifactId>
Modified: karaf/trunk/kar/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/kar/command/pom.xml (original)
+++ karaf/trunk/kar/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -39,6 +39,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf.kar</groupId>
<artifactId>org.apache.karaf.kar.core</artifactId>
</dependency>
Modified: karaf/trunk/log/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/log/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/log/command/pom.xml (original)
+++ karaf/trunk/log/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -48,6 +48,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/obr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/obr/command/pom.xml (original)
+++ karaf/trunk/obr/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -38,6 +38,13 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Modified: karaf/trunk/package/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/package/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/package/command/pom.xml (original)
+++ karaf/trunk/package/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -52,6 +52,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Aug 18 04:10:56 2012
@@ -1975,6 +1975,83 @@
<artifactId>karaf-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>[2.3.7,)</versionRange>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.4,)</versionRange>
+ <goals>
+ <goal>copy</goal>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <versionRange>[3.0.0,)</versionRange>
+ <goals>
+ <goal>commands-generate-help</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>maven-scalate-plugin</artifactId>
+ <versionRange>[1.4.0,)</versionRange>
+ <goals>
+ <goal>sitegen</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <versionRange>[1.2,)</versionRange>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: karaf/trunk/region/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/region/command/pom.xml (original)
+++ karaf/trunk/region/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -44,6 +44,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
Modified: karaf/trunk/scr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/scr/command/pom.xml (original)
+++ karaf/trunk/scr/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -38,6 +38,13 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: karaf/trunk/service/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/service/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/service/command/pom.xml (original)
+++ karaf/trunk/service/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -38,6 +38,13 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Sat Aug 18 04:10:56 2012
@@ -46,6 +46,13 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.table</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Sat Aug 18 04:10:56 2012
@@ -44,6 +44,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/system/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/system/command/pom.xml (original)
+++ karaf/trunk/system/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -48,6 +48,13 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: karaf/trunk/web/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/web/command/pom.xml (original)
+++ karaf/trunk/web/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -50,6 +50,13 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Sat Aug 18 04:10:56 2012
@@ -48,6 +48,13 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: karaf/trunk/wrapper/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/command/pom.xml?rev=1374509&r1=1374508&r2=1374509&view=diff
==============================================================================
--- karaf/trunk/wrapper/command/pom.xml (original)
+++ karaf/trunk/wrapper/command/pom.xml Sat Aug 18 04:10:56 2012
@@ -50,6 +50,12 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>