Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

KARAF-1776 Move all versions to parent pom instead of splitting them …

…across modules

git-svn-id: https://svn.apache.org/repos/asf/karaf/webconsole/trunk@1378690 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 395ec07140d7a83cf5a376750f81fce2663ff0a1 1 parent e73181f
Łukasz Dywicki authored
2  assembly/src/main/resources/features.xml
@@ -17,7 +17,7 @@
17 17
 -->
18 18
 <features name="karaf-webconsole-${project.version}">
19 19
 
20  
-  <repository>mvn:org.ops4j.pax.wicket/features/${ops4j.paxwicket.version}/xml/features</repository>
  20
+  <repository>mvn:org.ops4j.pax.wicket/features/${pax-wicket.version}/xml/features</repository>
21 21
 
22 22
   <feature name="webconsole-wicket" version="${project.version}" description="Karaf Wicket Webconsole">
23 23
     <feature>webconsole-core</feature>
4  camel/pom.xml
@@ -34,13 +34,10 @@
34 34
         <dependency>
35 35
             <groupId>org.apache.karaf.webconsole</groupId>
36 36
             <artifactId>org.apache.karaf.webconsole.core</artifactId>
37  
-            <version>${project.version}</version>
38 37
         </dependency>
39  
-
40 38
         <dependency>
41 39
             <groupId>org.apache.camel</groupId>
42 40
             <artifactId>camel-core</artifactId>
43  
-            <version>${camel.version}</version>
44 41
         </dependency>
45 42
     </dependencies>
46 43
 
@@ -49,7 +46,6 @@
49 46
             <plugin>
50 47
                 <groupId>org.apache.felix</groupId>
51 48
                 <artifactId>maven-bundle-plugin</artifactId>
52  
-                <version>${maven-bundle.version}</version>
53 49
                 <extensions>true</extensions>
54 50
                 <configuration>
55 51
                     <instructions>
14  core/pom.xml
@@ -44,42 +44,36 @@
44 44
         <dependency>
45 45
             <groupId>org.ops4j.pax.wicket</groupId>
46 46
             <artifactId>org.ops4j.pax.wicket.service</artifactId>
47  
-            <version>${ops4j.paxwicket.version}</version>
48 47
         </dependency>
49 48
         <dependency>
50 49
             <groupId>org.apache.karaf.jaas</groupId>
51 50
             <artifactId>org.apache.karaf.jaas.modules</artifactId>
52  
-            <version>${karaf.version}</version>
53 51
         </dependency>
54 52
 
55 53
         <dependency>
56  
-            <groupId>javax.servlet</groupId>
57  
-            <artifactId>servlet-api</artifactId>
58  
-            <version>2.5</version>
  54
+            <groupId>org.apache.geronimo.specs</groupId>
  55
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
59 56
             <scope>provided</scope>
60 57
         </dependency>
61 58
 
62 59
         <dependency>
63 60
             <groupId>junit</groupId>
64 61
             <artifactId>junit</artifactId>
65  
-            <version>4.8.2</version>
66 62
             <scope>test</scope>
67 63
         </dependency>
68 64
         <dependency>
69 65
             <groupId>org.ops4j.pax.wicket</groupId>
70 66
             <artifactId>org.ops4j.pax.wicket.test</artifactId>
71  
-            <version>${ops4j.paxwicket.version}</version>
  67
+            <scope>test</scope>
72 68
         </dependency>
73 69
         <dependency>
74 70
             <groupId>org.slf4j</groupId>
75 71
             <artifactId>slf4j-log4j12</artifactId>
76  
-            <version>${slf4j.version}</version>
77 72
             <scope>test</scope>
78 73
         </dependency>
79 74
         <dependency>
80 75
             <groupId>org.easymock</groupId>
81 76
             <artifactId>easymock</artifactId>
82  
-            <version>3.0</version>
83 77
             <scope>test</scope>
84 78
         </dependency>
85 79
     </dependencies>
@@ -89,7 +83,6 @@
89 83
             <plugin>
90 84
                 <groupId>org.apache.felix</groupId>
91 85
                 <artifactId>maven-bundle-plugin</artifactId>
92  
-                <version>${maven-bundle.version}</version>
93 86
                 <extensions>true</extensions>
94 87
                 <configuration>
95 88
                     <instructions>
@@ -138,7 +131,6 @@
138 131
             <plugin>
139 132
                 <groupId>org.apache.maven.plugins</groupId>
140 133
                 <artifactId>maven-surefire-plugin</artifactId>
141  
-                <version>2.9</version>
142 134
                 <configuration>
143 135
                     <systemProperties>
144 136
                         <property>
3  cxf/pom.xml
@@ -34,13 +34,11 @@
34 34
         <dependency>
35 35
             <groupId>org.apache.karaf.webconsole</groupId>
36 36
             <artifactId>org.apache.karaf.webconsole.core</artifactId>
37  
-            <version>${project.version}</version>
38 37
         </dependency>
39 38
 
40 39
         <dependency>
41 40
             <groupId>org.apache.cxf</groupId>
42 41
             <artifactId>cxf-rt-core</artifactId>
43  
-            <version>${cxf.version}</version>
44 42
         </dependency>
45 43
     </dependencies>
46 44
 
@@ -49,7 +47,6 @@
49 47
             <plugin>
50 48
                 <groupId>org.apache.felix</groupId>
51 49
                 <artifactId>maven-bundle-plugin</artifactId>
52  
-                <version>${maven-bundle.version}</version>
53 50
                 <extensions>true</extensions>
54 51
                 <configuration>
55 52
                     <instructions>
