camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/6] camel git commit: CAMEL-10969: camel-scala compile problem with shaded org package name
Date Sun, 24 Sep 2017 14:31:25 GMT
Repository: camel
Updated Branches:
  refs/heads/json-simple ae6a9bb9b -> 8b7c86a54


CAMEL-10969: camel-scala compile problem with shaded org package name


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

Branch: refs/heads/json-simple
Commit: 9cc840b26d22e813f1b915d4282b77c40309a442
Parents: ae6a9bb
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Sep 24 12:19:47 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Sep 24 12:19:47 2017 +0200

----------------------------------------------------------------------
 camel-core/pom.xml              | 3 ++-
 platforms/camel-catalog/pom.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9cc840b2/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index cde2500..e2d95ad 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -280,7 +280,8 @@
                 </relocation>
                 <relocation>
                   <pattern>org.json.simple</pattern>
-                  <shadedPattern>org.apache.camel.org.json.simple</shadedPattern>
+                  <!-- scala compiler do not like org.apache.camel.org so its just json.simple
instead of org.json.simple -->
+                  <shadedPattern>org.apache.camel.json.simple</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>

http://git-wip-us.apache.org/repos/asf/camel/blob/9cc840b2/platforms/camel-catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/camel-catalog/pom.xml b/platforms/camel-catalog/pom.xml
index 08f00c2..0357fde 100644
--- a/platforms/camel-catalog/pom.xml
+++ b/platforms/camel-catalog/pom.xml
@@ -188,7 +188,8 @@
               <relocations>
                 <relocation>
                   <pattern>org.json.simple</pattern>
-                  <shadedPattern>org.apache.camel.org.json.simple</shadedPattern>
+                  <!-- scala compiler do not like org.apache.camel.org so its just json.simple
instead of org.json.simple -->
+                  <shadedPattern>org.apache.camel.json.simple</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>


Mime
View raw message