Author: ldywicki
Date: Wed Aug 29 19:27:01 2012
New Revision: 1378690
URL: http://svn.apache.org/viewvc?rev=1378690&view=rev
Log:
KARAF-1776 Move all versions to parent pom instead of splitting them across
modules
Modified:
karaf/webconsole/trunk/assembly/src/main/resources/features.xml
karaf/webconsole/trunk/camel/pom.xml
karaf/webconsole/trunk/core/pom.xml
karaf/webconsole/trunk/cxf/pom.xml
karaf/webconsole/trunk/examples/branding/pom.xml
karaf/webconsole/trunk/examples/events/consumer/pom.xml
karaf/webconsole/trunk/examples/events/provider/pom.xml
karaf/webconsole/trunk/examples/scala/pom.xml
karaf/webconsole/trunk/examples/scr/pom.xml
karaf/webconsole/trunk/itest/pom.xml
karaf/webconsole/trunk/karaf/admin/pom.xml
karaf/webconsole/trunk/karaf/core/pom.xml
karaf/webconsole/trunk/karaf/feature/pom.xml
karaf/webconsole/trunk/karaf/pom.xml
karaf/webconsole/trunk/manual/pom.xml
karaf/webconsole/trunk/osgi/blueprint/pom.xml
karaf/webconsole/trunk/osgi/config/pom.xml
karaf/webconsole/trunk/osgi/core/pom.xml
karaf/webconsole/trunk/osgi/event/pom.xml
karaf/webconsole/trunk/osgi/log/pom.xml
karaf/webconsole/trunk/osgi/scr/pom.xml
karaf/webconsole/trunk/pom.xml
karaf/webconsole/trunk/servicemix/pom.xml
karaf/webconsole/trunk/web/pom.xml
Modified: karaf/webconsole/trunk/assembly/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/assembly/src/main/resources/features.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/assembly/src/main/resources/features.xml (original)
+++ karaf/webconsole/trunk/assembly/src/main/resources/features.xml Wed Aug 29
19:27:01 2012
@@ -17,7 +17,7 @@
-->
<features name="karaf-webconsole-${project.version}">
-
<repository>mvn:org.ops4j.pax.wicket/features/${ops4j.paxwicket.version}/xml/features</repository>
+
<repository>mvn:org.ops4j.pax.wicket/features/${pax-wicket.version}/xml/features</repository>
<feature name="webconsole-wicket" version="${project.version}"
description="Karaf Wicket Webconsole">
<feature>webconsole-core</feature>
Modified: karaf/webconsole/trunk/camel/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/pom.xml (original)
+++ karaf/webconsole/trunk/camel/pom.xml Wed Aug 29 19:27:01 2012
@@ -34,13 +34,10 @@
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
</dependency>
</dependencies>
@@ -49,7 +46,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/pom.xml (original)
+++ karaf/webconsole/trunk/core/pom.xml Wed Aug 29 19:27:01 2012
@@ -44,42 +44,36 @@
<dependency>
<groupId>org.ops4j.pax.wicket</groupId>
<artifactId>org.ops4j.pax.wicket.service</artifactId>
- <version>${ops4j.paxwicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.modules</artifactId>
- <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.wicket</groupId>
<artifactId>org.ops4j.pax.wicket.test</artifactId>
- <version>${ops4j.paxwicket.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -89,7 +83,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -138,7 +131,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
<configuration>
<systemProperties>
<property>
Modified: karaf/webconsole/trunk/cxf/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/cxf/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/cxf/pom.xml (original)
+++ karaf/webconsole/trunk/cxf/pom.xml Wed Aug 29 19:27:01 2012
@@ -34,13 +34,11 @@
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>${cxf.version}</version>
</dependency>
</dependencies>
@@ -49,7 +47,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/examples/branding/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/branding/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/examples/branding/pom.xml (original)
+++ karaf/webconsole/trunk/examples/branding/pom.xml Wed Aug 29 19:27:01 2012
@@ -43,7 +43,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -51,10 +50,6 @@
<Import-Package>
!org.apache.karaf.webconsole.examples.branding,
*,
-<!-- transient dependencies -->
-<!-- org.ops4j.pax.wicket.api, -->
-<!-- org.ops4j.pax.wicket.util, -->
-<!-- org.ops4j.pax.wicket.util.proxy -->
</Import-Package>
</instructions>
</configuration>
Modified: karaf/webconsole/trunk/examples/events/consumer/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/events/consumer/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/examples/events/consumer/pom.xml (original)
+++ karaf/webconsole/trunk/examples/events/consumer/pom.xml Wed Aug 29 19:27:01
2012
@@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/examples/events/provider/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/events/provider/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/examples/events/provider/pom.xml (original)
+++ karaf/webconsole/trunk/examples/events/provider/pom.xml Wed Aug 29 19:27:01
2012
@@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/examples/scala/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/scala/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/examples/scala/pom.xml (original)
+++ karaf/webconsole/trunk/examples/scala/pom.xml Wed Aug 29 19:27:01 2012
@@ -34,12 +34,10 @@
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.9.1</version>
</dependency>
</dependencies>
@@ -48,20 +46,10 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.15.2</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/examples/scr/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/scr/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/examples/scr/pom.xml (original)
+++ karaf/webconsole/trunk/examples/scr/pom.xml Wed Aug 29 19:27:01 2012
@@ -30,20 +30,11 @@
<name>Apache Karaf :: WebConsole :: Examples :: Scr</name>
<packaging>bundle</packaging>
-
-<!-- <dependencies> -->
-<!-- <dependency> -->
-<!-- <groupId>org.osgi</groupId> -->
-<!-- <artifactId>org.osgi.compendium</artifactId> -->
-<!-- </dependency> -->
-<!-- </dependencies> -->
-
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/itest/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/itest/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/itest/pom.xml (original)
+++ karaf/webconsole/trunk/itest/pom.xml Wed Aug 29 19:27:01 2012
@@ -34,7 +34,6 @@
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>apache-karaf-webconsole</artifactId>
- <version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
@@ -42,38 +41,29 @@
<dependency>
<groupId>org.openengsb.labs.paxexam.karaf</groupId>
<artifactId>paxexam-karaf-container</artifactId>
- <version>0.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>2.3.0</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>${karaf.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: karaf/webconsole/trunk/karaf/admin/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/admin/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/karaf/admin/pom.xml (original)
+++ karaf/webconsole/trunk/karaf/admin/pom.xml Wed Aug 29 19:27:01 2012
@@ -47,7 +47,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/karaf/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/core/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/karaf/core/pom.xml (original)
+++ karaf/webconsole/trunk/karaf/core/pom.xml Wed Aug 29 19:27:01 2012
@@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/karaf/feature/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/karaf/feature/pom.xml (original)
+++ karaf/webconsole/trunk/karaf/feature/pom.xml Wed Aug 29 19:27:01 2012
@@ -47,7 +47,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/karaf/pom.xml (original)
+++ karaf/webconsole/trunk/karaf/pom.xml Wed Aug 29 19:27:01 2012
@@ -36,24 +36,4 @@
<module>feature</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
\ No newline at end of file
Modified: karaf/webconsole/trunk/manual/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/manual/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/manual/pom.xml (original)
+++ karaf/webconsole/trunk/manual/pom.xml Wed Aug 29 19:27:01 2012
@@ -33,7 +33,6 @@
<properties>
<manual.dir>${project.build.directory}/manual</manual.dir>
<manual>${manual.dir}/webconsole-manual-${project.version}</manual>
- <scala.version>2.9.0-1</scala.version>
<scalate.version>1.5.1</scalate.version>
<webconsole.version>${project.version}</webconsole.version>
</properties>
@@ -52,12 +51,10 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
</dependency>
</dependencies>
@@ -134,7 +131,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>7.1.5.v20100705</version>
<configuration>
<!-- When editing the conf files, you can comment this
line to run
mvn jetty:run
Modified: karaf/webconsole/trunk/osgi/blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/blueprint/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/blueprint/pom.xml Wed Aug 29 19:27:01 2012
@@ -35,11 +35,9 @@
<groupId>org.apache.karaf.webconsole.osgi</groupId>
<artifactId>org.apache.karaf.webconsole.osgi.core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.3.1</version>
</dependency>
</dependencies>
@@ -48,7 +46,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/osgi/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/config/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/config/pom.xml Wed Aug 29 19:27:01 2012
@@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
Modified: karaf/webconsole/trunk/osgi/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/core/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/core/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/core/pom.xml Wed Aug 29 19:27:01 2012
@@ -34,29 +34,24 @@
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
- <version>1.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -66,7 +61,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
Modified: karaf/webconsole/trunk/osgi/event/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/event/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/event/pom.xml Wed Aug 29 19:27:01 2012
@@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
Modified: karaf/webconsole/trunk/osgi/log/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/log/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/log/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/log/pom.xml Wed Aug 29 19:27:01 2012
@@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
Modified: karaf/webconsole/trunk/osgi/scr/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/scr/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/scr/pom.xml Wed Aug 29 19:27:01 2012
@@ -47,7 +47,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/pom.xml (original)
+++ karaf/webconsole/trunk/pom.xml Wed Aug 29 19:27:01 2012
@@ -40,19 +40,33 @@
</scm>
<properties>
- <osgi.version>4.2.0</osgi.version>
- <jetty.version>6.1.25</jetty.version>
+ <!-- Please keep properties in alphabetical order -->
+ <aries-blueprint.version>0.3.1</aries-blueprint.version>
+ <aries-proxy.version>0.3</aries-proxy.version>
+ <camel.version>2.6.0</camel.version>
+ <cxf.version>2.5.1</cxf.version>
+ <easymock.version>3.0</easymock.version>
+ <felix-framework.version>4.0.2</felix-framework.version>
<felix-metatype.version>1.0.4</felix-metatype.version>
<felix-prefs.version>1.0.4</felix-prefs.version>
<felix-scr.version>1.6.0</felix-scr.version>
- <slf4j.version>1.6.1</slf4j.version>
- <log4j.version>1.2.14</log4j.version>
- <ops4j.paxwicket.version>1.1.0</ops4j.paxwicket.version>
+ <felix-utils.version>1.1.0</felix-utils.version>
+ <felix-config.version>1.2.8</felix-config.version>
+ <felix-http.version>2.2.0</felix-http.version>
+ <jetty-plugin.version>7.5.4.v20111024</jetty-plugin.version>
+ <junit.version>4.8.2</junit.version>
<karaf.version>2.2.8</karaf.version>
- <nmr.version>1.4.0</nmr.version>
- <camel.version>2.6.0</camel.version>
- <cxf.version>2.5.1</cxf.version>
+ <log4j.version>1.2.14</log4j.version>
<maven-bundle.version>2.3.7</maven-bundle.version>
+ <osgi.version>4.2.0</osgi.version>
+ <pax-exam-karaf.version>0.5.0</pax-exam-karaf.version>
+ <pax-exam-junit.version>2.3.0</pax-exam-junit.version>
+ <pax-logging.version>1.6.4</pax-logging.version>
+ <pax-wicket.version>1.1.0</pax-wicket.version>
+ <scala.version>2.9.1</scala.version>
+ <scala-plugin.version>2.15.2</scala-plugin.version>
+ <servicemix-nmr.version>1.4.0</servicemix-nmr.version>
+ <slf4j.version>1.6.1</slf4j.version>
</properties>
<modules>
@@ -82,6 +96,34 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>${scala-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -113,6 +155,232 @@
<dependencyManagement>
<dependencies>
+ <!-- features descriptor -->
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>apache-karaf-webconsole</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <!-- WebConsole artifacts -->
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- WebConsole OSGi artifacts -->
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.log</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+
<artifactId>org.apache.karaf.webconsole.osgi.config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+
<artifactId>org.apache.karaf.webconsole.osgi.blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.event</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.scr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- WebConsole Karaf artifacts -->
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.karaf</groupId>
+ <artifactId>org.apache.karaf.webconsole.karaf.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.karaf</groupId>
+
<artifactId>org.apache.karaf.webconsole.karaf.admin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.karaf</groupId>
+
<artifactId>org.apache.karaf.webconsole.karaf.feature</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- WebConsole misc artifacts -->
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.camel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.cxf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.servicemix</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>itest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>manual</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- WebConsole example artifacts -->
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.examples</groupId>
+ <artifactId>branding</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.examples.events</groupId>
+ <artifactId>consumer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.examples.events</groupId>
+ <artifactId>provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.examples</groupId>
+ <artifactId>scala</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole.examples</groupId>
+
<artifactId>org.apache.karaf.webconsole.examples.scr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Aries -->
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ <version>${aries-blueprint.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>${aries-proxy.version}</version>
+ </dependency>
+
+ <!-- ServiceMix -->
+ <dependency>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>org.apache.servicemix.nmr.api</artifactId>
+ <version>${servicemix-nmr.version}</version>
+ </dependency>
+
+ <!-- Camel -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+
+ <!-- CXF -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+
+ <!-- Scala -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+
+ <!-- Wicket and Pax Wicket -->
+ <dependency>
+ <groupId>org.ops4j.pax.wicket</groupId>
+ <artifactId>org.ops4j.pax.wicket.service</artifactId>
+ <version>${pax-wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.wicket</groupId>
+ <artifactId>org.ops4j.pax.wicket.test</artifactId>
+ <version>${pax-wicket.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- logging stuff -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Pax Logging -->
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>${pax-logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>${pax-logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Karaf .. -->
+ <dependency>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.modules</artifactId>
+ <version>${karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ <version>${karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.core</artifactId>
+ <version>${karaf.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix-framework.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
@@ -125,9 +393,32 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${felix-config.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>${felix-scr.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>${felix-utils.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.bridge</artifactId>
+ <version>${felix-http.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.proxy</artifactId>
+ <version>${felix-http.version}</version>
+ </dependency>
+
+
<dependency>
<groupId>org.osgi</groupId>
@@ -139,6 +430,39 @@
<artifactId>org.osgi.compendium</artifactId>
<version>${osgi.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openengsb.labs.paxexam.karaf</groupId>
+ <artifactId>paxexam-karaf-container</artifactId>
+ <version>${pax-exam-karaf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${pax-exam-junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: karaf/webconsole/trunk/servicemix/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/servicemix/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/servicemix/pom.xml (original)
+++ karaf/webconsole/trunk/servicemix/pom.xml Wed Aug 29 19:27:01 2012
@@ -34,49 +34,18 @@
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.api</artifactId>
- <version>${nmr.version}</version>
- </dependency>
-
- <!--
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.9.0</version>
</dependency>
- -->
-
</dependencies>
<build>
- <!--
- <sourceDirectory>src/main/scala</sourceDirectory>
- -->
<plugins>
- <!--
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.15.2</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: karaf/webconsole/trunk/web/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/web/pom.xml?rev=1378690&r1=1378689&r2=1378690&view=diff
==============================================================================
--- karaf/webconsole/trunk/web/pom.xml (original)
+++ karaf/webconsole/trunk/web/pom.xml Wed Aug 29 19:27:01 2012
@@ -30,38 +30,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.bridge</artifactId>
- <version>2.2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.0.2</version>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.proxy</artifactId>
- <version>2.2.0</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -70,51 +45,56 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.bridge</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.wicket</groupId>
<artifactId>org.ops4j.pax.wicket.service</artifactId>
- <version>${ops4j.paxwicket.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
- <version>1.6.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
- <version>1.6.4</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.prefs</artifactId>
- <version>1.0.4</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>0.3</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
<build>
@@ -153,7 +133,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>7.5.4.v20111024</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppConfig>
