You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/12/24 09:23:58 UTC
[1/2] camel git commit: Upgrade maven compiler plugin
Repository: camel
Updated Branches:
refs/heads/master 53c0cde20 -> 2ce87814e
Upgrade maven compiler plugin
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3185b499
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3185b499
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3185b499
Branch: refs/heads/master
Commit: 3185b499fa2a588f7064e13074eeba8020a8586d
Parents: 53c0cde
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 24 10:18:27 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 24 10:18:27 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3185b499/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index df0a2a3..5f4b256 100755
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<jdk.version>1.8</jdk.version>
<compiler.fork>false</compiler.fork>
- <maven-compiler-plugin-version>3.5.1</maven-compiler-plugin-version>
+ <maven-compiler-plugin-version>3.6.0</maven-compiler-plugin-version>
<maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
<!-- eclipse plugin need the jaxb in this pom.xml file -->
[2/2] camel git commit: Fixed test and a little upgrade
Posted by da...@apache.org.
Fixed test and a little upgrade
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ce87814
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ce87814
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ce87814
Branch: refs/heads/master
Commit: 2ce87814e0f33f5bacea668851c8ba5716ed0822
Parents: 3185b49
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 24 10:23:51 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 24 10:23:51 2016 +0100
----------------------------------------------------------------------
components/camel-amqp/pom.xml | 3 +++
parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ce87814/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 6e8f30f..c594d32 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -67,7 +67,10 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
+ <!-- TODO: ActiveMQ 5.14.3 causes an error when testing
<version>${activemq-version}</version>
+ -->
+ <version>5.14.2</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/2ce87814/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fa17af7..860e39f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -492,7 +492,7 @@
<protobuf-version>3.1.0</protobuf-version>
<qpid-bundle-version>0.28_1</qpid-bundle-version>
<qpid-proton-j-version>0.14.0</qpid-proton-j-version>
- <qpid-jms-client-version>0.11.0</qpid-jms-client-version>
+ <qpid-jms-client-version>0.11.1</qpid-jms-client-version>
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
<quartz-version-range>[1.8,2)</quartz-version-range>