Sudip Mukherjee pushed to branch master at Debian Java Maintainers / tycho
Commits: 2dcc54cd by Sudip Mukherjee at 2020-11-05T10:20:59+00:00 backport upstream patch Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 6bdf6ab5 by Sudip Mukherjee at 2020-11-05T10:30:38+00:00 Add changelog for 1.6.0-2 release Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 3 changed files: - debian/changelog - + debian/patches/0001-Update-to-Platform-4.17.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +tycho (1.6.0-2) unstable; urgency=medium + + * Team upload. + * Fix FTBFS due to libeclipse-osgi-java. (Closes: #973073) + - Backport upstream patch. + + -- Sudip Mukherjee <[email protected]> Thu, 05 Nov 2020 10:30:17 +0000 + tycho (1.6.0-1) unstable; urgency=medium * Team upload. ===================================== debian/patches/0001-Update-to-Platform-4.17.patch ===================================== @@ -0,0 +1,80 @@ +From 163adc27c3a97374ee38e78d6cf0a30e7ca2d266 Mon Sep 17 00:00:00 2001 +From: Alexander Kurtakov <[email protected]> +Date: Fri, 18 Sep 2020 08:51:09 +0300 +Subject: [PATCH] Update to Platform 4.17. + +Change-Id: I57d35f3c74de8aa83999945251ed6aaf26a04825 +Signed-off-by: Alexander Kurtakov <[email protected]> +--- + +upstream link: https://github.com/eclipse/tycho/commit/163adc27c3a97374ee38e78d6cf0a30e7ca2d266 + +diff --git a/pom.xml b/pom.xml +index fcb42e09..398b01a9 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.100</equinoxVersion> +- <equinoxCompatVersion>1.1.600</equinoxCompatVersion> +- <ecjVersion>3.20.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.5.1</tychoBootstrapVersion> +diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target +index 4de1f12e..7780b96c 100644 +--- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target ++++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target +@@ -15,7 +15,7 @@ + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="0.0.0"/> +-<repository location="http://download.eclipse.org/eclipse/updates/4.14/R-4.14-201912100610/"/> ++<repository location="https://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/"/> + </location> + <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> + <unit id="org.mockito" version="2.23.0.v20190527-1420"/> +@@ -25,7 +25,7 @@ + <unit id="org.junit" version="4.12.0.v201504281640"/> + <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> + <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/> +-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository/"/> ++<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/> + </location> + </locations> + </target> +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 66dd6008..8c5474cf 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); ===================================== debian/patches/series ===================================== @@ -5,3 +5,4 @@ mockito.patch explicit-exception-messages.patch aether.patch remove_dependency.patch +0001-Update-to-Platform-4.17.patch View it on GitLab: https://salsa.debian.org/java-team/tycho/-/compare/440360366b5b18aaefec78c6952ead967305321b...6bdf6ab54508e8a83c53cf63d1e0569258bef6ac -- View it on GitLab: https://salsa.debian.org/java-team/tycho/-/compare/440360366b5b18aaefec78c6952ead967305321b...6bdf6ab54508e8a83c53cf63d1e0569258bef6ac You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
