|
 |
ddccb33 |
From fee749c2d4c82db48b160aae02426fe0f7ae958c Mon Sep 17 00:00:00 2001
|
|
|
ddccb33 |
From: Alexander Kurtakov <akurtako@redhat.com>
|
|
|
ddccb33 |
Date: Fri, 18 Sep 2020 08:51:09 +0300
|
|
|
ddccb33 |
Subject: [PATCH 9/9] Update to Platform 4.17.
|
|
|
ddccb33 |
|
|
|
ddccb33 |
Change-Id: I57d35f3c74de8aa83999945251ed6aaf26a04825
|
|
|
ddccb33 |
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>---
|
|
|
ddccb33 |
pom.xml | 6 +++---
|
|
|
ddccb33 |
.../tycho-bundles-target/tycho-bundles-target.target | 4 ++--
|
|
|
ddccb33 |
.../org/eclipse/tycho/core/locking/FileLockServiceImpl.java | 12 ++++--------
|
|
|
ddccb33 |
3 files changed, 9 insertions(+), 13 deletions(-)
|
|
|
ddccb33 |
---
|
|
|
ddccb33 |
pom.xml | 6 +++---
|
|
|
ddccb33 |
.../tycho/core/locking/FileLockServiceImpl.java | 12 ++++--------
|
|
|
ddccb33 |
2 files changed, 7 insertions(+), 11 deletions(-)
|
|
|
ddccb33 |
|
|
|
ddccb33 |
diff --git a/pom.xml b/pom.xml
|
|
|
ddccb33 |
index 0f41b2a..f5c70fa 100644
|
|
|
ddccb33 |
--- a/pom.xml
|
|
|
ddccb33 |
+++ b/pom.xml
|
|
|
ddccb33 |
@@ -87,9 +87,9 @@
|
|
|
ddccb33 |
|
|
|
ddccb33 |
<surefire-version>2.22.0</surefire-version>
|
|
|
ddccb33 |
|
|
|
ddccb33 |
- <equinoxVersion>3.15.200</equinoxVersion>
|
|
|
ddccb33 |
- <equinoxCompatVersion>1.1.700</equinoxCompatVersion>
|
|
|
ddccb33 |
- <ecjVersion>3.21.0</ecjVersion>
|
|
|
ddccb33 |
+ <equinoxVersion>3.16.0</equinoxVersion>
|
|
|
ddccb33 |
+ <equinoxCompatVersion>1.2.100</equinoxCompatVersion>
|
|
|
ddccb33 |
+ <ecjVersion>3.23.0</ecjVersion>
|
|
|
ddccb33 |
|
|
|
ddccb33 |
|
|
|
ddccb33 |
<tychoBootstrapVersion>1.6.0</tychoBootstrapVersion>
|
|
|
ddccb33 |
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
|
|
|
ddccb33 |
index 66dd600..8c5474c 100644
|
|
|
ddccb33 |
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
|
|
|
ddccb33 |
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
|
|
|
ddccb33 |
@@ -1,5 +1,5 @@
|
|
|
ddccb33 |
/*******************************************************************************
|
|
|
ddccb33 |
- * Copyright (c) 2011, 2018 SAP AG and others.
|
|
|
ddccb33 |
+ * Copyright (c) 2011, 2020 SAP AG and others.
|
|
|
ddccb33 |
* All rights reserved. This program and the accompanying materials
|
|
|
ddccb33 |
* are made available under the terms of the Eclipse Public License v1.0
|
|
|
ddccb33 |
* which accompanies this distribution, and is available at
|
|
|
ddccb33 |
@@ -29,15 +29,11 @@ public class FileLockServiceImpl implements FileLockService {
|
|
|
ddccb33 |
private Location anyLocation;
|
|
|
ddccb33 |
|
|
|
ddccb33 |
public FileLockServiceImpl() {
|
|
|
ddccb33 |
- anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>(), new HashMap<>()),
|
|
|
ddccb33 |
- new EquinoxContainer(null), new AtomicBoolean(false));
|
|
|
ddccb33 |
+ anyLocation = new BasicLocation(null, null, false, null,
|
|
|
ddccb33 |
+ new ConfigValues(new HashMap<String, String>(), new HashMap<>()), new EquinoxContainer(null, null),
|
|
|
ddccb33 |
+ new AtomicBoolean(false));
|
|
|
ddccb33 |
}
|
|
|
ddccb33 |
|
|
|
ddccb33 |
- /*
|
|
|
ddccb33 |
- * (non-Javadoc)
|
|
|
ddccb33 |
- *
|
|
|
ddccb33 |
- * @see org.eclipse.tycho.p2.repository.FileLockService#getFileLocker(java.io.File)
|
|
|
ddccb33 |
- */
|
|
|
ddccb33 |
@Override
|
|
|
ddccb33 |
public synchronized FileLocker getFileLocker(File file) {
|
|
|
ddccb33 |
return new FileLockerImpl(file, anyLocation);
|
|
|
ddccb33 |
--
|
|
|
ddccb33 |
2.28.0
|
|
|
ddccb33 |
|