From fee749c2d4c82db48b160aae02426fe0f7ae958c Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 18 Sep 2020 08:51:09 +0300
Subject: [PATCH 9/9] Update to Platform 4.17.

Change-Id: I57d35f3c74de8aa83999945251ed6aaf26a04825
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>---
 pom.xml                                                      |  6 +++---
 .../tycho-bundles-target/tycho-bundles-target.target         |  4 ++--
 .../org/eclipse/tycho/core/locking/FileLockServiceImpl.java  | 12 ++++--------
 3 files changed, 9 insertions(+), 13 deletions(-)
---
 pom.xml                                              |  6 +++---
 .../tycho/core/locking/FileLockServiceImpl.java      | 12 ++++--------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0f41b2a..f5c70fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,9 +87,9 @@
 		<!-- NOTE: when updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
 		<surefire-version>2.22.0</surefire-version>
 
-		<equinoxVersion>3.15.200</equinoxVersion>
-		<equinoxCompatVersion>1.1.700</equinoxCompatVersion>
-		<ecjVersion>3.21.0</ecjVersion>
+		<equinoxVersion>3.16.0</equinoxVersion>
+		<equinoxCompatVersion>1.2.100</equinoxCompatVersion>
+		<ecjVersion>3.23.0</ecjVersion>
 
 		<!-- version of Tycho used by this build -->
 		<tychoBootstrapVersion>1.6.0</tychoBootstrapVersion>
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
index 66dd600..8c5474c 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2018 SAP AG and others.
+ * Copyright (c) 2011, 2020 SAP AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,15 +29,11 @@ public class FileLockServiceImpl implements FileLockService {
     private Location anyLocation;
 
     public FileLockServiceImpl() {
-        anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>(), new HashMap<>()),
-                new EquinoxContainer(null), new AtomicBoolean(false));
+        anyLocation = new BasicLocation(null, null, false, null,
+                new ConfigValues(new HashMap<String, String>(), new HashMap<>()), new EquinoxContainer(null, null),
+                new AtomicBoolean(false));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.tycho.p2.repository.FileLockService#getFileLocker(java.io.File)
-     */
     @Override
     public synchronized FileLocker getFileLocker(File file) {
         return new FileLockerImpl(file, anyLocation);
-- 
2.28.0