Bug 551396 - Fix files that have ended up with CRLF in the gitI20190924-1800

repository

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

4 files changed, 42 insertions, 42 deletions

diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
index f51877f2d..28e6db88f 100644
--- a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.p2.repository;singleton:=true
-Bundle-Version: 2.4.500.qualifier
+Bundle-Version: 2.4.600.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.p2.repository.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.repository/OSGI-INF/cacheManager.xml b/bundles/org.eclipse.equinox.p2.repository/OSGI-INF/cacheManager.xml
index d04c8dfb1..e429bf641 100644
--- a/bundles/org.eclipse.equinox.p2.repository/OSGI-INF/cacheManager.xml
+++ b/bundles/org.eclipse.equinox.p2.repository/OSGI-INF/cacheManager.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.equinox.p2.repository">

-   <implementation class="org.eclipse.equinox.internal.p2.repository.CacheManagerComponent"/>

-   <service>

-      <provide interface="org.eclipse.equinox.p2.core.spi.IAgentServiceFactory"/>

-   </service>

-   <property name="p2.agent.servicename" type="String" value="org.eclipse.equinox.internal.p2.repository.CacheManager"/>

-</scr:component>

+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.equinox.p2.repository">
+   <implementation class="org.eclipse.equinox.internal.p2.repository.CacheManagerComponent"/>
+   <service>
+      <provide interface="org.eclipse.equinox.p2.core.spi.IAgentServiceFactory"/>
+   </service>
+   <property name="p2.agent.servicename" type="String" value="org.eclipse.equinox.internal.p2.repository.CacheManager"/>
+</scr:component>
diff --git a/bundles/org.eclipse.equinox.p2.repository/pom.xml b/bundles/org.eclipse.equinox.p2.repository/pom.xml
index da7d350d8..b7df0f82d 100644
--- a/bundles/org.eclipse.equinox.p2.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.p2.repository</artifactId>
-  <version>2.4.500-SNAPSHOT</version>
+  <version>2.4.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManagerComponent.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManagerComponent.java
index 81c4128d4..1321c17fa 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManagerComponent.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManagerComponent.java
@@ -1,32 +1,32 @@
-/*******************************************************************************

- *  Copyright (c) 2010 Sonatype, Inc and others.

- *

- *  This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License 2.0

- *  which accompanies this distribution, and is available at

- *  https://www.eclipse.org/legal/epl-2.0/

- *

- *  SPDX-License-Identifier: EPL-2.0

- *

- *  Contributors:

- *     Sonatype, Inc. - initial API and implementation

- *******************************************************************************/

-package org.eclipse.equinox.internal.p2.repository;

-

-import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;

-import org.eclipse.equinox.p2.core.IAgentLocation;

-import org.eclipse.equinox.p2.core.IProvisioningAgent;

-import org.eclipse.equinox.p2.core.spi.IAgentServiceFactory;

-

-public class CacheManagerComponent implements IAgentServiceFactory {

-

-	@Override

-	public Object createService(IProvisioningAgent agent) {

-		final IProvisioningEventBus eventBus = agent.getService(IProvisioningEventBus.class);

-		CacheManager cache = new CacheManager(agent.getService(IAgentLocation.class),

-				agent.getService(Transport.class));

-		cache.setEventBus(eventBus);

-		return cache;

-	}

-

-}

+/*******************************************************************************
+ *  Copyright (c) 2010 Sonatype, Inc and others.
+ *
+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
+ *
+ *  Contributors:
+ *     Sonatype, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.internal.p2.repository;
+
+import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
+import org.eclipse.equinox.p2.core.IAgentLocation;
+import org.eclipse.equinox.p2.core.IProvisioningAgent;
+import org.eclipse.equinox.p2.core.spi.IAgentServiceFactory;
+
+public class CacheManagerComponent implements IAgentServiceFactory {
+
+	@Override
+	public Object createService(IProvisioningAgent agent) {
+		final IProvisioningEventBus eventBus = agent.getService(IProvisioningEventBus.class);
+		CacheManager cache = new CacheManager(agent.getService(IAgentLocation.class),
+				agent.getService(Transport.class));
+		cache.setEventBus(eventBus);
+		return cache;
+	}
+
+}