You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/08/19 09:45:28 UTC
[2/3] git commit: Fixed the build error of camel-swagger with JDK8
Fixed the build error of camel-swagger with JDK8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09627f69
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09627f69
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09627f69
Branch: refs/heads/master
Commit: 09627f69cd2c86ba40212cb2621acbe1bae4abb7
Parents: 4ef3d6f
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Aug 19 09:40:24 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Aug 19 15:29:07 2014 +0800
----------------------------------------------------------------------
components/camel-swagger/pom.xml | 11 ++++++++++-
parent/pom.xml | 1 +
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/09627f69/components/camel-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index 9997f98..29c945a 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -44,7 +44,7 @@
<artifactId>camel-core</artifactId>
</dependency>
- <!--
+ <!--
TODO: we should avoid spring dependency and have some plugin/spi
-->
<dependency>
@@ -57,11 +57,20 @@
<artifactId>swagger-annotations</artifactId>
<version>${swagger-version}</version>
</dependency>
+
+ <!-- To override the scala-library version of swagger-jaxrs-2.10 for supporting Java8 -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala-2.10-version}</version>
+ </dependency>
+
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-jaxrs_2.10</artifactId>
<version>${swagger-version}</version>
</dependency>
+
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-servlet_2.10</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/09627f69/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a96ef12..ebaf300 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -361,6 +361,7 @@
<saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
<saxon-version>9.5.1-5</saxon-version>
<scala-version>2.11.2</scala-version>
+ <scala-2.10-version>2.10.4</scala-2.10-version>
<scala-maven-plugin-version>3.2.0</scala-maven-plugin-version>
<scalatest-version>2.2.0</scalatest-version>
<scalaxml-version>1.0.2</scalaxml-version>