Bug 551438 - Fix files that have ended up with CRLF in the git

repository

Fix PatchBuilderTest to adjust expectations based on the line delimiter
of the input file.

Fix PatchUITest so that it passes on Windows when the expected input is
already using CRLF.

Change-Id: I6a397114f410feceb5791644591b76cd2e0bb11b
Signed-off-by: Ed Merks <ed.merks@gmail.com>

10 files changed, 20 insertions, 20 deletions

diff --git a/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.core.runtime.prefs b/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.core.runtime.prefs
index c522e1f4a..5a0ad22d2 100644
--- a/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.core.runtime.prefs
+++ b/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.core.runtime.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1

-line.separator=\n

+eclipse.preferences.version=1
+line.separator=\n
diff --git a/examples/org.eclipse.compare.examples.xml/IdMaps/idmap.dtd b/examples/org.eclipse.compare.examples.xml/IdMaps/idmap.dtd
index b60a2faae..69ef654eb 100644
--- a/examples/org.eclipse.compare.examples.xml/IdMaps/idmap.dtd
+++ b/examples/org.eclipse.compare.examples.xml/IdMaps/idmap.dtd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!ELEMENT idmap (element)*>

-<!ATTLIST idmat

-          name      CDATA #REQUIRED>

-<!ELEMENT element EMPTY>

-<!ATTLIST element

-          signature ID #REQUIRED

-          id_attr   CDATA #REQUIRED>

+<?xml version="1.0" encoding="UTF-8"?>
+<!ELEMENT idmap (element)*>
+<!ATTLIST idmat
+          name      CDATA #REQUIRED>
+<!ELEMENT element EMPTY>
+<!ATTLIST element
+          signature ID #REQUIRED
+          id_attr   CDATA #REQUIRED>
diff --git a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
index c34aaf8ec..9d7bec075 100644
--- a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
-Bundle-Version: 3.4.700.qualifier
+Bundle-Version: 3.4.800.qualifier
 Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.compare.examples.xml/pom.xml b/examples/org.eclipse.compare.examples.xml/pom.xml
index 62077769d..3d54c7a6e 100644
--- a/examples/org.eclipse.compare.examples.xml/pom.xml
+++ b/examples/org.eclipse.compare.examples.xml/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.compare</groupId>
   <artifactId>org.eclipse.compare.examples.xml</artifactId>
-  <version>3.4.700-SNAPSHOT</version>
+  <version>3.4.800-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs b/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs
index c522e1f4a..5a0ad22d2 100644
--- a/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs
+++ b/examples/org.eclipse.compare.examples/.settings/org.eclipse.core.runtime.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1

-line.separator=\n

+eclipse.preferences.version=1
+line.separator=\n
diff --git a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
index 3f05cedf7..7ed7d3df0 100644
--- a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true
-Bundle-Version: 3.2.300.qualifier
+Bundle-Version: 3.2.400.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.compare.examples.structurecreator
diff --git a/examples/org.eclipse.compare.examples/pom.xml b/examples/org.eclipse.compare.examples/pom.xml
index 74cfb8568..210cbab0a 100644
--- a/examples/org.eclipse.compare.examples/pom.xml
+++ b/examples/org.eclipse.compare.examples/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.compare</groupId>
   <artifactId>org.eclipse.compare.examples</artifactId>
-  <version>3.2.300-SNAPSHOT</version>
+  <version>3.2.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.core.runtime.prefs b/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.core.runtime.prefs
index c522e1f4a..5a0ad22d2 100644
--- a/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.core.runtime.prefs
+++ b/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.core.runtime.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1

-line.separator=\n

+eclipse.preferences.version=1
+line.separator=\n
diff --git a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
index 81f1dd2ce..b32691b22 100644
--- a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true
-Bundle-Version: 3.5.500.qualifier
+Bundle-Version: 3.5.600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.team.examples.filesystem,
diff --git a/examples/org.eclipse.team.examples.filesystem/pom.xml b/examples/org.eclipse.team.examples.filesystem/pom.xml
index d0ba73f60..9efeac365 100644
--- a/examples/org.eclipse.team.examples.filesystem/pom.xml
+++ b/examples/org.eclipse.team.examples.filesystem/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.examples.filesystem</artifactId>
-  <version>3.5.500-SNAPSHOT</version>
+  <version>3.5.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>