5  examples/branding/pom.xml
@@ -43,7 +43,6 @@
43 43
             <plugin>
44 44
                 <groupId>org.apache.felix</groupId>
45 45
                 <artifactId>maven-bundle-plugin</artifactId>
46  
-                <version>2.3.7</version>
47 46
                 <extensions>true</extensions>
48 47
                 <configuration>
49 48
                     <instructions>
@@ -51,10 +50,6 @@
51 50
                         <Import-Package>
52 51
                             !org.apache.karaf.webconsole.examples.branding,
53 52
                             *,
54  
-<!--                             transient dependencies -->
55  
-<!--                             org.ops4j.pax.wicket.api, -->
56  
-<!--                             org.ops4j.pax.wicket.util, -->
57  
-<!--                             org.ops4j.pax.wicket.util.proxy -->
58 53
                         </Import-Package>
59 54
                     </instructions>
60 55
                 </configuration>
1  examples/events/consumer/pom.xml
@@ -42,7 +42,6 @@
42 42
             <plugin>
43 43
                 <groupId>org.apache.felix</groupId>
44 44
                 <artifactId>maven-bundle-plugin</artifactId>
45  
-                <version>${maven-bundle.version}</version>
46 45
                 <extensions>true</extensions>
47 46
                 <configuration>
48 47
                     <instructions>
1  examples/events/provider/pom.xml
@@ -42,7 +42,6 @@
42 42
             <plugin>
43 43
                 <groupId>org.apache.felix</groupId>
44 44
                 <artifactId>maven-bundle-plugin</artifactId>
45  
-                <version>${maven-bundle.version}</version>
46 45
                 <extensions>true</extensions>
47 46
                 <configuration>
48 47
                     <instructions>
12  examples/scala/pom.xml
@@ -34,12 +34,10 @@
34 34
         <dependency>
35 35
             <groupId>org.apache.karaf.webconsole</groupId>
36 36
             <artifactId>org.apache.karaf.webconsole.core</artifactId>
37  
-            <version>${project.version}</version>
38 37
         </dependency>
39 38
         <dependency>
40 39
             <groupId>org.scala-lang</groupId>
41 40
             <artifactId>scala-library</artifactId>
42  
-            <version>2.9.1</version>
43 41
         </dependency>
44 42
     </dependencies>
45 43
 
@@ -48,20 +46,10 @@
48 46
             <plugin>
49 47
                 <groupId>org.scala-tools</groupId>
50 48
                 <artifactId>maven-scala-plugin</artifactId>
51  
-                <version>2.15.2</version>
52  
-                <executions>
53  
-                    <execution>
54  
-                        <goals>
55  
-                            <goal>compile</goal>
56  
-                            <goal>testCompile</goal>
57  
-                        </goals>
58  
-                    </execution>
59  
-                </executions>
60 49
             </plugin>
61 50
             <plugin>
62 51
                 <groupId>org.apache.felix</groupId>
63 52
                 <artifactId>maven-bundle-plugin</artifactId>
64  
-                <version>${maven-bundle.version}</version>
65 53
                 <extensions>true</extensions>
66 54
                 <configuration>
67 55
                     <instructions>
9  examples/scr/pom.xml
@@ -30,20 +30,11 @@
30 30
     <name>Apache Karaf :: WebConsole :: Examples :: Scr</name>
31 31
     <packaging>bundle</packaging>
32 32
 
33  
-
34  
-<!--     <dependencies> -->
35  
-<!--         <dependency> -->
36  
-<!--             <groupId>org.osgi</groupId> -->
37  
-<!--             <artifactId>org.osgi.compendium</artifactId> -->
38  
-<!--         </dependency> -->
39  
-<!--     </dependencies> -->
40  
-
41 33
     <build>
42 34
         <plugins>
43 35
             <plugin>
44 36
                 <groupId>org.apache.felix</groupId>
45 37
                 <artifactId>maven-bundle-plugin</artifactId>
46  
-                <version>${maven-bundle.version}</version>
47 38
                 <extensions>true</extensions>
48 39
                 <configuration>
49 40
                     <instructions>
10  itest/pom.xml
@@ -34,7 +34,6 @@
34 34
         <dependency>
35 35
             <groupId>org.apache.karaf.webconsole</groupId>
36 36
             <artifactId>apache-karaf-webconsole</artifactId>
37  
-            <version>${project.version}</version>
38 37
             <classifier>features</classifier>
39 38
             <type>xml</type>
40 39
         </dependency>
@@ -42,38 +41,29 @@
42 41
         <dependency>
43 42
             <groupId>org.openengsb.labs.paxexam.karaf</groupId>
44 43
             <artifactId>paxexam-karaf-container</artifactId>
45  
-            <version>0.5.0</version>
46 44
             <scope>test</scope>
47 45
         </dependency>
48 46
         <dependency>
49 47
             <groupId>org.ops4j.pax.exam</groupId>
50 48
             <artifactId>pax-exam-junit4</artifactId>
51  
-            <version>2.3.0</version>
52 49
             <scope>test</scope>
53 50
         </dependency>
54  
-
55 51
         <dependency>
56 52
             <groupId>org.slf4j</groupId>
57 53
             <artifactId>slf4j-log4j12</artifactId>
58  
-            <version>${slf4j.version}</version>
59 54
             <scope>test</scope>
60 55
         </dependency>
61  
-
62 56
         <dependency>
63 57
             <groupId>org.apache.karaf</groupId>
64 58
             <artifactId>karaf</artifactId>
65  
-            <version>${karaf.version}</version>
66 59
             <type>pom</type>
