camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Remove use of properties plugin to set the system property (can hide additional problems). Use xercesImpl for parser for the plugin that doesn't work with the secure parsers
Date Mon, 19 May 2014 19:56:38 GMT
Repository: camel
Updated Branches:
  refs/heads/master 08d90fe56 -> c1f6b6f75


Remove use of properties plugin to set the system property (can hide additional problems).
 Use xercesImpl for parser for the plugin that doesn't work with the secure parsers


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

Branch: refs/heads/master
Commit: c1f6b6f75c9054b529a4a5b24a79011a0513087a
Parents: 08d90fe
Author: Daniel Kulp <dkulp@apache.org>
Authored: Mon May 19 15:55:03 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon May 19 15:55:03 2014 -0400

----------------------------------------------------------------------
 parent/pom.xml |  7 +++++++
 pom.xml        | 28 +++++-----------------------
 2 files changed, 12 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c1f6b6f7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 15fa4a4..14659f8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2527,6 +2527,13 @@
               </plugin>
             </plugins>
           </configuration>
+          <dependencies>
+              <dependency>
+                  <groupId>xerces</groupId>
+                  <artifactId>xercesImpl</artifactId>
+                  <version>2.11.0</version>
+              </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.mortbay.jetty</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/c1f6b6f7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index adb94e2..66b8bef 100755
--- a/pom.xml
+++ b/pom.xml
@@ -135,29 +135,6 @@
 
   <build>
     <defaultGoal>install</defaultGoal>
-    <plugins>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>properties-maven-plugin</artifactId>
-            <version>1.0-alpha-2</version>
-            <executions>
-                <execution>
-                    <phase>initialize</phase>
-                    <goals>
-                        <goal>set-system-properties</goal>
-                    </goals>
-                    <configuration>
-                        <properties>
-                            <property>
-                                <name>javax.xml.accessExternalSchema</name>
-                                <value>file,http</value>
-                            </property>
-                        </properties>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>            
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -408,6 +385,11 @@
                   <version>${jaxb-version}</version>
                 </dependency>
                 <dependency>
+                  <groupId>xerces</groupId>
+                  <artifactId>xercesImpl</artifactId>
+                  <version>2.11.0</version>
+                </dependency>
+                <dependency>
                   <groupId>ant-contrib</groupId>
                   <artifactId>ant-contrib</artifactId>
                   <version>1.0b3</version>


Mime
View raw message