[camel] branch master updated: CAMEL-12083: Fixed the camel-json-validator feature

[aldettinger]

This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new e065f4a  CAMEL-12083: Fixed the camel-json-validator feature
e065f4a is described below

commit e065f4aa9f79cbd9bb8bdce1606aef758f808b6f
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Mon Dec 18 19:40:24 2017 +0100

    CAMEL-12083: Fixed the camel-json-validator feature
---
 platforms/karaf/features/pom.xml                         | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 2deb72f..284931d 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -187,7 +187,7 @@
                 <!-- camel-guice does not work in OSGi currently -->
                 
<feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice))*</feature>
               </features>
-                               
<configuration>file://${project.build.directory}/classes/config.properties</configuration>
+            
<configuration>file://${project.build.directory}/classes/config.properties</configuration>
             </configuration>
             <executions>
               <execution>
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 7384166..807442c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1258,7 +1258,7 @@
   <feature name='camel-json-validator' version='${project.version}' 
resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle 
dependency='true'>mvn:com.github.everit-org.json-schema/org.everit.json.schema/${everit-org-json-schema-version}</bundle>
-    <bundle dependency='true'>mvn:org.json/json/20170516</bundle>
+    <bundle dependency='true'>mvn:org.json/json/20171018</bundle>
     <bundle 
dependency='true'>mvn:com.damnhandy/handy-uri-templates/2.1.6</bundle>
     <bundle 
dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
     <bundle dependency='true'>mvn:com.google.guava/guava/22.0</bundle>

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].