Permalink
Browse files

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...
1 parent e73181f commit 395ec07140d7a83cf5a376750f81fce2663ff0a1 @splatch splatch committed Aug 29, 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>
View
@@ -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>
View
@@ -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>
View
@@ -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>
@@ -43,18 +43,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
View
@@ -34,46 +34,36 @@
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>apache-karaf-webconsole</artifactId>
- <version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<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>
View
@@ -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>
View
@@ -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>
@@ -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>
View
@@ -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>
View
@@ -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
@@ -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>
View
@@ -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>
View
@@ -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>
Oops, something went wrong. Retry.

0 comments on commit 395ec07

Please sign in to comment.