[1/2] camel git commit: Update spring-boot-dm dependencies

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] camel git commit: Update spring-boot-dm dependencies

lburgazzoli-2
Repository: camel
Updated Branches:
  refs/heads/master d4c9a3da4 -> 45710b3fd


Update spring-boot-dm dependencies


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/66bc3fad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/66bc3fad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/66bc3fad

Branch: refs/heads/master
Commit: 66bc3faddfea041df761245c12b62bef0ceaf3c0
Parents: d4c9a3d
Author: lburgazzoli <[hidden email]>
Authored: Wed Mar 15 11:15:03 2017 +0100
Committer: lburgazzoli <[hidden email]>
Committed: Wed Mar 15 13:41:15 2017 +0100

----------------------------------------------------------------------
 .../camel-spring-boot-dependencies/pom.xml          | 12 ++++++------
 platforms/spring-boot/spring-boot-dm/pom.xml        | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/66bc3fad/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 7d32291..279b978 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -51,7 +51,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-module-scala_2.11</artifactId>
-        <version>2.8.6</version>
+        <version>2.8.7</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.scriptengines</groupId>
@@ -2982,27 +2982,27 @@
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
         <artifactId>websocket-api</artifactId>
-        <version>9.4.1.v20170120</version>
+        <version>9.4.2.v20170220</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
         <artifactId>websocket-common</artifactId>
-        <version>9.4.1.v20170120</version>
+        <version>9.4.2.v20170220</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
         <artifactId>websocket-servlet</artifactId>
-        <version>9.4.1.v20170120</version>
+        <version>9.4.2.v20170220</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-rewrite</artifactId>
-        <version>9.4.1.v20170120</version>
+        <version>9.4.2.v20170220</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-util-ajax</artifactId>
-        <version>9.4.1.v20170120</version>
+        <version>9.4.2.v20170220</version>
       </dependency>
       <dependency>
         <groupId>org.jdom</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/66bc3fad/platforms/spring-boot/spring-boot-dm/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml
index 8b5c9fa..66cac15 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -39,7 +39,7 @@
 
   <properties>
     <!-- Spring-Boot target version -->
-    <spring-boot-version>1.5.1.RELEASE</spring-boot-version>
+    <spring-boot-version>1.5.2.RELEASE</spring-boot-version>
 
     <!-- The following dependencies should be aligned with the ones in standard camel parent -->
     <avro-version>1.8.1</avro-version>
@@ -63,19 +63,19 @@
     <cassandra-netty-version-testing>4.0.37.Final</cassandra-netty-version-testing>
 
     <!-- The following versions should be aligned with the ones in spring-boot-repo/spring-boot-dependencies/pom.xml (for the targeted version of spring-boot) -->
-    <jackson2-version>2.8.6</jackson2-version>
-    <scala-jackson2-version>2.8.6</scala-jackson2-version>
-    <jetty9-version>9.4.1.v20170120</jetty9-version>
+    <jackson2-version>2.8.7</jackson2-version>
+    <scala-jackson2-version>2.8.7</scala-jackson2-version>
+    <jetty9-version>9.4.2.v20170220</jetty9-version>
     <jetty-version>${jetty9-version}</jetty-version>
     <jna-version>4.2.2</jna-version>
     <hazelcast-version>3.7.5</hazelcast-version>
     <htmlunit-version>2.21</htmlunit-version>
     <log4j2-version>2.7</log4j2-version>
     <slf4j-version>1.7.22</slf4j-version>
-    <spring-version>4.3.6.RELEASE</spring-version>
-    <spring-data-releasetrain-version>Ingalls-RELEASE</spring-data-releasetrain-version>
-    <spring-integration-version>4.3.7.RELEASE</spring-integration-version>
-    <spring-security-version>4.2.1.RELEASE</spring-security-version>
+    <spring-version>4.3.7.RELEASE</spring-version>
+    <spring-data-releasetrain-version>Ingalls-SR1</spring-data-releasetrain-version>
+    <spring-integration-version>4.3.8.RELEASE</spring-integration-version>
+    <spring-security-version>4.2.2.RELEASE</spring-security-version>
   </properties>
 
   <build>

Reply | Threaded
Open this post in threaded view
|

[2/2] camel git commit: Fix methods visibility

lburgazzoli-2
Fix methods visibility


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/45710b3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/45710b3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/45710b3f

Branch: refs/heads/master
Commit: 45710b3fde9e1487b5a049dcc116380acb984320
Parents: 66bc3fa
Author: lburgazzoli <[hidden email]>
Authored: Wed Mar 15 12:21:15 2017 +0100
Committer: lburgazzoli <[hidden email]>
Committed: Wed Mar 15 13:41:16 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/maven/RunMojo.java            | 2 +-
 .../src/main/java/org/apache/camel/guice/maven/RunMojo.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/45710b3f/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index c375e45..79ca2e0 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -1025,7 +1025,7 @@ public class RunMojo extends AbstractExecMojo {
      * @return an artifact which refers to the actual executable tool (not a POM)
      * @throws MojoExecutionException
      */
-    private Artifact findExecutableArtifact() throws MojoExecutionException {
+    protected Artifact findExecutableArtifact() throws MojoExecutionException {
         // ILimitedArtifactIdentifier execToolAssembly =
         // this.getExecutableToolAssembly();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/45710b3f/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index 0e9a3a3..f092d05 100644
--- a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++ b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -733,7 +733,7 @@ public class RunMojo extends AbstractExecMojo {
      * @return an artifact which refers to the actual executable tool (not a POM)
      * @throws org.apache.maven.plugin.MojoExecutionException
      */
-    private Artifact findExecutableArtifact() throws MojoExecutionException {
+    protected Artifact findExecutableArtifact() throws MojoExecutionException {
         // ILimitedArtifactIdentifier execToolAssembly =
         // this.getExecutableToolAssembly();
 
@@ -810,4 +810,4 @@ public class RunMojo extends AbstractExecMojo {
         }
     }
 
-}
\ No newline at end of file
+}