From ddccb3366c1faf191655d2b95eb39021d5032da5 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Nov 11 2020 15:29:08 +0000 Subject: Bootstrap against Eclipse 4.17 --- diff --git a/.gitignore b/.gitignore index 115e589..ffaed2b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ maven-repo.tar.xz /eclipse-bootstrap-oxygen.tar.xz /eclipse-bootstrap-photon.tar.xz /eclipse-bootstrap-2019-12.tar.xz +/eclipse-bootstrap-2020-09.tar.xz diff --git a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch b/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch index a8a028f..06d74a3 100644 --- a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch +++ b/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch @@ -1,7 +1,7 @@ From fbe4e597af880a1f175c51edc3607c95a5008a69 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 09:56:38 -0400 -Subject: [PATCH 1/8] Fix the Tycho build to work on Fedora. +Subject: [PATCH 1/9] Fix the Tycho build to work on Fedora. Minor fixes of limited scope needed to have Tycho building on Fedora. diff --git a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch b/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch index 56b0531..e61389e 100644 --- a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch +++ b/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch @@ -1,7 +1,7 @@ From 4adb496677296e9a8e33f0358ec5551ff35c86e8 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 10:38:51 -0400 -Subject: [PATCH 2/8] Implement a custom resolver for Tycho in local mode. +Subject: [PATCH 2/9] Implement a custom resolver for Tycho in local mode. When running in local mode, dependencies should be resolved by looking on the local system. Remote repositories should be ignored unless diff --git a/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch b/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch index a6c6c2a..d43d94e 100644 --- a/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch +++ b/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch @@ -1,7 +1,7 @@ From f0d32a7d59cab701811abcb9060ae4696e48e58e Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Wed, 18 Jun 2014 13:01:31 -0400 -Subject: [PATCH 3/8] Tycho should always delegate artifact resolution to +Subject: [PATCH 3/9] Tycho should always delegate artifact resolution to Maven. Maven resolves dependencies from the following locations in the diff --git a/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch b/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch index f68ece8..e236b9a 100644 --- a/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch +++ b/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch @@ -1,7 +1,7 @@ From 2e6d9f73db9a3d8f4b4c70afb06a86cf636e3687 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 15 Aug 2018 15:58:10 +0100 -Subject: [PATCH 4/8] Bug 537963 - Make the default EE Java 1.8 +Subject: [PATCH 4/9] Bug 537963 - Make the default EE Java 1.8 This allows bundles that don't otherwise specify an EE (for example if the bundle contains only a plugin.xml, or is a documentation only diff --git a/0005-Fix-uncaught-exception.patch b/0005-Fix-uncaught-exception.patch index fc21540..ea5b719 100644 --- a/0005-Fix-uncaught-exception.patch +++ b/0005-Fix-uncaught-exception.patch @@ -1,7 +1,7 @@ From b68bfab4c4219d28f23d5b5fc1c102efb24374e9 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 20 Feb 2020 16:08:00 +0000 -Subject: [PATCH 5/8] Fix uncaught exception +Subject: [PATCH 5/9] Fix uncaught exception "unreported exception org.codehaus.plexus.configuration.PlexusConfigurationException; must be caught or declared to be thrown" --- diff --git a/0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch b/0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch index 9dc856c..cf06a5c 100644 --- a/0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch +++ b/0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch @@ -1,7 +1,7 @@ From 5bd7c39c64bb1ab7f2d46c03071547b2828acad7 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 20 Mar 2020 02:35:02 +0000 -Subject: [PATCH 6/8] Fix dependency problems when bootstrapping with extras +Subject: [PATCH 6/9] Fix dependency problems when bootstrapping with extras --- tycho-extras/pack200/tycho-pack200b-plugin/pom.xml | 4 ++-- diff --git a/0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch b/0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch index 35f0438..990e99b 100644 --- a/0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch +++ b/0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch @@ -1,7 +1,7 @@ From 117dfa03082432d2725e160d35936164004a63b8 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Mon, 6 May 2013 14:20:58 -0400 -Subject: [PATCH 7/8] Use custom resolver for tycho-eclipserun-plugin. +Subject: [PATCH 7/9] Use custom resolver for tycho-eclipserun-plugin. Add various system local OSGi bundle locations to the target platform used by tycho-eclipserun-plugin. diff --git a/0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch b/0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch index f07656a..acdc222 100644 --- a/0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch +++ b/0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch @@ -1,7 +1,7 @@ From 85a2495116da48f4a4328a9066a7147c9e363b70 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 11 Nov 2020 10:04:50 +0000 -Subject: [PATCH 8/8] Bug 561832 - Upgrade to [takari/polyglot-maven] Release +Subject: [PATCH 8/9] Bug 561832 - Upgrade to [takari/polyglot-maven] Release 0.4.5 --- diff --git a/0009-Update-to-Platform-4.17.patch b/0009-Update-to-Platform-4.17.patch new file mode 100644 index 0000000..b9a3059 --- /dev/null +++ b/0009-Update-to-Platform-4.17.patch @@ -0,0 +1,66 @@ +From fee749c2d4c82db48b160aae02426fe0f7ae958c Mon Sep 17 00:00:00 2001 +From: Alexander Kurtakov +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 --- + 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 @@ + + 2.22.0 + +- 3.15.200 +- 1.1.700 +- 3.21.0 ++ 3.16.0 ++ 1.2.100 ++ 3.23.0 + + + 1.6.0 +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(), new HashMap<>()), +- new EquinoxContainer(null), new AtomicBoolean(false)); ++ anyLocation = new BasicLocation(null, null, false, null, ++ new ConfigValues(new HashMap(), 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 + diff --git a/sources b/sources index d417c88..61bedcd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (fedoraproject-p2-290f67a4c717599b2f5166ea89aa5365571314b1.tar.gz) = 5ddfa3e7c1dc3d64335d836d74d7325904f294e0ab1782de41a8815b09ddf42f0c47a263c3a6217626aaf293a17788d01174c327e17b192a0f451d07d5655c49 -SHA512 (eclipse-bootstrap-2019-12.tar.xz) = 95a7bcf66c60e9a2a667865b8c79cd552ac5b09209de4960db3fa61c39e81772bb83c4bc8dd737f5ce99864d0ad7854bc7918c7c7db90d2bfc004c85b9e9a595 +SHA512 (eclipse-bootstrap-2020-09.tar.xz) = 6c23aa798cff55978b45fea401c8c35f8d1a0905fc3366bf80f08d0e9da0f0bda406d5a96b52cc73e9523f18b8e1c13cf5ea644714caf7e72f39cbe1b743dfd1 SHA512 (org.eclipse.tycho-tycho-1.7.0.tar.xz) = 7a48b674b5cb997c60b27ccbb6022159731913f4918f23c2aea508be31f7955e42092478adfd076e40ddcef5ac188563bc43f1f80ba489b0493100e9fb629907 diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh index 2c801b0..abad68d 100755 --- a/tycho-bootstrap.sh +++ b/tycho-bootstrap.sh @@ -4,8 +4,8 @@ preV=$1 v="$preV-SNAPSHOT" -osgiV='3.15.100.v20191219-0358' -osgiCompatV='1.1.600.v20191219-0358' +osgiV='3.16.0.v20200914-0420' +osgiCompatV='1.2.100.v20200914-0420' fp2V='0.0.1-SNAPSHOT' bundles=() bundles[0]='tycho-bundles/org.eclipse.tycho.embedder.shared' diff --git a/tycho.spec b/tycho.spec index 182fa44..766c443 100644 --- a/tycho.spec +++ b/tycho.spec @@ -9,7 +9,7 @@ # Tycho such that it can build a bootstrap mode Eclipse and subsequently # fully rebuild itself. In this mode, there may be reduced functionality, # so a full non-bootstrap mode build should always be done afterwards. -%bcond_with bootstrap +%bcond_without bootstrap # Allow conditionally building without Junit 5 support %bcond_with junit5 @@ -28,7 +28,7 @@ Name: tycho Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven # license file is missing but all files having some licensing information are ASL 2.0 @@ -54,7 +54,7 @@ Source6: p2-install.sh # Fedora Eclipse bundles needed to build Tycho when Eclipse is not present # or when the Eclipse that is present is not compatible %if %{with bootstrap} -Source10: eclipse-bootstrap-2019-12.tar.xz +Source10: eclipse-bootstrap-2020-09.tar.xz %endif # Fedora-specific patches @@ -70,6 +70,8 @@ Patch4: 0005-Fix-uncaught-exception.patch Patch5: 0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch # Updated polyglot Patch7: 0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch +# Build against 4.17 +Patch8: 0009-Update-to-Platform-4.17.patch # Upstream Eclipse no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -84,7 +86,7 @@ BuildRequires: maven-local BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin) BuildRequires: mvn(com.beust:jcommander) BuildRequires: mvn(de.pdark:decentxml) -BuildRequires: mvn(io.takari.polyglot:polyglot-common) +BuildRequires: mvn(io.takari.polyglot:polyglot-common) >= 0.4.5 BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-exec) BuildRequires: mvn(org.apache.commons:commons-lang3) @@ -128,7 +130,7 @@ BuildRequires: mvn(org.opentest4j:opentest4j) %if ! %{with bootstrap} # Ordinarily Tycho additionally requires itself and Eclipse to build BuildRequires: %{name} -BuildRequires: eclipse-platform >= 1:4.11 +BuildRequires: eclipse-platform >= 1:4.17 %else # For bootstrapping, we just need the dependencies of the Eclipse bundles we use BuildRequires: osgi(com.ibm.icu) @@ -145,7 +147,7 @@ Requires: xmvn-minimal Requires: ecj %if ! %{with bootstrap} -Requires: eclipse-platform >= 1:4.11 +Requires: eclipse-platform >= 1:4.17 %endif # maven-clean-plugin is bound to "initialize" Maven phase for @@ -198,6 +200,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2 %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Unneeded for RPM builds %pom_remove_plugin :maven-site-plugin @@ -428,6 +431,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst %files javadoc -f .mfiles-javadoc %changelog +* Wed Nov 11 2020 Mat Booth - 1.7.0-2 +- Bootstrap against Eclipse 4.17 + * Wed Nov 11 2020 Mat Booth - 1.7.0-1 - Interrim update to tycho version