From 23545491c228997f52cfc482af17c5f48fa83348 Mon Sep 17 00:00:00 2001
From: aldettinger <aldettinger@gmail.com>
Date: Mon, 13 Mar 2017 21:36:49 +0100
Subject: [PATCH 1/2] CAMEL-11000: Issued a simple warning rather than throwing
 an Exception

---
 .../org/apache/camel/processor/validation/SchemaReader.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
index 4fc8c2b74930e..ac42cc906a9f8 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
@@ -177,8 +177,7 @@ protected SchemaFactory createSchemaFactory() {
             try {
                 factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
             } catch (SAXException e) {
-                LOG.error(e.getMessage(), e);
-                throw new IllegalStateException(e);
+                LOG.warn(e.getMessage(), e);
             } 
         }
         return factory;

From 1e7763d120e38322db17f9a5fbc4d3ff6b3ac183 Mon Sep 17 00:00:00 2001
From: aldettinger <aldettinger@gmail.com>
Date: Fri, 17 Mar 2017 19:22:30 +0100
Subject: [PATCH 2/2] CAMEL-11009: Set the camel.schema.version property
 earlier

---
 components/camel-spring/pom.xml | 46 ++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 386b8c355b1f8..e44e5bfa8def5 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -277,13 +277,35 @@
           </dependency>
         </dependencies>
         <executions>
+          <execution>
+            <id>store-camel-schema-version-in-file</id>
+            <phase>initialize</phase>
+            <configuration>
+              <target>
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+                <property name="mv" value="${project.version}" />
+                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
+                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
+                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
+                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+                <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
+                <mkdir dir="target" />
+                <echo file="target/camel.osgi.version.txt">
+                      camel.schema.version = ${camel.schema.version}
+                </echo>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
           <execution>
             <id>generate-sources</id>
             <phase>process-classes</phase>
             <configuration>
               <target>
                 <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
-
                 <echo>Copying code together for the XSD generation</echo>
                 <mkdir dir="${project.build.directory}/schema-src" />
                 <copy todir="${project.build.directory}/schema-src">
@@ -309,21 +331,6 @@
                     <include name="org/apache/camel/package-info.java" />
                   </fileset>
                 </copy>
-
-
-                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
-                <property name="mv" value="${project.version}" />
-                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
-                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
-                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
-                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
-                <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
-                <mkdir dir="target" />
-                <echo file="target/camel.osgi.version.txt">
-                      camel.schema.version = ${camel.schema.version}
-                </echo>
-
                 <echo>Generating XSD schema</echo>
                 <mkdir dir="${project.build.directory}/schema" />
                 <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
@@ -355,7 +362,7 @@
               <goal>run</goal>
             </goals>
           </execution>
-          <!-- after the eip-documentation-enricher we need to copy some shchema files -->
+          <!-- after the eip-documentation-enricher we need to copy some schema files -->
           <execution>
             <id>include-schemas</id>
             <phase>prepare-package</phase>
@@ -377,12 +384,14 @@
           </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>properties-maven-plugin</artifactId>
         <executions>
           <execution>
-            <phase>process-classes</phase>
+            <id>init-camel-schema-version-property-from-file</id>
+            <phase>initialize</phase>
             <goals>
               <goal>read-project-properties</goal>
             </goals>
@@ -394,6 +403,7 @@
           </execution>
         </executions>
       </plugin>
+      
       <!-- add the sources from camel-core-osgi and camel-core-xml as source code in the camel-spring-sources.jar -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>