67 60
             <scope>test</scope>
68 61
         </dependency>
69  
-
70 62
         <dependency>
71 63
             <groupId>org.apache.karaf.features</groupId>
72 64
             <artifactId>org.apache.karaf.features.core</artifactId>
73  
-            <version>${karaf.version}</version>
74 65
             <scope>test</scope>
75 66
         </dependency>
76  
-
77 67
     </dependencies>
78 68
 
79 69
     <build>
1  karaf/admin/pom.xml
@@ -47,7 +47,6 @@
47 47
             <plugin>
48 48
                 <groupId>org.apache.felix</groupId>
49 49
                 <artifactId>maven-bundle-plugin</artifactId>
50  
-                <version>${maven-bundle.version}</version>
51 50
                 <extensions>true</extensions>
52 51
                 <configuration>
53 52
                     <instructions>
1  karaf/core/pom.xml
@@ -42,7 +42,6 @@
42 42
             <plugin>
43 43
                 <groupId>org.apache.felix</groupId>
44 44
                 <artifactId>maven-bundle-plugin</artifactId>
45  
-                <version>${maven-bundle.version}</version>
46 45
                 <extensions>true</extensions>
47 46
                 <configuration>
48 47
                     <instructions>
1  karaf/feature/pom.xml
@@ -47,7 +47,6 @@
47 47
             <plugin>
48 48
                 <groupId>org.apache.felix</groupId>
49 49
                 <artifactId>maven-bundle-plugin</artifactId>
50  
-                <version>${maven-bundle.version}</version>
51 50
                 <extensions>true</extensions>
52 51
                 <configuration>
53 52
                     <instructions>
20  karaf/pom.xml
@@ -36,24 +36,4 @@
36 36
         <module>feature</module>
37 37
     </modules>
38 38
 
39  
-    <dependencyManagement>
40  
-        <dependencies>
41  
-            <dependency>
42  
-                <groupId>org.apache.karaf.webconsole</groupId>
43  
-                <artifactId>org.apache.karaf.webconsole.core</artifactId>
44  
-                <version>${project.version}</version>
45  
-            </dependency>
46  
-            <dependency>
47  
-                <groupId>org.apache.karaf.features</groupId>
48  
-                <artifactId>org.apache.karaf.features.core</artifactId>
49  
-                <version>${karaf.version}</version>
50  
-            </dependency>
51  
-            <dependency>
52  
-                <groupId>org.apache.karaf.admin</groupId>
53  
-                <artifactId>org.apache.karaf.admin.core</artifactId>
54  
-                <version>${karaf.version}</version>
55  
-            </dependency>
56  
-        </dependencies>
57  
-    </dependencyManagement>
58  
-
59 39
 </project>
4  manual/pom.xml
@@ -33,7 +33,6 @@
33 33
     <properties>
34 34
         <manual.dir>${project.build.directory}/manual</manual.dir>
35 35
         <manual>${manual.dir}/webconsole-manual-${project.version}</manual>
36  
-        <scala.version>2.9.0-1</scala.version>
37 36
         <scalate.version>1.5.1</scalate.version>
38 37
         <webconsole.version>${project.version}</webconsole.version>
39 38
     </properties>
@@ -52,12 +51,10 @@
52 51
         <dependency>
53 52
             <groupId>org.scala-lang</groupId>
54 53
             <artifactId>scala-library</artifactId>
55  
-            <version>${scala.version}</version>
56 54
         </dependency>
57 55
         <dependency>
58 56
             <groupId>org.scala-lang</groupId>
59 57
             <artifactId>scala-compiler</artifactId>
60  
-            <version>${scala.version}</version>
61 58
         </dependency>
62 59
     </dependencies>
63 60
 
@@ -134,7 +131,6 @@
134 131
             <plugin>
135 132
                 <groupId>org.mortbay.jetty</groupId>
136 133
                 <artifactId>jetty-maven-plugin</artifactId>
137  
-                <version>7.1.5.v20100705</version>
138 134
                 <configuration>
139 135
                     <!-- When editing the conf files, you can comment this line to run
140 136
                         mvn jetty:run
3  osgi/blueprint/pom.xml
@@ -35,11 +35,9 @@
35 35
             <groupId>org.apache.karaf.webconsole.osgi</groupId>
36 36
             <artifactId>org.apache.karaf.webconsole.osgi.core</artifactId>
37 37
         </dependency>
38  
-
39 38
         <dependency>
40 39
             <groupId>org.apache.aries.blueprint</groupId>
41 40
             <artifactId>org.apache.aries.blueprint</artifactId>
42  
-            <version>0.3.1</version>
43 41
         </dependency>
44 42
     </dependencies>
45 43
 
@@ -48,7 +46,6 @@
48 46
             <plugin>
49 47
                 <groupId>org.apache.felix</groupId>
50 48
                 <artifactId>maven-bundle-plugin</artifactId>
51  
-                <version>${maven-bundle.version}</version>
52 49
                 <extensions>true</extensions>
53 50
                 <configuration>
54 51
                     <instructions>
1  osgi/config/pom.xml
@@ -46,7 +46,6 @@
46 46
             <plugin>
47 47
                 <groupId>org.apache.felix</groupId>
48 48
                 <artifactId>maven-bundle-plugin</artifactId>
49  
-                <version>${maven-bundle.version}</version>
50 49
                 <configuration>
51 50
                     <instructions>
52 51
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
6  osgi/core/pom.xml
@@ -34,29 +34,24 @@
34 34
         <dependency>
35 35
             <groupId>org.apache.karaf.webconsole</groupId>
