camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/5] camel git commit: CAMEL-9869: Add to kit
Date Mon, 25 Apr 2016 06:40:41 GMT
CAMEL-9869: Add to kit


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

Branch: refs/heads/master
Commit: 372f631600da8ec59e91d3f59ce49ecd69b9d403
Parents: c35c835
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Apr 25 08:35:42 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Apr 25 08:35:42 2016 +0200

----------------------------------------------------------------------
 components/camel-flink/pom.xml | 15 +++++++--------
 parent/pom.xml                 |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/372f6316/components/camel-flink/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index 5185fae..8e774dd 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -56,6 +56,13 @@
       <version>${flink-version}</version>
     </dependency>
 
+    <!-- scala -->
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>${scala-2.10-version}</version>
+    </dependency>
+
     <!--testing-->
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -78,13 +85,5 @@
       <scope>test</scope>
     </dependency>
 
-    <!--optional-->
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>2.10.6</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/372f6316/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 383b619..24fa2a3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -481,7 +481,7 @@
     <saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
     <saxon-version>9.5.1-5</saxon-version>
     <scala-version>2.11.7</scala-version>
-    <scala-2.10-version>2.10.4</scala-2.10-version>
+    <scala-2.10-version>2.10.6</scala-2.10-version>
     <scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
     <scalatest-version>2.2.5</scalatest-version>
     <scalaxml-version>1.0.4</scalaxml-version>


Mime
View raw message