Author: gnodet
Date: Mon Jun 23 23:56:48 2008
New Revision: 671040
URL: http://svn.apache.org/viewvc?rev=671040&view=rev
Log:
SMX4KNL-57: extract bundles from the svn tree
Removed:
servicemix/smx4/kernel/trunk/bundles/
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/filemonitor/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/jaas/jaas-config/pom.xml
servicemix/smx4/kernel/trunk/main/pom.xml
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/kernel/trunk/spring/pom.xml
servicemix/smx4/kernel/trunk/testing/support/pom.xml
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Mon Jun 23 23:56:48 2008
@@ -120,23 +120,28 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.mina-1.1.6</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.mina</artifactId>
+ <version>${mina.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.aopalliance-1.0</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib-2.1_3</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Mon
Jun 23 23:56:48 2008
@@ -116,7 +116,7 @@
<!-- PAX config -->
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant-${ant.version}</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
<!-- Spring OSGi -->
<include>org.springframework:spring-aop</include>
@@ -126,8 +126,8 @@
<include>org.springframework.osgi:spring-osgi-core</include>
<include>org.springframework.osgi:spring-osgi-extender</include>
<include>org.springframework.osgi:spring-osgi-io</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance-${aopalliance.version}</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib-${cglib.version}</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
<!-- JAAS -->
@@ -135,7 +135,7 @@
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
<!-- GShell -->
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina-${mina.version}</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
Mon Jun 23 23:56:48 2008
@@ -108,7 +108,7 @@
<!-- PAX config -->
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant-${ant.version}</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
<!-- Spring OSGi -->
<include>org.springframework:spring-aop</include>
@@ -118,8 +118,8 @@
<include>org.springframework.osgi:spring-osgi-core</include>
<include>org.springframework.osgi:spring-osgi-extender</include>
<include>org.springframework.osgi:spring-osgi-io</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance-${aopalliance.version}</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib-${cglib.version}</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
<!-- JAAS -->
@@ -127,7 +127,7 @@
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
<!-- GShell -->
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina-${mina.version}</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Mon Jun 23 23:56:48 2008
@@ -34,10 +34,10 @@
#
# The rest of the services..
#
-org.apache.servicemix.bundles.ant-${ant.version}-${pom.version}.jar=50
-org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${pom.version}.jar=50
-org.apache.servicemix.bundles.cglib-${cglib.version}-${pom.version}.jar=50
-org.apache.servicemix.bundles.mina-${mina.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.ant-${ant.version}.jar=50
+org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
+org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
+org.apache.servicemix.bundles.mina-${mina.version}.jar=50
spring-aop-${spring.version}.jar=50
spring-beans-${spring.version}.jar=50
spring-context-${spring.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/filemonitor/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/filemonitor/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/filemonitor/pom.xml Mon Jun 23 23:56:48 2008
@@ -43,8 +43,8 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant-1.7.0</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -58,30 +58,25 @@
<!-- testing -->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
<version>${commons.io.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
<version>${ant.version}</version>
<optional>true</optional>
</dependency>
+
</dependencies>
<build>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Mon Jun 23 23:56:48
2008
@@ -73,8 +73,8 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.cglib-${cglib.version}</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <version>${cglib.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -120,26 +120,61 @@
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-whisper</artifactId>
<version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-whisper</artifactId>
- <version>${gshell.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-ssl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.remote</groupId>
<artifactId>gshell-remote-client</artifactId>
<version>${gshell.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-ssl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.remote</groupId>
<artifactId>gshell-remote-common</artifactId>
<version>${gshell.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-ssl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.remote</groupId>
<artifactId>gshell-remote-server</artifactId>
<version>${gshell.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-ssl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-jexl</groupId>
@@ -187,6 +222,11 @@
<artifactId>slf4j-jdk14</artifactId>
<version>1.4.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.mina</artifactId>
+ <version>${mina.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -225,8 +265,68 @@
<Private-Package>${gshell.osgi.private}</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
+ <unpackBundle>true</unpackBundle>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+
<include>org.apache.geronimo.gshell:gshell-cli</include>
+
<include>org.apache.geronimo.gshell:gshell-command-api</include>
+
<include>org.apache.geronimo.gshell:gshell-core</include>
+ <include>jline:jline</include>
+
<include>commons-jexl:commons-jexl</include>
+
<include>${project.groupId}:${project.artifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+
<artifact>org.apache.geronimo.gshell:gshell-cli</artifact>
+ <excludes>
+
<exclude>org/apache/geronimo/gshell/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>org.apache.geronimo.gshell:gshell-command-api</artifact>
+ <excludes>
+
<exclude>org/apache/geronimo/gshell/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>org.apache.geronimo.gshell:gshell-core</artifact>
+ <excludes>
+
<exclude>org/apache/geronimo/gshell/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>jline:jline</artifact>
+ <excludes>
+ <exclude>jline/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>commons-jexl:commons-jexl</artifact>
+ <excludes>
+
<exclude>org/apache/commons/jexl/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+
<createSourcesJar>${createSourcesJar}</createSourcesJar>
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+
<createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/jaas/jaas-config/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-config/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-config/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-config/pom.xml Mon Jun 23 23:56:48
2008
@@ -60,14 +60,14 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
<version>${aopalliance.version}</version>
<scope>test</scope>
</dependency>
Modified: servicemix/smx4/kernel/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/main/pom.xml Mon Jun 23 23:56:48 2008
@@ -50,8 +50,8 @@
<version>${felix.osgi.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Jun 23 23:56:48 2008
@@ -34,7 +34,6 @@
<inceptionYear>2007</inceptionYear>
<modules>
- <module>bundles</module>
<module>main</module>
<module>filemonitor</module>
<module>testing</module>
@@ -48,8 +47,8 @@
<connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/smx4/kernel/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/smx4/kernel/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/</url>
-
</scm>
+
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/activemq/browse/SMX4KNL</url>
@@ -60,11 +59,11 @@
</prerequisites>
<properties>
- <ant.version>1.7.0</ant.version>
- <aopalliance.version>1.0</aopalliance.version>
- <asm.version>2.2.3</asm.version>
- <cglib.version>2.1_3</cglib.version>
- <commons.io.version>1.3.2</commons.io.version>
+ <ant.version>1.7.0_1-SNAPSHOT</ant.version>
+ <aopalliance.version>1.0_1-SNAPSHOT</aopalliance.version>
+ <asm.version>2.2.3_1-SNAPSHOT</asm.version>
+ <cglib.version>2.1_3_1-SNAPSHOT</cglib.version>
+ <commons.io.version>1.3.2_1-SNAPSHOT</commons.io.version>
<commons.logging.version>1.1.1</commons.logging.version>
<felix.configadmin.version>1.0.0</felix.configadmin.version>
<felix.main.version>1.0.4</felix.main.version>
@@ -76,10 +75,10 @@
<felix.prefs.version>1.0.2</felix.prefs.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<gshell.version>1.0-alpha-2-r654638</gshell.version>
- <junit.version>4.4</junit.version>
+ <junit.version>4.4_1-SNAPSHOT</junit.version>
<jline.version>0.9.94</jline.version>
<log4j.version>1.2.14</log4j.version>
- <mina.version>1.1.6</mina.version>
+ <mina.version>1.1.6_1-SNAPSHOT</mina.version>
<pax.logging.version>1.1.1</pax.logging.version>
<pax.url.version>0.3.0</pax.url.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
@@ -174,18 +173,8 @@
<version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- <version>${mina.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/kernel/trunk/spring/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/spring/pom.xml Mon Jun 23 23:56:48 2008
@@ -52,8 +52,8 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/kernel/trunk/testing/support/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/pom.xml?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/support/pom.xml Mon Jun 23 23:56:48
2008
@@ -106,22 +106,18 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.aopalliance-1.0</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
- <version>${pom.version}</version>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.junit-4.4</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
</dependencies>
Modified:
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java?rev=671040&r1=671039&r2=671040&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
(original)
+++
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
Mon Jun 23 23:56:48 2008
@@ -93,9 +93,9 @@
getBundle("org.apache.felix", "org.apache.felix.configadmin"),
getBundle("org.ops4j.pax.logging", "pax-logging-api"),
getBundle("org.ops4j.pax.logging", "pax-logging-service"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.aopalliance-1.0"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm-2.2.3"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.junit-4.4"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.aopalliance"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.junit"),
getBundle("org.springframework", "spring-beans"),
getBundle("org.springframework", "spring-core"),
getBundle("org.springframework", "spring-context"),