36 36
             <artifactId>org.apache.karaf.webconsole.core</artifactId>
37  
-            <version>${project.version}</version>
38 37
         </dependency>
39 38
         <dependency>
40 39
             <groupId>org.osgi</groupId>
41 40
             <artifactId>org.osgi.compendium</artifactId>
42 41
         </dependency>
43  
-
44 42
         <dependency>
45 43
             <groupId>org.apache.felix</groupId>
46 44
             <artifactId>org.apache.felix.utils</artifactId>
47  
-            <version>1.1.0</version>
48 45
         </dependency>
49 46
 
50 47
         <dependency>
51 48
             <groupId>junit</groupId>
52 49
             <artifactId>junit</artifactId>
53  
-            <version>4.10</version>
54 50
             <scope>test</scope>
55 51
         </dependency>
56 52
         <dependency>
57 53
             <groupId>org.slf4j</groupId>
58 54
             <artifactId>slf4j-log4j12</artifactId>
59  
-            <version>1.6.4</version>
60 55
             <scope>test</scope>
61 56
         </dependency>
62 57
     </dependencies>
@@ -66,7 +61,6 @@
66 61
             <plugin>
67 62
                 <groupId>org.apache.felix</groupId>
68 63
                 <artifactId>maven-bundle-plugin</artifactId>
69  
-                <version>${maven-bundle.version}</version>
70 64
                 <configuration>
71 65
                     <instructions>
72 66
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
1  osgi/event/pom.xml
@@ -46,7 +46,6 @@
46 46
             <plugin>
47 47
                 <groupId>org.apache.felix</groupId>
48 48
                 <artifactId>maven-bundle-plugin</artifactId>
49  
-                <version>${maven-bundle.version}</version>
50 49
                 <configuration>
51 50
                     <instructions>
52 51
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
1  osgi/log/pom.xml
@@ -46,7 +46,6 @@
46 46
             <plugin>
47 47
                 <groupId>org.apache.felix</groupId>
48 48
                 <artifactId>maven-bundle-plugin</artifactId>
49  
-                <version>${maven-bundle.version}</version>
50 49
                 <configuration>
51 50
                     <instructions>
52 51
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
1  osgi/scr/pom.xml
@@ -47,7 +47,6 @@
47 47
             <plugin>
48 48
                 <groupId>org.apache.felix</groupId>
49 49
                 <artifactId>maven-bundle-plugin</artifactId>
50  
-                <version>${maven-bundle.version}</version>
51 50
                 <extensions>true</extensions>
52 51
                 <configuration>
53 52
                     <instructions>
340  pom.xml
@@ -40,19 +40,33 @@
40 40
     </scm>
41 41
 
42 42
     <properties>
43  
-        <osgi.version>4.2.0</osgi.version>
44  
-        <jetty.version>6.1.25</jetty.version>
  43
+        <!-- Please keep properties in alphabetical order -->
  44
+        <aries-blueprint.version>0.3.1</aries-blueprint.version>
  45
+        <aries-proxy.version>0.3</aries-proxy.version>
  46
+        <camel.version>2.6.0</camel.version>
  47
+        <cxf.version>2.5.1</cxf.version>
  48
+        <easymock.version>3.0</easymock.version>
  49
+        <felix-framework.version>4.0.2</felix-framework.version>
45 50
         <felix-metatype.version>1.0.4</felix-metatype.version>
46 51
         <felix-prefs.version>1.0.4</felix-prefs.version>
47 52
         <felix-scr.version>1.6.0</felix-scr.version>
48  
-        <slf4j.version>1.6.1</slf4j.version>
49  
-        <log4j.version>1.2.14</log4j.version>
50  
-        <ops4j.paxwicket.version>1.1.0</ops4j.paxwicket.version>
  53
+        <felix-utils.version>1.1.0</felix-utils.version>
  54
+        <felix-config.version>1.2.8</felix-config.version>
  55
+        <felix-http.version>2.2.0</felix-http.version>
  56
+        <jetty-plugin.version>7.5.4.v20111024</jetty-plugin.version>
  57
+        <junit.version>4.8.2</junit.version>
51 58
         <karaf.version>2.2.8</karaf.version>
52  
-        <nmr.version>1.4.0</nmr.version>
53  
-        <camel.version>2.6.0</camel.version>
54  
-        <cxf.version>2.5.1</cxf.version>
  59
+        <log4j.version>1.2.14</log4j.version>
55 60
         <maven-bundle.version>2.3.7</maven-bundle.version>
  61
+        <osgi.version>4.2.0</osgi.version>
  62
+        <pax-exam-karaf.version>0.5.0</pax-exam-karaf.version>
  63
+        <pax-exam-junit.version>2.3.0</pax-exam-junit.version>
  64
+        <pax-logging.version>1.6.4</pax-logging.version>
  65
+        <pax-wicket.version>1.1.0</pax-wicket.version>
  66
+        <scala.version>2.9.1</scala.version>
  67
+        <scala-plugin.version>2.15.2</scala-plugin.version>
  68
+        <servicemix-nmr.version>1.4.0</servicemix-nmr.version>
  69
+        <slf4j.version>1.6.1</slf4j.version>
56 70
     </properties>
57 71
 
58 72
     <modules>
@@ -82,6 +96,34 @@
82 96
                         <target>1.5</target>
83 97
                     </configuration>
84 98
                 </plugin>
  99
+                <plugin>
  100
+                    <groupId>org.apache.maven.plugins</groupId>
  101
+                    <artifactId>maven-surefire-plugin</artifactId>
  102
+                    <version>2.9</version>
  103
+                </plugin>
  104
