Author: ningjiang
Date: Thu Feb 25 09:28:59 2010
New Revision: 916194
URL: http://svn.apache.org/viewvc?rev=916194&view=rev
Log:
CAMEL-2473 CAMEL-2474 Upgrade the version of snmp4j and ognl bundles
Modified:
camel/trunk/components/camel-ognl/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-ognl/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/pom.xml?rev=916194&r1=916193&r2=916194&view=diff
==============================================================================
--- camel/trunk/components/camel-ognl/pom.xml (original)
+++ camel/trunk/components/camel-ognl/pom.xml Thu Feb 25 09:28:59 2010
@@ -33,9 +33,16 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.language.ognl.*</camel.osgi.export.pkg>
</properties>
+
+ <repositories>
+ <repository>
+ <id>com.springsource.repository.bundles.external</id>
+ <name>SpringSource Enterprise Bundle Repository - External Bundle
Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/external</url>
+ </repository>
+ </repositories>
<dependencies>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
@@ -43,8 +50,21 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ognl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- using the javassist from spring osgi bundle repo -->
+ <dependency>
+ <groupId>org.jboss.javassist</groupId>
+ <artifactId>com.springsource.javassist</artifactId>
+ <version>${javassist-version}</version>
</dependency>
-
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=916194&r1=916193&r2=916194&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Feb 25 09:28:59 2010
@@ -73,6 +73,7 @@
<httpcore4-version>4.0.1</httpcore4-version>
<httpclient4-version>4.0.1</httpclient4-version>
<httpclient-version>3.1</httpclient-version>
+ <javassist-version>3.9.0.GA</javassist-version>
<javax-mail-version>1.4.3</javax-mail-version>
<jaxb-version>2.1.12</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
@@ -86,7 +87,7 @@
<lucene-version>3.0.0</lucene-version>
<mina-version>1.1.7</mina-version>
<mockito-version>1.8.2</mockito-version>
- <ognl-version>2.7.3_1</ognl-version>
+ <ognl-version>2.7.3_3</ognl-version>
<openjpa-version>1.2.2</openjpa-version>
<pax-exam-version>1.2.0</pax-exam-version>
<pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
@@ -98,7 +99,7 @@
<scala-plugin-version>2.9.1</scala-plugin-version>
<slf4j-version>1.5.10</slf4j-version>
<smack-version>3.1.0</smack-version>
- <snmp4j-version>1.8.1_1</snmp4j-version>
+ <snmp4j-version>1.8.1_3</snmp4j-version>
<spring-ehcache-version>1.6.2</spring-ehcache-version>
<spring-integration-version>1.0.3.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=916194&r1=916193&r2=916194&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Feb 25 09:28:59 2010
@@ -87,7 +87,6 @@
<mvel-bundle-version>2.0.8_3</mvel-bundle-version>
<mina-bundle-version>1.1.7_3</mina-bundle-version>
<neethi-bundle-version>2.0.4_2</neethi-bundle-version>
- <ognl-bundle-version>2.7.3_3</ognl-bundle-version>
<oro-bundle-version>2.0.8_3</oro-bundle-version>
<openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
<oscache-bundle-version>2.4_3</oscache-bundle-version>
@@ -98,7 +97,6 @@
<servicemix-specs-version>1.4.0</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_2</serp-bundle-version>
- <snmp4j-bundle-version>1.8.1_3</snmp4j-bundle-version>
<smack-bundle-version>3.0.4_2</smack-bundle-version>
<spring-version>2.5.6.SEC01</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=916194&r1=916193&r2=916194&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Feb 25 09:28:59 2010
@@ -335,6 +335,7 @@
<feature name='camel-ognl' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}</bundle>
+
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.jboss.javassist/com.springsource.javassist/${javassist-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
<feature name='camel-printer' version='${pom.version}'>
@@ -395,7 +396,7 @@
</feature>
<feature name='camel-snmp' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j-version}</bundle>
<bundle>mvn:org.apache.camel/camel-snmp/${pom.version}</bundle>
</feature>
<feature name='camel-spring-integration' version='${pom.version}'>
