You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/09/22 03:13:26 UTC
svn commit: r817465 - in /servicemix/components:
bindings/servicemix-jms/trunk/pom.xml components-pom/trunk/pom.xml
engines/servicemix-eip/trunk/pom.xml
shared-libraries/trunk/servicemix-common/pom.xml
Author: ccustine
Date: Tue Sep 22 01:13:25 2009
New Revision: 817465
URL: http://svn.apache.org/viewvc?rev=817465&view=rev
Log:
SMXCOMP-636 - Upgrade components to use Jencks 2.2
Modified:
servicemix/components/bindings/servicemix-jms/trunk/pom.xml
servicemix/components/components-pom/trunk/pom.xml
servicemix/components/engines/servicemix-eip/trunk/pom.xml
servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml
Modified: servicemix/components/bindings/servicemix-jms/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/pom.xml?rev=817465&r1=817464&r2=817465&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/pom.xml Tue Sep 22 01:13:25 2009
@@ -44,7 +44,6 @@
<servicemix-version>3.3</servicemix-version>
<servicemix-shared-version>2009.02-SNAPSHOT</servicemix-shared-version>
<activemq-version>5.2.0</activemq-version>
- <jencks-version>2.1</jencks-version>
<servicemix.osgi.import>
javax.security.auth,
@@ -116,7 +115,6 @@
<dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
- <version>${jencks-version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -125,28 +123,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>2.0.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
<version>${servicemix-version}</version>
@@ -165,28 +141,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_provider</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
@@ -293,10 +247,22 @@
<dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks-amqpool</artifactId>
- <version>${jencks-version}</version>
+ <version>${jencks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<version>0.3.1</version>
Modified: servicemix/components/components-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/components-pom/trunk/pom.xml?rev=817465&r1=817464&r2=817465&view=diff
==============================================================================
--- servicemix/components/components-pom/trunk/pom.xml (original)
+++ servicemix/components/components-pom/trunk/pom.xml Tue Sep 22 01:13:25 2009
@@ -49,9 +49,12 @@
<servicemix-utils-version>1.2.0-SNAPSHOT</servicemix-utils-version>
<!-- Common runtime dependencies -->
- <spring-version>2.5.6</spring-version>
+ <spring-version>2.5.6.SEC01</spring-version>
<commons-logging-version>1.1.1</commons-logging-version>
<geronimo-jta-api-version>1.1.1</geronimo-jta-api-version>
+ <jencks.version>2.2</jencks.version>
+ <slf4j.version>1.5.8</slf4j.version>
+ <log4j.version>1.2.14</log4j.version>
<!-- Common XML Parsers -->
<stax-api-version>1.0.1</stax-api-version>
@@ -253,6 +256,38 @@
</dependency>
<dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks</artifactId>
+ <version>${jencks.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock-version}</version>
Modified: servicemix/components/engines/servicemix-eip/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/pom.xml?rev=817465&r1=817464&r2=817465&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-eip/trunk/pom.xml Tue Sep 22 01:13:25 2009
@@ -81,15 +81,20 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -118,7 +123,7 @@
<dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
- <version>2.1</version>
+ <version>${jencks.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml?rev=817465&r1=817464&r2=817465&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml Tue Sep 22 01:13:25 2009
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
- <version>2.1</version>
+ <version>${jencks.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>