+                <plugin>
  105
+                    <groupId>org.apache.felix</groupId>
  106
+                    <artifactId>maven-bundle-plugin</artifactId>
  107
+                    <version>${maven-bundle.version}</version>
  108
+                </plugin>
  109
+                <plugin>
  110
+                    <groupId>org.scala-tools</groupId>
  111
+                    <artifactId>maven-scala-plugin</artifactId>
  112
+                    <version>${scala-plugin.version}</version>
  113
+                    <executions>
  114
+                        <execution>
  115
+                            <goals>
  116
+                                <goal>compile</goal>
  117
+                                <goal>testCompile</goal>
  118
+                            </goals>
  119
+                        </execution>
  120
+                    </executions>
  121
+                </plugin>
  122
+                <plugin>
  123
+                    <groupId>org.mortbay.jetty</groupId>
  124
+                    <artifactId>jetty-maven-plugin</artifactId>
  125
+                    <version>${jetty-plugin.version}</version>
  126
+                </plugin>
85 127
             </plugins>
86 128
         </pluginManagement>
87 129
     </build>
@@ -113,6 +155,232 @@
113 155
 
114 156
     <dependencyManagement>
115 157
         <dependencies>
  158
+            <!-- features descriptor -->
  159
+            <dependency>
  160
+                <groupId>org.apache.karaf.webconsole</groupId>
  161
+                <artifactId>apache-karaf-webconsole</artifactId>
  162
+                <version>${project.version}</version>
  163
+                <classifier>features</classifier>
  164
+                <type>xml</type>
  165
+            </dependency>
  166
+            <!-- WebConsole artifacts -->
  167
+            <dependency>
  168
+                <groupId>org.apache.karaf.webconsole</groupId>
  169
+                <artifactId>org.apache.karaf.webconsole.core</artifactId>
  170
+                <version>${project.version}</version>
  171
+            </dependency>
  172
+            <!-- WebConsole OSGi artifacts -->
  173
+            <dependency>
  174
+                <groupId>org.apache.karaf.webconsole.osgi</groupId>
  175
+                <artifactId>org.apache.karaf.webconsole.osgi.log</artifactId>
  176
+                <version>${project.version}</version>
  177
+            </dependency>
  178
+            <dependency>
  179
+                <groupId>org.apache.karaf.webconsole.osgi</groupId>
  180
+                <artifactId>org.apache.karaf.webconsole.osgi.config</artifactId>
  181
+                <version>${project.version}</version>
  182
+            </dependency>
  183
+            <dependency>
  184
+                <groupId>org.apache.karaf.webconsole.osgi</groupId>
  185
+                <artifactId>org.apache.karaf.webconsole.osgi.blueprint</artifactId>
  186
+                <version>${project.version}</version>
  187
+            </dependency>
  188
+            <dependency>
  189
+                <groupId>org.apache.karaf.webconsole.osgi</groupId>
  190
+                <artifactId>org.apache.karaf.webconsole.osgi.event</artifactId>
  191
+                <version>${project.version}</version>
  192
+            </dependency>
  193
+            <dependency>
  194
+                <groupId>org.apache.karaf.webconsole.osgi</groupId>
  195
+                <artifactId>org.apache.karaf.webconsole.osgi.scr</artifactId>
  196
+                <version>${project.version}</version>
  197
+            </dependency>
  198
+            <dependency>
  199
+                <groupId>org.apache.karaf.webconsole.osgi</groupId>
  200
+                <artifactId>org.apache.karaf.webconsole.osgi.core</artifactId>
  201
+                <version>${project.version}</version>
  202
+            </dependency>
  203
+            <!-- WebConsole Karaf artifacts -->
  204
+            <dependency>
  205
+                <groupId>org.apache.karaf.webconsole.karaf</groupId>
  206
+                <artifactId>org.apache.karaf.webconsole.karaf.core</artifactId>
  207
+                <version>${project.version}</version>
  208
+            </dependency>
  209
+            <dependency>
  210
+                <groupId>org.apache.karaf.webconsole.karaf</groupId>
  211
+                <artifactId>org.apache.karaf.webconsole.karaf.admin</artifactId>
  212
+                <version>${project.version}</version>
  213
+            </dependency>
  214
+            <dependency>
  215
+                <groupId>org.apache.karaf.webconsole.karaf</groupId>
  216
+                <artifactId>org.apache.karaf.webconsole.karaf.feature</artifactId>
  217
+                <version>${project.version}</version>
  218
+            </dependency>
  219
+            <!--  WebConsole misc artifacts -->
  220
+            <dependency>
  221
+                <groupId>org.apache.karaf.webconsole</groupId>
  222
+                <artifactId>org.apache.karaf.webconsole.camel</artifactId>
  223
+                <version>${project.version}</version>
  224
+            </dependency>
  225
+            <dependency>
  226
+                <groupId>org.apache.karaf.webconsole</groupId>
  227
+                <artifactId>org.apache.karaf.webconsole.cxf</artifactId>
  228
+                <version>${project.version}</version>
  229
+            </dependency>
  230
+            <dependency>
  231
+                <groupId>org.apache.karaf.webconsole</groupId>
  232
+                <artifactId>org.apache.karaf.webconsole.servicemix</artifactId>
  233
+                <version>${project.version}</version>
  234
+            </dependency>
  235
+            <dependency>
  236
+                <groupId>org.apache.karaf.webconsole</groupId>
  237
+                <artifactId>itest</artifactId>
  238
+                <version>${project.version}</version>
  239
+            </dependency>
  240
+            <dependency>
  241
