Author: davsclaus
Date: Thu Jan 31 13:57:07 2013
New Revision: 1440959
URL: http://svn.apache.org/viewvc?rev=1440959&view=rev
Log:
Upgrade to gae and hbase
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1440959&r1=1440958&r2=1440959&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 31 13:57:07 2013
@@ -142,7 +142,7 @@
<geronimo-servlet-spec-version>1.2</geronimo-servlet-spec-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmaven-plugin-version>1.4</gmaven-plugin-version>
- <google-app-engine-version>1.6.6</google-app-engine-version>
+ <google-app-engine-version>1.7.4</google-app-engine-version>
<google-gdata-version>1.41.5.w1</google-gdata-version>
<google-guava-version>13.0.1</google-guava-version>
<groovy-version>2.1.0</groovy-version>
@@ -157,8 +157,8 @@
<hawtdb-version>1.6</hawtdb-version>
<hawtdispatch-version>1.13</hawtdispatch-version>
<hazelcast-version>2.5</hazelcast-version>
- <hbase-version>0.94.2</hbase-version>
- <hbase-bundle-version>0.94.2_1</hbase-bundle-version>
+ <hbase-version>0.94.3</hbase-version>
+ <hbase-bundle-version>0.94.3_1</hbase-bundle-version>
<hibernate-validator-bundle-version>4.1.0.Final_3</hibernate-validator-bundle-version>
<hibernate-version>4.1.9.Final</hibernate-version>
<httpunit-version>1.7</httpunit-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=1440959&r1=1440958&r2=1440959&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Jan 31 13:57:07 2013
@@ -56,7 +56,6 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
</feature>
-<!-- requires Spring 3.1
<feature name='camel-test-spring' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
<bundle
dependency='true'>mvn:org.springframework/spring-test/${spring-version}</bundle>
@@ -64,7 +63,6 @@
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-test-spring/${project.version}</bundle>
</feature>
--->
<feature name='camel-context' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-context/${project.version}</bundle>