camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: Added scala-xml module dependency to fix the camel-scala build error with IDEA
Date Tue, 29 Jul 2014 12:45:11 GMT
Repository: camel
Updated Branches:
  refs/heads/master 11ef082b7 -> b95931022


Added scala-xml module dependency to fix the camel-scala build error with IDEA


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

Branch: refs/heads/master
Commit: b959310225c4005d3cbd4598b03298083b14c4dc
Parents: 11ef082
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Jul 29 20:43:32 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Jul 29 20:44:53 2014 +0800

----------------------------------------------------------------------
 components/camel-scala/pom.xml | 11 +++++++++++
 parent/pom.xml                 |  1 +
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b9593102/components/camel-scala/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index 382507d..22e444e 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -47,6 +47,13 @@
             <version>${scala-version}</version>
             <scope>provided</scope>
         </dependency>
+        <!-- scala-libray doesn't include xml module since 2.11.x -->
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-xml_2.11</artifactId>
+            <version>${scalaxml-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -72,6 +79,10 @@
                     <groupId>org.scala-lang</groupId>
                     <artifactId>scala-reflect</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.scala-lang.modules</groupId>
+                    <artifactId>scala-xml_2.11</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/b9593102/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8dd2e3a..d0e5b62 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -359,6 +359,7 @@
     <scala-version>2.11.2</scala-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>
     <scribe-version>1.3.5</scribe-version>
     <scriptengines-version>1.1</scriptengines-version>
     <serp-bundle-version>1.14.1_1</serp-bundle-version>


Mime
View raw message