+                <groupId>org.apache.karaf.webconsole</groupId>
  242
+                <artifactId>manual</artifactId>
  243
+                <version>${project.version}</version>
  244
+            </dependency>
  245
+            <!-- WebConsole example artifacts -->
  246
+            <dependency>
  247
+                <groupId>org.apache.karaf.webconsole.examples</groupId>
  248
+                <artifactId>branding</artifactId>
  249
+                <version>${project.version}</version>
  250
+            </dependency>
  251
+            <dependency>
  252
+                <groupId>org.apache.karaf.webconsole.examples.events</groupId>
  253
+                <artifactId>consumer</artifactId>
  254
+                <version>${project.version}</version>
  255
+            </dependency>
  256
+            <dependency>
  257
+                <groupId>org.apache.karaf.webconsole.examples.events</groupId>
  258
+                <artifactId>provider</artifactId>
  259
+                <version>${project.version}</version>
  260
+            </dependency>
  261
+            <dependency>
  262
+                <groupId>org.apache.karaf.webconsole.examples</groupId>
  263
+                <artifactId>scala</artifactId>
  264
+                <version>${project.version}</version>
  265
+            </dependency>
  266
+            <dependency>
  267
+                <groupId>org.apache.karaf.webconsole.examples</groupId>
  268
+                <artifactId>org.apache.karaf.webconsole.examples.scr</artifactId>
  269
+                <version>${project.version}</version>
  270
+            </dependency>
  271
+
  272
+            <!-- Aries -->
  273
+            <dependency>
  274
+                <groupId>org.apache.aries.blueprint</groupId>
  275
+                <artifactId>org.apache.aries.blueprint</artifactId>
  276
+                <version>${aries-blueprint.version}</version>
  277
+            </dependency>
  278
+            <dependency>
  279
+                <groupId>org.apache.aries.proxy</groupId>
  280
+                <artifactId>org.apache.aries.proxy.impl</artifactId>
  281
+                <version>${aries-proxy.version}</version>
  282
+            </dependency>
  283
+
  284
+            <!-- ServiceMix -->
  285
+            <dependency>
  286
+                <groupId>org.apache.servicemix.nmr</groupId>
  287
+                <artifactId>org.apache.servicemix.nmr.api</artifactId>
  288
+                <version>${servicemix-nmr.version}</version>
  289
+            </dependency>
  290
+
  291
+            <!-- Camel -->
  292
+            <dependency>
  293
+                <groupId>org.apache.camel</groupId>
  294
+                <artifactId>camel-core</artifactId>
  295
+                <version>${camel.version}</version>
  296
+            </dependency>
  297
+
  298
+            <!-- CXF -->
  299
+            <dependency>
  300
+                <groupId>org.apache.cxf</groupId>
  301
+                <artifactId>cxf-rt-core</artifactId>
  302
+                <version>${cxf.version}</version>
  303
+            </dependency>
  304
+
  305
+            <!-- Scala -->
  306
+            <dependency>
  307
+                <groupId>org.scala-lang</groupId>
  308
+                <artifactId>scala-library</artifactId>
  309
+                <version>${scala.version}</version>
  310
+            </dependency>
  311
+            <dependency>
  312
+                <groupId>org.scala-lang</groupId>
  313
+                <artifactId>scala-compiler</artifactId>
  314
+                <version>${scala.version}</version>
  315
+            </dependency>
  316
+
  317
+            <!-- Wicket and Pax Wicket -->
  318
+            <dependency>
  319
+                <groupId>org.ops4j.pax.wicket</groupId>
  320
+                <artifactId>org.ops4j.pax.wicket.service</artifactId>
  321
+                <version>${pax-wicket.version}</version>
  322
+            </dependency>
  323
+               <dependency>
  324
+                <groupId>org.ops4j.pax.wicket</groupId>
  325
+                <artifactId>org.ops4j.pax.wicket.test</artifactId>
  326
+                <version>${pax-wicket.version}</version>
  327
+                <scope>test</scope>
  328
+            </dependency>
  329
+
  330
+            <!-- logging stuff -->
  331
+            <dependency>
  332
+                <groupId>org.slf4j</groupId>
  333
+                <artifactId>slf4j-api</artifactId>
  334
+                <version>${slf4j.version}</version>
  335
+            </dependency>
  336
+            <dependency>
  337
+                <groupId>org.slf4j</groupId>
  338
+                <artifactId>slf4j-log4j12</artifactId>
  339
+                <version>${slf4j.version}</version>
  340
+            </dependency>
  341
+
  342
+            <!-- Pax Logging -->
  343
+            <dependency>
  344
+                <groupId>org.ops4j.pax.logging</groupId>
  345
+                <artifactId>pax-logging-api</artifactId>
  346
+                <version>${pax-logging.version}</version>
  347
+                <scope>provided</scope>
  348
+            </dependency>
  349
+            <dependency>
  350
+                <groupId>org.ops4j.pax.logging</groupId>
  351
+                <artifactId>pax-logging-service</artifactId>
  352
+                <version>${pax-logging.version}</version>
  353
+                <scope>provided</scope>
  354
+            </dependency>
  355
+
  356
+            <!-- Karaf .. -->
  357
+            <dependency>
  358
+                <groupId>org.apache.karaf.jaas</groupId>
  359
+                <artifactId>org.apache.karaf.jaas.modules</artifactId>
  360
+                <version>${karaf.version}</version>
  361
+            </dependency>
  362
+            <dependency>
  363
+                <groupId>org.apache.karaf</groupId>
  364
+                <artifactId>karaf</artifactId>
  365
