You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/04/01 23:39:10 UTC
[1/2] servicemix git commit: SM-2468 Upgrade to Camel 2.15.1
Repository: servicemix
Updated Branches:
refs/heads/master 9d1c08af3 -> 4d126e409
SM-2468 Upgrade to Camel 2.15.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/1423eba2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/1423eba2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/1423eba2
Branch: refs/heads/master
Commit: 1423eba20070a88b3faa282fe192e1106ffc8599
Parents: 9d1c08a
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue Mar 31 17:41:47 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Apr 1 19:46:50 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/1423eba2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f982307..dcc8791 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,7 +39,7 @@
<properties>
<activemq.version>5.11.1</activemq.version>
<activiti.version>5.17.0</activiti.version>
- <camel.version>2.14.2</camel.version>
+ <camel.version>2.15.1</camel.version>
<cxf.version>3.0.4</cxf.version>
<cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
@@ -54,10 +54,10 @@
<akka.version>2.3.9</akka.version>
<scala.version>2.10.2</scala.version>
<google.guava.version>15.0</google.guava.version>
- <fasterxml.jackson.version>2.4.1</fasterxml.jackson.version>
+ <fasterxml.jackson.version>2.4.3</fasterxml.jackson.version>
<typesafe-config.version>1.2.0</typesafe-config.version>
<mvel2.version>2.2.1.Final</mvel2.version>
- <mybatis.version>3.2.7</mybatis.version>
+ <mybatis.version>3.2.8</mybatis.version>
<jodatime2.bundle.version>2.6</jodatime2.bundle.version>
<jpa.version>2.1.0</jpa.version>
<swagger.version>1.3.11</swagger.version>
[2/2] servicemix git commit: SM-2492: Wrong sample keystore format in
examples contained in the assembly
Posted by ks...@apache.org.
SM-2492: Wrong sample keystore format in examples contained in the assembly
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/4d126e40
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/4d126e40
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/4d126e40
Branch: refs/heads/master
Commit: 4d126e4090f1d7b47fc60a6edf04894b871a6970
Parents: 1423eba
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Apr 1 23:38:28 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Apr 1 23:38:28 2015 +0200
----------------------------------------------------------------------
assembly/src/main/resources/examples-unix-bin.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4d126e40/assembly/src/main/resources/examples-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/examples-unix-bin.xml b/assembly/src/main/resources/examples-unix-bin.xml
index c235eaf..d75a416 100644
--- a/assembly/src/main/resources/examples-unix-bin.xml
+++ b/assembly/src/main/resources/examples-unix-bin.xml
@@ -46,12 +46,26 @@
<exclude>**/.project</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/*.i??</exclude>
+ <exclude>**/*.jks</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${basedir}/../examples</directory>
<outputDirectory>/examples/</outputDirectory>
+ <lineEnding>keep</lineEnding>
+ <includes>
+ <include>activemq/**/*.jks</include>
+ <include>activiti/**/*.jks</include>
+ <include>akka/**/*.jks</include>
+ <include>camel/**/*.jks</include>
+ <include>cxf/**/*.jks</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../examples</directory>
+ <outputDirectory>/examples/</outputDirectory>
<lineEnding>unix</lineEnding>
<filtered>true</filtered>
<fileMode>0644</fileMode>