Author: jbonofre
Date: Fri Jan 13 14:01:19 2012
New Revision: 1231070
URL: http://svn.apache.org/viewvc?rev=1231070&view=rev
Log:
Use global properties for dependencies version.
Cleanup the features and plugins in the update feature.
Removed:
karaf/eik/trunk/features/org.apache.karaf.eik.update/features/org.apache.karaf.eik.feature-3.0.0-SNAPSHOT.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/features/org.apache.karaf.eik.jmx.feature-3.0.0-SNAPSHOT.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/features/org.apache.karaf.eik.smk.feature-3.0.0-SNAPSHOT.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/features/org.apache.karaf.eik.wtp.feature-3.0.0-SNAPSHOT.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/plugins/org.apache.aries.jmx.core_1.0.0.201109050850.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/plugins/org.apache.mina.core_2.0.0.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/plugins/org.apache.servicemix.kernel.main_1.1.0.201109050850.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/plugins/org.fusesource.jansi_1.5.0.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/plugins/org.ops4j.pax.url.mvn_1.3.2.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/plugins/org.osgi.jmx_1.0.0.201109050850.jar
karaf/eik/trunk/features/org.apache.karaf.eik.update/plugins/sshd-core_0.5.0.jar
Modified:
karaf/eik/trunk/features/org.apache.karaf.eik.update/pom.xml
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml
karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml
karaf/eik/trunk/plugins/org.apache.mina.core/pom.xml
karaf/eik/trunk/plugins/org.apache.sshd.core/pom.xml
karaf/eik/trunk/plugins/org.fusesource.jansi/pom.xml
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml
karaf/eik/trunk/pom.xml
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.update/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.update/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.update/pom.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.update/pom.xml Fri Jan 13
14:01:19 2012
@@ -36,6 +36,71 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.plugins</groupId>
+
<artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${aries.jmx.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.plugins</groupId>
+
<artifactId>org.apache.aries.jmx.core</artifactId>
+ <version>${aries.jmx.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.plugins</groupId>
+
<artifactId>org.fusesource.jansi</artifactId>
+ <version>${jansi.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.plugins</groupId>
+
<artifactId>org.ops4j.pax.url.mvn</artifactId>
+ <version>${pax.url.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>${sshd.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.features</groupId>
+
<artifactId>org.apache.karaf.eik.feature</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>features</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.features</groupId>
+
<artifactId>org.apache.karaf.eik.jmx.feature</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>features</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.karaf.eik.features</groupId>
+
<artifactId>org.apache.karaf.eik.wtp.feature</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>features</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
@@ -67,6 +132,20 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>plugins</directory>
+ </fileset>
+ <fileset>
+ <directory>features</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml Fri Jan 13
14:01:19 2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>0.3</version>
+ <version>${aries.jmx.version}</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: OSGi JMX RFC Wrapper</name>
@@ -59,20 +59,20 @@
<artifactItem>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${project.version}</version>
+ <version>${aries.jmx.version}</version>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${project.version}</version>
+ <version>${aries.jmx.version}</version>
<classifier>sources</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${project.version}</version>
+ <version>${aries.jmx.version}</version>
<classifier>javadoc</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml Fri Jan 13
14:01:19 2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>0.3</version>
+ <version>${aries.jmx.version}</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: Apache Aries JMX Integration
Wrapper</name>
@@ -59,20 +59,20 @@
<artifactItem>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${project.version}</version>
+ <version>${aries.jmx.version}</version>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${project.version}</version>
+ <version>${aries.jmx.version}</version>
<classifier>sources</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${project.version}</version>
+ <version>${aries.jmx.version}</version>
<classifier>javadoc</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
Modified: karaf/eik/trunk/plugins/org.apache.mina.core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.mina.core/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.mina.core/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.mina.core/pom.xml Fri Jan 13 14:01:19
2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.apache.mina.core</artifactId>
- <version>2.0.1</version>
+ <version>${mina.version}</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: Apache Mina Wrapper</name>
@@ -59,20 +59,20 @@
<artifactItem>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${project.version}</version>
+ <version>${mina.version}</version>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${project.version}</version>
+ <version>${mina.version}</version>
<classifier>sources</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${project.version}</version>
+ <version>${mina.version}</version>
<classifier>javadoc</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
Modified: karaf/eik/trunk/plugins/org.apache.sshd.core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.sshd.core/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.sshd.core/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.sshd.core/pom.xml Fri Jan 13 14:01:19
2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.5.0</version>
+ <version>${sshd.version}</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: Apache SSH Wrapper</name>
@@ -59,20 +59,20 @@
<artifactItem>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>${project.version}</version>
+ <version>${sshd.version}</version>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>${project.version}</version>
+ <version>${sshd.version}</version>
<classifier>sources</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>${project.version}</version>
+ <version>${sshd.version}</version>
<classifier>javadoc</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
Modified: karaf/eik/trunk/plugins/org.fusesource.jansi/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.fusesource.jansi/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.fusesource.jansi/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.fusesource.jansi/pom.xml Fri Jan 13 14:01:19
2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.fusesource.jansi</artifactId>
- <version>1.7</version>
+ <version>${jansi.version}</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: Jansi Wrapper</name>
@@ -59,20 +59,20 @@
<artifactItem>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>${project.version}</version>
+ <version>${jansi.version}</version>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>${project.version}</version>
+ <version>${jansi.version}</version>
<classifier>sources</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>${project.version}</version>
+ <version>${jansi.version}</version>
<classifier>javadoc</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
Modified: karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml Fri Jan 13 14:01:19
2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.ops4j.pax.url.mvn</artifactId>
- <version>1.2.8</version>
+ <version>${pax.url.version}</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: PAX URL MVN Wrapper</name>
@@ -59,13 +59,13 @@
<artifactItem>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
- <version>${project.version}</version>
+ <version>${pax.url.version}</version>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
- <version>${project.version}</version>
+ <version>${pax.url.version}</version>
<classifier>sources</classifier>
<outputDirectory>lib</outputDirectory>
</artifactItem>
Modified: karaf/eik/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/eik/trunk/pom.xml?rev=1231070&r1=1231069&r2=1231070&view=diff
==============================================================================
--- karaf/eik/trunk/pom.xml (original)
+++ karaf/eik/trunk/pom.xml Fri Jan 13 14:01:19 2012
@@ -42,9 +42,14 @@
</swtbot-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</orbit-site>
+ <aries.jmx.version>0.3</aries.jmx.version>
+ <jansi.version>1.7</jansi.version>
<karaf.version>2.2.5</karaf.version>
+ <mina.version>2.0.1</mina.version>
<nmr.version>1.0.0</nmr.version>
+ <pax.url.version>1.2.8</pax.url.version>
<servicemix.version>4.4.0</servicemix.version>
+ <sshd.version>0.5.0</sshd.version>
<integration.version>1.0.0</integration.version>
</properties>