+                <version>${karaf.version}</version>
  366
+                <type>pom</type>
  367
+            </dependency>
  368
+            <dependency>
  369
+                <groupId>org.apache.karaf.features</groupId>
  370
+                <artifactId>org.apache.karaf.features.core</artifactId>
  371
+                <version>${karaf.version}</version>
  372
+            </dependency>
  373
+            <dependency>
  374
+                <groupId>org.apache.karaf.admin</groupId>
  375
+                <artifactId>org.apache.karaf.admin.core</artifactId>
  376
+                <version>${karaf.version}</version>
  377
+            </dependency>
  378
+
  379
+            <dependency>
  380
+                <groupId>org.apache.felix</groupId>
  381
+                <artifactId>org.apache.felix.framework</artifactId>
  382
+                <version>${felix-framework.version}</version>
  383
+            </dependency>
116 384
             <dependency>
117 385
                 <groupId>org.apache.felix</groupId>
118 386
                 <artifactId>org.apache.felix.metatype</artifactId>
@@ -125,9 +393,32 @@
125 393
             </dependency>
126 394
             <dependency>
127 395
                 <groupId>org.apache.felix</groupId>
  396
+                <artifactId>org.apache.felix.configadmin</artifactId>
  397
+                <version>${felix-config.version}</version>
  398
+            </dependency>
  399
+            <dependency>
  400
+                <groupId>org.apache.felix</groupId>
128 401
                 <artifactId>org.apache.felix.scr</artifactId>
129 402
                 <version>${felix-scr.version}</version>
130 403
             </dependency>
  404
+            <dependency>
  405
+                <groupId>org.apache.felix</groupId>
  406
+                <artifactId>org.apache.felix.utils</artifactId>
  407
+                <version>${felix-utils.version}</version>
  408
+            </dependency>
  409
+            <dependency>
  410
+                <groupId>org.apache.felix</groupId>
  411
+                <artifactId>org.apache.felix.http.bridge</artifactId>
  412
+                <version>${felix-http.version}</version>
  413
+                <scope>provided</scope>
  414
+            </dependency>
  415
+            <dependency>
  416
+                <groupId>org.apache.felix</groupId>
  417
+                <artifactId>org.apache.felix.http.proxy</artifactId>
  418
+                <version>${felix-http.version}</version>
  419
+            </dependency>
  420
+    
  421
+                
131 422
 
132 423
             <dependency>
133 424
                 <groupId>org.osgi</groupId>
@@ -139,6 +430,39 @@
139 430
                 <artifactId>org.osgi.compendium</artifactId>
140 431
                 <version>${osgi.version}</version>
141 432
             </dependency>
  433
+
  434
+            <dependency>
  435
+                <groupId>org.apache.geronimo.specs</groupId>
  436
+                <artifactId>geronimo-servlet_2.5_spec</artifactId>
  437
+                <version>1.2</version>
  438
+                <scope>provided</scope>
  439
+            </dependency>
  440
+
  441
+            <!-- testing -->
  442
+            <dependency>
  443
+                <groupId>junit</groupId>
  444
+                <artifactId>junit</artifactId>
  445
+                <version>${junit.version}</version>
  446
+                <scope>test</scope>
  447
+            </dependency>
  448
+            <dependency>
  449
+                <groupId>org.easymock</groupId>
  450
+                <artifactId>easymock</artifactId>
  451
+                <version>${easymock.version}</version>
  452
+                <scope>test</scope>
  453
+            </dependency>
  454
+            <dependency>
  455
+                <groupId>org.openengsb.labs.paxexam.karaf</groupId>
  456
+                <artifactId>paxexam-karaf-container</artifactId>
  457
+                <version>${pax-exam-karaf.version}</version>
  458
+                <scope>test</scope>
  459
+            </dependency>
  460
+            <dependency>
  461
+                <groupId>org.ops4j.pax.exam</groupId>
  462
+                <artifactId>pax-exam-junit4</artifactId>
  463
+                <version>${pax-exam-junit.version}</version>
  464
+                <scope>test</scope>
  465
+            </dependency>
142 466
         </dependencies>
143 467
     </dependencyManagement>
144 468
 
31  servicemix/pom.xml
@@ -34,49 +34,18 @@
34 34
         <dependency>
35 35
             <groupId>org.apache.karaf.webconsole</groupId>
36 36
             <artifactId>org.apache.karaf.webconsole.core</artifactId>
37  
-            <version>${project.version}</version>
38 37
         </dependency>
39  
-
40 38
         <dependency>
41 39
             <groupId>org.apache.servicemix.nmr</groupId>
42 40
             <artifactId>org.apache.servicemix.nmr.api</artifactId>
43  
-            <version>${nmr.version}</version>
44  
-        </dependency>
45  
-
46  
-        <!--
47  
-        <dependency>
48  
-            <groupId>org.scala-lang</groupId>
49  
-            <artifactId>scala-library</artifactId>
50  
-            <version>2.9.0</version>
51 41
         </dependency>
52  
-        -->
53  
- 
54 42
     </dependencies>
55 43
 
56 44
     <build>
57  
-        <!--
58  
-        <sourceDirectory>src/main/scala</sourceDirectory>
59  
-        -->
60 45
         <plugins>
61  
-            <!--
62  
-            <plugin>
63  
-                <groupId>org.scala-tools</groupId>
64  
-                <artifactId>maven-scala-plugin</artifactId>
65  
-                <version>2.15.2</version>
66  
-                <executions>
67  
-                    <execution>
68  
-                        <goals>
69  
-                            <goal>compile</goal>
70  
-                            <goal>testCompile</goal>
71  
-                        </goals>
72  
-                    </execution>
73  
-                </executions>
74  
-            </plugin>
75  
-            -->
76 46
             <plugin>
