Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/Talend/tesb-rt-se

  • Loading branch information...
commit 81cb1324797007d9fdade8902840ef7274b528a9 2 parents 0afc82a + 1ce5702
dwolz authored
View
2  examples/camel/claimcheck/pom.xml
@@ -25,7 +25,7 @@
<properties>
<activemq.version>5.5.0</activemq.version>
<cxf.version>2.6.0</cxf.version>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<spring.version>3.0.6.RELEASE</spring.version>
<jetty.version>7.4.5.v20110725</jetty.version>
<slf4j.version>1.6.1</slf4j.version>
View
2  examples/camel/features/pom.xml
@@ -21,7 +21,7 @@
<properties>
<activemq.version>5.5.0</activemq.version>
<cxf.version>2.6.0</cxf.version>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<karaf.version>2.2.6</karaf.version>
<spring.version>3.0.6.RELEASE</spring.version>
<spring-security.version>3.0.6.RELEASE</spring-security.version>
View
2  examples/camel/jaxrs-jms-http/pom.xml
@@ -31,7 +31,7 @@
<properties>
<activemq.version>5.5.0</activemq.version>
<cxf.version>2.6.0</cxf.version>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<spring.version>3.0.6.RELEASE</spring.version>
<spring-security.version>3.0.6.RELEASE</spring-security.version>
<jetty.version>7.4.5.v20110725</jetty.version>
View
2  examples/camel/jaxws-jms/pom.xml
@@ -29,7 +29,7 @@
<properties>
<activemq.version>5.5.0</activemq.version>
<cxf.version>2.6.0</cxf.version>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<spring.version>3.0.6.RELEASE</spring.version>
<jetty.version>7.4.5.v20110725</jetty.version>
<slf4j.version>1.6.1</slf4j.version>
View
2  examples/camel/spring-security/pom.xml
@@ -28,7 +28,7 @@
</modules>
<properties>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<cxf.version>2.6.0</cxf.version>
<felix.version>1.2.0</felix.version>
<spring.version>3.0.6.RELEASE</spring.version>
View
2  examples/cxf/features/pom.xml
@@ -22,7 +22,7 @@
<activemq.version>5.5.0</activemq.version>
<cxf.version>2.6.0</cxf.version>
<cxf.xjc.version>2.4.1-SNAPSHOT</cxf.xjc.version>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<karaf.version>2.2.6</karaf.version>
<spring.version>3.0.6.RELEASE</spring.version>
<spring-security.version>3.0.6.RELEASE</spring-security.version>
View
2  examples/pom.xml
@@ -49,7 +49,7 @@
<sts.endpoint.prefix>${endpoint.prefix}</sts.endpoint.prefix>
<cxf.version>2.6.0</cxf.version>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<spring.version>3.0.7.RELEASE</spring.version>
<karaf.version>2.2.6</karaf.version>
<activemq.version>5.5.0</activemq.version>
View
2  features/src/main/resources/features.xml
@@ -56,7 +56,7 @@
<feature name='tesb-datasource-mysql' version='${project.version}'>
<configfile finalname="/etc/org.talend.esb.datasource.mysql.cfg">mvn:org.talend.esb/ds-service-mysql/${project.version}/cfg/org.talend.esb.datasource.mysql</configfile>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/1.9.0</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/1.9.0</bundle>
<bundle>mvn:mysql/mysql-connector-java/5.1.18</bundle>
<bundle>mvn:org.talend.esb/ds-service-mysql/${project.version}</bundle>
</feature>
View
2  pom.xml
@@ -92,7 +92,7 @@
<properties>
<packages.version>${project.version}</packages.version>
<cxf.version>2.6.0</cxf.version>
- <camel.version>2.9.2-SNAPSHOT</camel.version>
+ <camel.version>2.9.2</camel.version>
<activemq.version>5.5.0</activemq.version>
<spring.version>3.0.7.RELEASE</spring.version>
<karaf.version>2.2.6</karaf.version>
View
5 talend-esb/src/main/descriptors/unix-bin.xml
@@ -346,8 +346,11 @@
<excludes>
<!-- IF-23: exclude the aries blueprint copied by camel-blueprint feature to take the Karaf' one -->
<exclude>org/apache/aries/blueprint/**</exclude>
- <!-- exclude JDBC friver because of licensing limitation -->
+ <!-- exclude JDBC drivers because of licensing limitation -->
<exclude>mysql/**</exclude>
+ <exclude>ojdbc/**</exclude>
+ <exclude>com/ibm/db2/**</exclude>
+ <exclude>com/microsoft/sqlserver/**</exclude>
<!-- workaround for jclouds-karaf-1.3.1-features.xml -->
<exclude>org/jclouds/karaf/jclouds-karaf/1.3.1/jclouds-karaf-1.3.1-features.xml</exclude>
<!-- workaround for CXF version in Camel 2.9.2 features file -->
View
3  talend-esb/src/main/descriptors/win-bin.xml
@@ -347,6 +347,9 @@
<exclude>org/apache/aries/blueprint/**</exclude>
<!-- exclude JDBC friver because of licensing limitation -->
<exclude>mysql/**</exclude>
+ <exclude>ojdbc/**</exclude>
+ <exclude>com/ibm/db2/**</exclude>
+ <exclude>com/microsoft/sqlserver/**</exclude>
<!-- workaround for jclouds-karaf-1.3.1-features.xml -->
<exclude>org/jclouds/karaf/jclouds-karaf/1.3.1/jclouds-karaf-1.3.1-features.xml</exclude>
<!-- workaround for CXF version in Camel 2.9.2 features file -->
Please sign in to comment.
Something went wrong with that request. Please try again.