From 8766623295297f116a374c40f57a9a9bc407dbe6 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Wed, 25 Oct 2017 22:54:24 +0200
Subject: [PATCH] More adjustments to Eclipse classpath (whitespace,
 version.properties)

---
 .classpath.default |  4 ++--
 .classpath.ivyde   | 52 +++++++++++++++++++++++-----------------------
 build.xml          |  4 ++--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.classpath.default b/.classpath.default
index a6c4781e0..c1762a967 100644
--- a/.classpath.default
+++ b/.classpath.default
@@ -15,7 +15,7 @@
    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
-   under the License.    
+   under the License.
 -->
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
@@ -26,7 +26,7 @@
 	<classpathentry kind="lib" path="lib/commons-codec.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/commons-vfs2.jar"/>
-	<classpathentry kind="lib" path="lib/hamcrest.jar"/>
+	<classpathentry kind="lib" path="lib/hamcrest-core.jar"/>
 	<classpathentry kind="lib" path="lib/httpclient.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore.jar"/>
 	<classpathentry kind="lib" path="lib/jsch.jar"/>
diff --git a/.classpath.ivyde b/.classpath.ivyde
index 968222423..fdf789d2b 100644
--- a/.classpath.ivyde
+++ b/.classpath.ivyde
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/ivy.xml/*"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ivy&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=&amp;propertyFiles=version.properties"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/build.xml b/build.xml
index 9736ed240..3452eb031 100644
--- a/build.xml
+++ b/build.xml
@@ -692,13 +692,13 @@
 
     <target name="eclipse-default" depends="resolve,check-eclipse-classpath-overwrite"
             unless="eclipse.classpath.abort"
-            description="creates a default .classpath for eclipse, using jars resolved by this ant build">
+            description="creates a default .classpath for Eclipse using jars resolved by this Ant build">
         <copy file="${basedir}/.classpath.default" tofile="${basedir}/.classpath" overwrite="true"/>
     </target>
 
     <target name="eclipse-ivyde" depends="check-eclipse-classpath-overwrite"
             unless="eclipse.classpath.abort"
-            description="creates a .classpath for eclipse using Apache IvyDE version">
+            description="creates a .classpath for Eclipse using Apache IvyDE plugin">
         <copy file="${basedir}/.classpath.ivyde" tofile="${basedir}/.classpath" overwrite="true"/>
     </target>
 </project>