77 47
                 <groupId>org.apache.felix</groupId>
78 48
                 <artifactId>maven-bundle-plugin</artifactId>
79  
-                <version>${maven-bundle.version}</version>
80 49
                 <extensions>true</extensions>
81 50
                 <configuration>
82 51
                     <instructions>
59  web/pom.xml
@@ -30,38 +30,13 @@
30 30
 
31 31
     <dependencies>
32 32
         <dependency>
33  
-            <groupId>org.apache.karaf.webconsole</groupId>
34  
-            <artifactId>org.apache.karaf.webconsole.core</artifactId>
35  
-            <version>${project.version}</version>
36  
-            <scope>provided</scope>
37  
-        </dependency>
38  
-
39  
-        <dependency>
40  
-            <groupId>org.apache.felix</groupId>
41  
-            <artifactId>org.apache.felix.http.bridge</artifactId>
42  
-            <version>2.2.0</version>
43  
-            <scope>provided</scope>
44  
-        </dependency>
45  
-
46  
-        <dependency>
47 33
             <groupId>org.apache.felix</groupId>
48 34
             <artifactId>org.apache.felix.framework</artifactId>
49  
-            <version>4.0.2</version>
50 35
         </dependency>
51  
-
52 36
         <dependency>
53 37
             <groupId>org.apache.felix</groupId>
54 38
             <artifactId>org.apache.felix.http.proxy</artifactId>
55  
-            <version>2.2.0</version>
56  
-        </dependency>
57  
-
58  
-        <dependency>
59  
-            <groupId>javax.servlet</groupId>
60  
-            <artifactId>servlet-api</artifactId>
61  
-            <version>2.5</version>
62  
-            <scope>provided</scope>
63 39
         </dependency>
64  
-
65 40
         <dependency>
66 41
             <groupId>org.osgi</groupId>
67 42
             <artifactId>org.osgi.core</artifactId>
@@ -70,51 +45,56 @@
70 45
             <groupId>org.osgi</groupId>
71 46
             <artifactId>org.osgi.compendium</artifactId>
72 47
         </dependency>
  48
+        <dependency>
  49
+            <groupId>org.slf4j</groupId>
  50
+            <artifactId>slf4j-api</artifactId>
  51
+        </dependency>
73 52
 
74 53
         <dependency>
  54
+            <groupId>org.apache.karaf.webconsole</groupId>
  55
+            <artifactId>org.apache.karaf.webconsole.core</artifactId>
  56
+            <scope>provided</scope>
  57
+        </dependency>
  58
+        <dependency>
  59
+            <groupId>org.apache.felix</groupId>
  60
+            <artifactId>org.apache.felix.http.bridge</artifactId>
  61
+            <scope>provided</scope>
  62
+        </dependency>
  63
+        <dependency>
  64
+            <groupId>org.apache.geronimo.specs</groupId>
  65
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
  66
+            <scope>provided</scope>
  67
+        </dependency>
  68
+        <dependency>
75 69
             <groupId>org.ops4j.pax.wicket</groupId>
76 70
             <artifactId>org.ops4j.pax.wicket.service</artifactId>
77  
-            <version>${ops4j.paxwicket.version}</version>
78 71
             <scope>provided</scope>
79 72
         </dependency>
80 73
         <dependency>
81 74
             <groupId>org.ops4j.pax.logging</groupId>
82 75
             <artifactId>pax-logging-api</artifactId>
83  
-            <version>1.6.4</version>
84 76
             <scope>provided</scope>
85 77
         </dependency>
86 78
         <dependency>
87 79
             <groupId>org.ops4j.pax.logging</groupId>
88 80
             <artifactId>pax-logging-service</artifactId>
89  
-            <version>1.6.4</version>
90 81
             <scope>provided</scope>
91 82
         </dependency>
92  
-
93 83
         <dependency>
94 84
             <groupId>org.apache.felix</groupId>
95 85
             <artifactId>org.apache.felix.configadmin</artifactId>
96  
-            <version>1.2.8</version>
97 86
             <scope>provided</scope>
98 87
         </dependency>
99 88
         <dependency>
100 89
             <groupId>org.apache.felix</groupId>
101 90
             <artifactId>org.apache.felix.prefs</artifactId>
102  
-            <version>1.0.4</version>
103 91
             <scope>provided</scope>
104 92
         </dependency>
105  
-
106 93
         <dependency>
107 94
             <groupId>org.apache.aries.proxy</groupId>
108 95
             <artifactId>org.apache.aries.proxy.impl</artifactId>
109  
-            <version>0.3</version>
110 96
             <scope>provided</scope>
111 97
         </dependency>
112  
-
113  
-        <dependency>
114  
-            <groupId>org.slf4j</groupId>
115  
-            <artifactId>slf4j-api</artifactId>
116  
-            <version>${slf4j.version}</version>
117  
-        </dependency>
118 98
     </dependencies>
119 99
 
120 100
     <build>
@@ -153,7 +133,6 @@
153 133
             <plugin>
154 134
                 <groupId>org.mortbay.jetty</groupId>
155 135
                 <artifactId>jetty-maven-plugin</artifactId>
156  
-                <version>7.5.4.v20111024</version>
157 136
                 <configuration>
158 137
                     <scanIntervalSeconds>10</scanIntervalSeconds>
159 138
                     <webAppConfig>

0 notes on commit 395ec07

Please sign in to comment.
Something went wrong with that request. Please try again.