You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/10/09 22:31:54 UTC
svn commit: r1180711 - in /camel/branches/camel-2.7.x:
components/camel-smpp/pom.xml parent/pom.xml platforms/karaf/features/pom.xml
Author: cmueller
Date: Sun Oct 9 20:31:54 2011
New Revision: 1180711
URL: http://svn.apache.org/viewvc?rev=1180711&view=rev
Log:
CAMEL-4524: Upgrade jsmpp-bundle to version 2.1.0_3
Modified:
camel/branches/camel-2.7.x/components/camel-smpp/pom.xml
camel/branches/camel-2.7.x/parent/pom.xml
camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml
Modified: camel/branches/camel-2.7.x/components/camel-smpp/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-smpp/pom.xml?rev=1180711&r1=1180710&r2=1180711&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-smpp/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-smpp/pom.xml Sun Oct 9 20:31:54 2011
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
- <version>${smpp-version}</version>
+ <version>${jsmpp-version}</version>
</dependency>
<!-- testing -->
Modified: camel/branches/camel-2.7.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1180711&r1=1180710&r2=1180711&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/parent/pom.xml (original)
+++ camel/branches/camel-2.7.x/parent/pom.xml Sun Oct 9 20:31:54 2011
@@ -97,8 +97,9 @@
<jettison-version>1.2</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
<jibx-version>1.2.2</jibx-version>
- <jruby-version>1.5.2</jruby-version>
- <jsch-version>0.1.44</jsch-version>
+ <jruby-version>1.5.6</jruby-version>
+ <jsmpp-version>2.1.0_3</jsmpp-version>
+ <jsch-version>0.1.44-1</jsch-version>
<juel-version>2.1.2</juel-version>
<junit-version>4.8.1</junit-version>
<karaf-version>2.2.2</karaf-version>
@@ -130,8 +131,12 @@
<slf4j-version>1.6.1</slf4j-version>
<smack-version>3.1.0</smack-version>
<snmp4j-version>1.8.1_3</snmp4j-version>
+<<<<<<< HEAD
<smpp-version>2.1.0_1</smpp-version>
<spring-integration-version>2.0.3.RELEASE</spring-integration-version>
+=======
+ <spring-integration-version>2.0.5.RELEASE</spring-integration-version>
+>>>>>>> b8c45d1... CAMEL-4524: Upgrade jsmpp-bundle to version 2.1.0_3
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-version>3.0.5.RELEASE</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
Modified: camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml?rev=1180711&r1=1180710&r2=1180711&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml Sun Oct 9 20:31:54 2011
@@ -2,7 +2,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
-
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -92,7 +91,8 @@
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<juel-bundle-version>2.1.2_1</juel-bundle-version>
<junit-bundle-version>4.7_1</junit-bundle-version>
- <jsmpp-bundle-version>2.1.0_1</jsmpp-bundle-version>
+ <jsmpp-bundle-version>2.1.0_3</jsmpp-bundle-version>
+ <kxml2-bundle-version>2.3.0_1</kxml2-bundle-version>
<lucene-bundle-version>3.0.3_1</lucene-bundle-version>
<mvel-bundle-version>2.0.8_4</mvel-bundle-version>
<mina-bundle-version>1.1.7_3</mina-bundle-version>