Architecture specific change in rpms/xcfun.git
by githook-noreply＠fedoraproject.org
The package rpms/xcfun.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xcfun.git/commit/?id=8005d1ec9a0c....
Change:
-ExcludeArch: %{arm} %{ix86}
Thanks.
Full change:
============
commit 8005d1ec9a0c679414ca09ff36da971e55d97b30
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Wed Sep 8 11:48:41 2021 +0000
Fix 32-bit builds and potential array overflow
diff --git a/154.patch b/154.patch
new file mode 100644
index 0000000..7944790
--- /dev/null
+++ b/154.patch
@@ -0,0 +1,53 @@
+From 5d37981978494681a6e55224ac6e6f765eb59edb Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <roberto.diremigio(a)gmail.com>
+Date: Mon, 23 Aug 2021 08:23:23 +0200
+Subject: [PATCH] Always use a temporary of large enough size
+
+Should fix #151
+---
+ src/functionals/brx.cpp | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/src/functionals/brx.cpp b/src/functionals/brx.cpp
+index 260a0ed..acaaafc 100644
+--- a/src/functionals/brx.cpp
++++ b/src/functionals/brx.cpp
+@@ -50,11 +50,15 @@ static double BR(double z) {
+ // Obtain the Taylor expansion of x(y), which is the
+ // inverse of BR_y. Use linear method for simplicity.
+ template <typename T, int Ndeg>
+-void BR_taylor(const T & z0, taylor<T, 1, Ndeg> & t) {
+- taylor<T, 1, Ndeg> f, d;
++taylor <T, 1, Ndeg> BR_taylor(const T & z0) {
++ static_assert(Ndeg >= 3);
++
++ taylor<T, 1, Ndeg> t;
+ t = 0;
+ t[0] = BR(z0);
+ t[1] = 1;
++
++ taylor<T, 1, Ndeg> f;
+ f = BR_z(t);
+ t[1] = 1 / f[1];
+ // Linear method, for quadratic see i.e. Brent & Kung ~197x
+@@ -62,6 +66,8 @@ void BR_taylor(const T & z0, taylor<T, 1, Ndeg> & t) {
+ f = BR_z(t);
+ t[i] = -f[i] * t[1];
+ }
++
++ return t;
+ }
+
+ /* This is a fully differentiable solver for Eq.(21) in
+@@ -70,8 +76,9 @@ void BR_taylor(const T & z0, taylor<T, 1, Ndeg> & t) {
+ */
+ template <typename T, int Nvar>
+ static ctaylor<T, Nvar> BR(const ctaylor<T, Nvar> & t) {
+- taylor<T, 1, Nvar> tmp;
+- BR_taylor(t.c[0], tmp);
++ // temporary has dimension 3 at least. See: https://github.com/dftlibs/xcfun/issues/151
++ // in C++14 and later can use std::max(Nvar, 3) for the second template argument
++ auto tmp = BR_taylor<T, (Nvar >= 3) ? Nvar : 3>(t.c[0]);
+
+ ctaylor<T, Nvar> res = tmp[0];
+ for (int i = 1; i <= Nvar; i++)
diff --git a/155.patch b/155.patch
new file mode 100644
index 0000000..94cb35a
--- /dev/null
+++ b/155.patch
@@ -0,0 +1,70 @@
+From 1c03a9078b8ed2d47be36db6f0d3b8c0d9ba9ddd Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <robertodr(a)users.noreply.github.com>
+Date: Wed, 8 Sep 2021 10:32:00 +0200
+Subject: [PATCH 1/3] Patch py::array_t CTOR usage
+
+---
+ python/export_xcfun.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/python/export_xcfun.cpp b/python/export_xcfun.cpp
+index df5631a..7004299 100644
+--- a/python/export_xcfun.cpp
++++ b/python/export_xcfun.cpp
+@@ -141,8 +141,7 @@ PYBIND11_MODULE(_xcfun, m) {
+ }
+ auto nr_points = density.shape(0);
+ auto output =
+- py::array_t<double, py::array::c_style | py::array::forcecast>(
+- {{nr_points, output_len}});
++ py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len});
+
+ if (dens_ndim == 1) {
+ xcfun::xcfun_eval(fun, density.data(), output.mutable_data());
+
+From ee56726019aa57ab104b3a5cc73967db0ab528f3 Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <robertodr(a)users.noreply.github.com>
+Date: Wed, 8 Sep 2021 10:54:45 +0200
+Subject: [PATCH 2/3] Use correct CTOR
+
+We want to use this one: https://github.com/pybind/pybind11/blob/v2.7.1/include/pybind11/numpy.h#L876
+---
+ python/export_xcfun.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/export_xcfun.cpp b/python/export_xcfun.cpp
+index 7004299..37fdb92 100644
+--- a/python/export_xcfun.cpp
++++ b/python/export_xcfun.cpp
+@@ -141,7 +141,7 @@ PYBIND11_MODULE(_xcfun, m) {
+ }
+ auto nr_points = density.shape(0);
+ auto output =
+- py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len});
++ py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len}, nullptr);
+
+ if (dens_ndim == 1) {
+ xcfun::xcfun_eval(fun, density.data(), output.mutable_data());
+
+From 30c3846671696b585ec16fffac6f9579a81ccedd Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <robertodr(a)users.noreply.github.com>
+Date: Wed, 8 Sep 2021 11:06:53 +0200
+Subject: [PATCH 3/3] Finagling with the CTOR
+
+---
+ python/export_xcfun.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/export_xcfun.cpp b/python/export_xcfun.cpp
+index 37fdb92..9b74df2 100644
+--- a/python/export_xcfun.cpp
++++ b/python/export_xcfun.cpp
+@@ -141,7 +141,7 @@ PYBIND11_MODULE(_xcfun, m) {
+ }
+ auto nr_points = density.shape(0);
+ auto output =
+- py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len}, nullptr);
++ py::array_t<double, py::array::c_style | py::array::forcecast>({{nr_points, output_len}}, nullptr);
+
+ if (dens_ndim == 1) {
+ xcfun::xcfun_eval(fun, density.data(), output.mutable_data());
diff --git a/xcfun.spec b/xcfun.spec
index 0257248..ffddf7f 100644
--- a/xcfun.spec
+++ b/xcfun.spec
@@ -2,14 +2,16 @@
Name: xcfun
Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A library of approximate exchange-correlation functionals
License: MPLv2.0
URL: https://xcfun.readthedocs.io
Source0: https://github.com/dftlibs/xcfun/archive/v%{version}/%{name}-%{version}.t...
-# xcfun does not build at the moment on 32-bit architectures
-ExcludeArch: %{arm} %{ix86}
+# Patch out potential array overflow
+Patch0: https://github.com/dftlibs/xcfun/pull/154.patch
+# Fix build on 32-bit architectures
+Patch1: https://github.com/dftlibs/xcfun/pull/155.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -68,6 +70,8 @@ This package contains the Python bindings for XCFun.
%prep
%setup -q
+%patch0 -p1 -b .overflow
+%patch1 -p1 -b .32bit
%build
%cmake -B %{_host} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIB=%{_lib} -DXCFUN_PYTHON_INTERFACE=ON -DPYMOD_INSTALL_LIBDIR=../../%{python3_sitearch}
@@ -96,6 +100,9 @@ ctest --output-on-failure
%{python3_sitearch}/xcfun
%changelog
+* Wed Sep 08 2021 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 2.1.1-5
+- Patches to fix 32-bit builds and potential array overflow.
+
* Fri Jul 30 2021 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 2.1.1-4
- Disable 32-bit architectures which are not supported by xcfun.
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/xcfun.git
by githook-noreply＠fedoraproject.org
The package rpms/xcfun.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xcfun.git/commit/?id=8005d1ec9a0c....
Change:
-ExcludeArch: %{arm} %{ix86}
Thanks.
Full change:
============
commit 8005d1ec9a0c679414ca09ff36da971e55d97b30
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Wed Sep 8 11:48:41 2021 +0000
Fix 32-bit builds and potential array overflow
diff --git a/154.patch b/154.patch
new file mode 100644
index 0000000..7944790
--- /dev/null
+++ b/154.patch
@@ -0,0 +1,53 @@
+From 5d37981978494681a6e55224ac6e6f765eb59edb Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <roberto.diremigio(a)gmail.com>
+Date: Mon, 23 Aug 2021 08:23:23 +0200
+Subject: [PATCH] Always use a temporary of large enough size
+
+Should fix #151
+---
+ src/functionals/brx.cpp | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/src/functionals/brx.cpp b/src/functionals/brx.cpp
+index 260a0ed..acaaafc 100644
+--- a/src/functionals/brx.cpp
++++ b/src/functionals/brx.cpp
+@@ -50,11 +50,15 @@ static double BR(double z) {
+ // Obtain the Taylor expansion of x(y), which is the
+ // inverse of BR_y. Use linear method for simplicity.
+ template <typename T, int Ndeg>
+-void BR_taylor(const T & z0, taylor<T, 1, Ndeg> & t) {
+- taylor<T, 1, Ndeg> f, d;
++taylor <T, 1, Ndeg> BR_taylor(const T & z0) {
++ static_assert(Ndeg >= 3);
++
++ taylor<T, 1, Ndeg> t;
+ t = 0;
+ t[0] = BR(z0);
+ t[1] = 1;
++
++ taylor<T, 1, Ndeg> f;
+ f = BR_z(t);
+ t[1] = 1 / f[1];
+ // Linear method, for quadratic see i.e. Brent & Kung ~197x
+@@ -62,6 +66,8 @@ void BR_taylor(const T & z0, taylor<T, 1, Ndeg> & t) {
+ f = BR_z(t);
+ t[i] = -f[i] * t[1];
+ }
++
++ return t;
+ }
+
+ /* This is a fully differentiable solver for Eq.(21) in
+@@ -70,8 +76,9 @@ void BR_taylor(const T & z0, taylor<T, 1, Ndeg> & t) {
+ */
+ template <typename T, int Nvar>
+ static ctaylor<T, Nvar> BR(const ctaylor<T, Nvar> & t) {
+- taylor<T, 1, Nvar> tmp;
+- BR_taylor(t.c[0], tmp);
++ // temporary has dimension 3 at least. See: https://github.com/dftlibs/xcfun/issues/151
++ // in C++14 and later can use std::max(Nvar, 3) for the second template argument
++ auto tmp = BR_taylor<T, (Nvar >= 3) ? Nvar : 3>(t.c[0]);
+
+ ctaylor<T, Nvar> res = tmp[0];
+ for (int i = 1; i <= Nvar; i++)
diff --git a/155.patch b/155.patch
new file mode 100644
index 0000000..94cb35a
--- /dev/null
+++ b/155.patch
@@ -0,0 +1,70 @@
+From 1c03a9078b8ed2d47be36db6f0d3b8c0d9ba9ddd Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <robertodr(a)users.noreply.github.com>
+Date: Wed, 8 Sep 2021 10:32:00 +0200
+Subject: [PATCH 1/3] Patch py::array_t CTOR usage
+
+---
+ python/export_xcfun.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/python/export_xcfun.cpp b/python/export_xcfun.cpp
+index df5631a..7004299 100644
+--- a/python/export_xcfun.cpp
++++ b/python/export_xcfun.cpp
+@@ -141,8 +141,7 @@ PYBIND11_MODULE(_xcfun, m) {
+ }
+ auto nr_points = density.shape(0);
+ auto output =
+- py::array_t<double, py::array::c_style | py::array::forcecast>(
+- {{nr_points, output_len}});
++ py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len});
+
+ if (dens_ndim == 1) {
+ xcfun::xcfun_eval(fun, density.data(), output.mutable_data());
+
+From ee56726019aa57ab104b3a5cc73967db0ab528f3 Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <robertodr(a)users.noreply.github.com>
+Date: Wed, 8 Sep 2021 10:54:45 +0200
+Subject: [PATCH 2/3] Use correct CTOR
+
+We want to use this one: https://github.com/pybind/pybind11/blob/v2.7.1/include/pybind11/numpy.h#L876
+---
+ python/export_xcfun.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/export_xcfun.cpp b/python/export_xcfun.cpp
+index 7004299..37fdb92 100644
+--- a/python/export_xcfun.cpp
++++ b/python/export_xcfun.cpp
+@@ -141,7 +141,7 @@ PYBIND11_MODULE(_xcfun, m) {
+ }
+ auto nr_points = density.shape(0);
+ auto output =
+- py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len});
++ py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len}, nullptr);
+
+ if (dens_ndim == 1) {
+ xcfun::xcfun_eval(fun, density.data(), output.mutable_data());
+
+From 30c3846671696b585ec16fffac6f9579a81ccedd Mon Sep 17 00:00:00 2001
+From: Roberto Di Remigio <robertodr(a)users.noreply.github.com>
+Date: Wed, 8 Sep 2021 11:06:53 +0200
+Subject: [PATCH 3/3] Finagling with the CTOR
+
+---
+ python/export_xcfun.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/export_xcfun.cpp b/python/export_xcfun.cpp
+index 37fdb92..9b74df2 100644
+--- a/python/export_xcfun.cpp
++++ b/python/export_xcfun.cpp
+@@ -141,7 +141,7 @@ PYBIND11_MODULE(_xcfun, m) {
+ }
+ auto nr_points = density.shape(0);
+ auto output =
+- py::array_t<double, py::array::c_style | py::array::forcecast>({nr_points, output_len}, nullptr);
++ py::array_t<double, py::array::c_style | py::array::forcecast>({{nr_points, output_len}}, nullptr);
+
+ if (dens_ndim == 1) {
+ xcfun::xcfun_eval(fun, density.data(), output.mutable_data());
diff --git a/xcfun.spec b/xcfun.spec
index 0257248..ffddf7f 100644
--- a/xcfun.spec
+++ b/xcfun.spec
@@ -2,14 +2,16 @@
Name: xcfun
Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A library of approximate exchange-correlation functionals
License: MPLv2.0
URL: https://xcfun.readthedocs.io
Source0: https://github.com/dftlibs/xcfun/archive/v%{version}/%{name}-%{version}.t...
-# xcfun does not build at the moment on 32-bit architectures
-ExcludeArch: %{arm} %{ix86}
+# Patch out potential array overflow
+Patch0: https://github.com/dftlibs/xcfun/pull/154.patch
+# Fix build on 32-bit architectures
+Patch1: https://github.com/dftlibs/xcfun/pull/155.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -68,6 +70,8 @@ This package contains the Python bindings for XCFun.
%prep
%setup -q
+%patch0 -p1 -b .overflow
+%patch1 -p1 -b .32bit
%build
%cmake -B %{_host} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIB=%{_lib} -DXCFUN_PYTHON_INTERFACE=ON -DPYMOD_INSTALL_LIBDIR=../../%{python3_sitearch}
@@ -96,6 +100,9 @@ ctest --output-on-failure
%{python3_sitearch}/xcfun
%changelog
+* Wed Sep 08 2021 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 2.1.1-5
+- Patches to fix 32-bit builds and potential array overflow.
+
* Fri Jul 30 2021 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 2.1.1-4
- Disable 32-bit architectures which are not supported by xcfun.
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/tycho.git
by githook-noreply＠fedoraproject.org
The package rpms/tycho.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/tycho.git/commit/?id=c87ccc46abb2....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit c87ccc46abb2cc2ed575edb72bcfe4a529a2f31e
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:21:32 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d13fcf2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-/maven-repo.tar.bz2
-/org.eclipse.tycho-*
-/tycho-*.xz
-/tycho-*.bz2
-/tycho-*.gz
-/tycho-*/
-maven-repo.tar.xz
-*.src.rpm
-/noarch
-/.project
-/fedoraproject-p2-*.tar.xz
-/fedoraproject-p2-*.tar.gz
-/eclipse-bootstrap-neon.tar.xz
-/eclipse-bootstrap-oxygen.tar.xz
-/eclipse-bootstrap-photon.tar.xz
-/eclipse-bootstrap-2019-12.tar.xz
-/eclipse-bootstrap-2020-09.tar.xz
-/eclipse-bootstrap-2020-12.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
deleted file mode 100644
index e10577f..0000000
--- a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8c2fc50f696b1b17e869e0bed6fd042174d99f91 Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber(a)redhat.com>
-Date: Tue, 12 Jun 2012 09:56:38 -0400
-Subject: [PATCH 1/7] Fix the Tycho build to work on Fedora.
-
-Minor fixes of limited scope needed to have Tycho building on Fedora.
-
-Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
----
- .../core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
- .../tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-index f19a8a9..4bbb59b 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-@@ -108,7 +108,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
- }
-
- private void validate(List<MavenProject> projects) throws MavenExecutionException {
-- validateConsistentTychoVersion(projects);
-+ if (System.getProperty("tycho.enableVersionCheck") != null) {
-+ validateConsistentTychoVersion(projects);
-+ }
- validateUniqueBaseDirs(projects);
- }
-
-diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
-index 96e42e5..d6c7678 100644
---- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
-+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
-@@ -115,12 +115,11 @@ public abstract class AbstractTychoIntegrationTest {
- verifier.getCliOptions().add(customOptions);
- }
-
-- if (System.getProperty(SYSPROP_STATELOCATION) != null) {
-- verifier.setForkJvm(false);
-- String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX
-- if (m2eresolver != null) {
-- verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver);
-- }
-+ String m2eState = System.getProperty("m2eclipse.workspace.state");
-+ String m2eResolver = System.getProperty("m2eclipse.workspace.resolver");
-+
-+ if (m2eState != null && m2eResolver != null) {
-+ verifier.getVerifierProperties().put("m2eclipse.workspace.state", m2eState);
- }
-
- return verifier;
---
-2.28.0
-
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
deleted file mode 100644
index c167510..0000000
--- a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
+++ /dev/null
@@ -1,692 +0,0 @@
-From 644f108f5b6453d88cd39771b944598de0ae60d1 Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber(a)redhat.com>
-Date: Tue, 12 Jun 2012 10:38:51 -0400
-Subject: [PATCH 2/7] 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
-offline mode is disabled.
-
-Use fedoraproject-p2 to resolve bundles from their system location.
-
-Relax constraints for bundles used in Tycho's Equinox runtime.
-
-Since Fedora 17, we need an Execution Environment of at least JavaSE-1.6
-for Eclipse bundles. Eclipse Juno platform bundles depend on
-javax.annotation. In Fedora this is provided by geronimo-annotation, but
-has a dependency on javax.lang.model (since 1.6).
-
-Use the defined target environments in local mode when the property
-tycho.local.keepTarget is set.
-
-In situations where Tycho must resolve maven artifacts, upstream's
-implementation only looks in the reactor cache. In Fedora, maven
-artifacts may be located on the system using repository layouts
-understood by XMvn. Therefore, when an artifact is not found in the
-reactor cache, resolution should be attempted using the XMvn Resolver.
-
-Upstream/Fedora Tycho differ in the kind of OSGi Runtime used
-(org.eclipse.tycho:tycho-bundles-external:zip) so use separate location
-for our runtime (fedora-eclipse) to avoid collisions.
-
-Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
----
- .../internal/DefaultEquinoxEmbedder.java | 19 ++++++--
- .../remote/RemoteRepositoryCacheManager.java | 11 +++++
- .../p2/target/TargetDefinitionResolver.java | 11 ++++-
- .../p2/target/TargetPlatformFactoryImpl.java | 45 +++++++++++++++++--
- .../MavenBundlesArtifactRepository.java | 20 +++------
- .../p2/repository/LocalRepositoryReader.java | 41 ++++++++++++++++-
- .../TargetPlatformConfigurationStub.java | 6 ++-
- .../tycho-bundles-external.product | 1 +
- .../tycho/core/locking/FileLockerImpl.java | 26 ++++++++---
- .../maven/TychoMavenLifecycleParticipant.java | 13 ++++++
- .../core/osgitools/AbstractTychoProject.java | 37 +++++++++++++++
- .../core/osgitools/OsgiBundleProject.java | 6 ++-
- ...aultTargetPlatformConfigurationReader.java | 6 ++-
- .../osgi/runtime/TychoOsgiRuntimeLocator.java | 33 +++++++++-----
- tycho-p2/tycho-p2-facade/pom.xml | 5 +++
- .../p2/resolver/P2DependencyResolver.java | 9 ++++
- 16 files changed, 244 insertions(+), 45 deletions(-)
-
-diff --git a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
-index 3ea7278..fea08c7 100644
---- a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
-+++ b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
-@@ -97,14 +97,18 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
-
- @Override
- public void addInstallation(File location) {
-- if (location == null || !location.isDirectory() || !new File(location, "plugins").isDirectory()) {
-+ if (location == null || !location.isDirectory() || (!new File(location, "plugins").isDirectory() && !new File(location, "eclipse/plugins").isDirectory())) {
- throw new IllegalArgumentException();
- }
- if (!installationLocations.isEmpty()) {
- // allow only one installation for now
- throw new IllegalStateException();
- }
-- installationLocations.add(location);
-+ if (new File(location, "plugins").isDirectory()) {
-+ installationLocations.add(location);
-+ } else {
-+ installationLocations.add(new File(location, "eclipse"));
-+ }
- }
-
- @Override
-@@ -241,7 +245,14 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
- if (verIdx > 0) {
- bundles.append(name.substring(0, verIdx));
- } else {
-- throw new EquinoxEmbedderException("File name doesn't match expected pattern: " + file);
-+ // In Fedora, NAME_VERSION.QUALIFIER.jar is too fragile.
-+ // Let's also accept NAME.jar
-+ verIdx = name.lastIndexOf(".jar");
-+ if (verIdx > 0) {
-+ bundles.append(name.substring(0, verIdx));
-+ } else {
-+ throw new EquinoxEmbedderException("File name doesn't match expected pattern: " + file);
-+ }
- }
- }
- }
-@@ -249,7 +260,7 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
- }
-
- protected boolean isFrameworkBundle(File file) {
-- return file.getName().startsWith("org.eclipse.osgi_");
-+ return file.getName().startsWith("org.eclipse.osgi_") || file.getName().equals("org.eclipse.osgi.jar");
- }
-
- String getReferenceUrl(File file) {
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
-index 4cc81b1..63060e5 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
-@@ -14,14 +14,18 @@ package org.eclipse.tycho.p2.remote;
-
- import java.io.File;
- import java.io.IOException;
-+import java.net.MalformedURLException;
- import java.net.URI;
-+import java.net.URL;
-
- import org.eclipse.core.runtime.IProgressMonitor;
- import org.eclipse.core.runtime.IStatus;
- import org.eclipse.core.runtime.Status;
- import org.eclipse.equinox.internal.p2.repository.CacheManager;
-+import org.eclipse.equinox.internal.p2.repository.Messages;
- import org.eclipse.equinox.internal.p2.repository.Transport;
- import org.eclipse.equinox.p2.core.ProvisionException;
-+import org.eclipse.osgi.util.NLS;
- import org.eclipse.tycho.core.shared.MavenContext;
- import org.eclipse.tycho.core.shared.MavenLogger;
- import org.eclipse.tycho.p2.impl.Activator;
-@@ -53,6 +57,13 @@ class RemoteRepositoryCacheManager extends CacheManager {
- @Override
- public File createCache(URI repositoryLocation, String prefix, IProgressMonitor monitor)
- throws IOException, ProvisionException {
-+ try {
-+ new URL(repositoryLocation.toASCIIString());
-+ } catch (MalformedURLException e) {
-+ throw new ProvisionException(new Status(IStatus.ERROR,
-+ org.eclipse.equinox.internal.p2.repository.Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND,
-+ NLS.bind(Messages.CacheManager_CannotLoadNonUrlLocation, repositoryLocation), null));
-+ }
- File cacheFile = getCache(repositoryLocation, prefix);
- if (offline) {
- if (cacheFile != null) {
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
-index 8cf981c..ce39b4a 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
-@@ -29,6 +29,7 @@ import java.util.regex.Matcher;
- import java.util.regex.Pattern;
-
- import org.eclipse.core.runtime.IProgressMonitor;
-+import org.eclipse.core.runtime.URIUtil;
- import org.eclipse.equinox.p2.core.IProvisioningAgent;
- import org.eclipse.equinox.p2.metadata.IArtifactKey;
- import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-@@ -141,8 +142,14 @@ public final class TargetDefinitionResolver {
- for (Repository repository : installableUnitLocation.getRepositories()) {
- URI location = repository.getLocation();
- String key = location.normalize().toASCIIString();
-- locations.add(uriRepositories.computeIfAbsent(key,
-- s -> new URITargetDefinitionContent(provisioningAgent, location, repository.getId())));
-+ // We cannot resolve a non-file URI in local mode
-+ if ((System.getProperty("TYCHO_MVN_LOCAL") == null
-+ && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
-+ || URIUtil.isFileURI(repository.getLocation())
-+ || "fedora".equals(repository.getLocation().getScheme())) {
-+ locations.add(uriRepositories.computeIfAbsent(key,
-+ s -> new URITargetDefinitionContent(provisioningAgent, location, repository.getId())));
-+ }
- }
- IQueryable<IInstallableUnit> locationUnits = QueryUtil.compoundQueryable(locations);
- installableUnitResolver.addLocation((InstallableUnitLocation) locationDefinition, locationUnits);
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
-index bc98b2f..0156d94 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
-@@ -37,6 +37,9 @@ import org.eclipse.core.runtime.URIUtil;
- import org.eclipse.equinox.p2.core.IProvisioningAgent;
- import org.eclipse.equinox.p2.core.ProvisionException;
- import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-+import org.eclipse.equinox.p2.metadata.expression.ExpressionUtil;
-+import org.eclipse.equinox.p2.metadata.expression.IExpression;
-+import org.eclipse.equinox.p2.query.IQuery;
- import org.eclipse.equinox.p2.query.IQueryResult;
- import org.eclipse.equinox.p2.query.QueryUtil;
- import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
-@@ -279,9 +282,43 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory {
- metadataRepositories.add(localMetadataRepository);
- }
-
-- for (IMetadataRepository repository : metadataRepositories) {
-- IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, monitor);
-- result.addAll(matches.toUnmodifiableSet());
-+ if (System.getProperty("TYCHO_MVN_LOCAL") != null) {
-+ final IExpression notmatchIU_ID = ExpressionUtil.parse("id != $0");
-+ Set<IMetadataRepository> fedoraRepos = new HashSet<IMetadataRepository>();
-+
-+ // Sanity check even though the repo we want should be at index 1
-+ for (IMetadataRepository repository : metadataRepositories) {
-+ if ("fedora".equals(repository.getLocation().getScheme())) {
-+ fedoraRepos.add(repository);
-+ }
-+ }
-+
-+ IQuery<IInstallableUnit> noLocalIUs = QueryUtil.createIUAnyQuery();
-+
-+ // Create a conjunction query that negates all IUs on the local system
-+ for (IMetadataRepository repo : fedoraRepos) {
-+ for (IInstallableUnit unit : repo.query(QueryUtil.ALL_UNITS, null).toUnmodifiableSet()) {
-+ noLocalIUs = QueryUtil.createCompoundQuery(noLocalIUs,
-+ QueryUtil.createMatchQuery(notmatchIU_ID, unit.getId()), true);
-+ }
-+ }
-+
-+ for (IMetadataRepository repository : metadataRepositories) {
-+ IQueryResult<IInstallableUnit> matches;
-+ if ("fedora".equals(repository.getLocation().getScheme())) {
-+ matches = repository.query(QueryUtil.ALL_UNITS, monitor);
-+ } else {
-+ // Don't collect any remote IUs that can be found on the system
-+ // This will favour IUs in the system local p2 repository
-+ matches = repository.query(noLocalIUs, monitor);
-+ }
-+ result.addAll(matches.toUnmodifiableSet());
-+ }
-+ } else {
-+ for (IMetadataRepository repository : metadataRepositories) {
-+ IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, monitor);
-+ result.addAll(matches.toUnmodifiableSet());
-+ }
- }
-
- result.addAll(pomDependenciesContent.gatherMavenInstallableUnits());
-@@ -335,7 +372,7 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory {
- List<IArtifactRepository> artifactRepositories = new ArrayList<>();
-
- for (MavenRepositoryLocation location : mavenRepositories) {
-- if (!offline || URIUtil.isFileURI(location.getURL())) {
-+ if (!offline || URIUtil.isFileURI(location.getURL()) || "fedora".equals(location.getURL().getScheme())) {
- artifactRepositories.add(new LazyArtifactRepository(remoteAgent, location.getURL(),
- RepositoryArtifactProvider::loadRepository));
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java
-index 503827d..59aab38 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java
-@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.AssertionFailedException;
- import org.eclipse.equinox.p2.metadata.IArtifactKey;
- import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
- import org.eclipse.tycho.p2.metadata.IArtifactFacade;
-+import org.eclipse.tycho.p2.repository.LocalRepositoryReader;
- import org.eclipse.tycho.p2.repository.MavenRepositoryCoordinates;
- import org.eclipse.tycho.repository.local.GAVArtifactDescriptor;
- import org.eclipse.tycho.repository.p2base.artifact.provider.formats.ArtifactTransferPolicies;
-@@ -61,22 +62,9 @@ public final class MavenBundlesArtifactRepository extends ArtifactRepositoryBase
- GAVArtifactDescriptor descriptorForRepository = new GAVArtifactDescriptor(baseDescriptor,
- repositoryCoordinates);
-
-- File requiredArtifactLocation = new File(getBaseDir(),
-- descriptorForRepository.getMavenCoordinates().getLocalRepositoryPath());
-- File actualArtifactLocation = mavenArtifact.getLocation();
-- if (!equivalentPaths(requiredArtifactLocation, actualArtifactLocation)) {
-- throw new AssertionFailedException(
-- "The Maven artifact to be added to the target platform is not stored at the required location on disk: required \""
-- + requiredArtifactLocation + "\" but was \"" + actualArtifactLocation + "\"");
-- }
--
- internalAddInternalDescriptor(descriptorForRepository);
- }
-
-- private boolean equivalentPaths(File path, File otherPath) {
-- return path.equals(otherPath);
-- }
--
- @Override
- protected GAVArtifactDescriptor getInternalDescriptorForAdding(IArtifactDescriptor descriptor) {
- // artifacts are only added via the dedicated method
-@@ -102,8 +90,10 @@ public final class MavenBundlesArtifactRepository extends ArtifactRepositoryBase
-
- @Override
- protected File internalGetArtifactStorageLocation(IArtifactDescriptor descriptor) {
-- String relativePath = toInternalDescriptor(descriptor).getMavenCoordinates().getLocalRepositoryPath();
-- return new File(getBaseDir(), relativePath);
-+ MavenRepositoryCoordinates coord = toInternalDescriptor(descriptor).getMavenCoordinates();
-+ LocalRepositoryReader reader = new LocalRepositoryReader(getBaseDir());
-+ return reader.getLocalArtifactLocation(coord.getGav(), coord.getClassifier(),
-+ coord.getExtensionOrDefault());
- }
-
- public File getBaseDir() {
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-index 3bf2c33..959a257 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-@@ -13,6 +13,8 @@
- package org.eclipse.tycho.p2.repository;
-
- import java.io.File;
-+import java.lang.reflect.Constructor;
-+import java.lang.reflect.Method;
-
- public class LocalRepositoryReader implements RepositoryReader {
-
-@@ -24,7 +26,44 @@ public class LocalRepositoryReader implements RepositoryReader {
-
- @Override
- public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
-- return new File(localMavenRepositoryRoot, RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
-+ File file = new File(localMavenRepositoryRoot,
-+ RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
-+ // In Fedora the artifact may be in an XMvn-defined repository location (not in reactor cache)
-+ if (!file.exists()) {
-+ try {
-+ // Create Plexus config
-+ Class<?> pcclazz = Class.forName("org.codehaus.plexus.ContainerConfiguration");
-+ Object conf = Class.forName("org.codehaus.plexus.DefaultContainerConfiguration").newInstance();
-+ pcclazz.getMethod("setAutoWiring", boolean.class).invoke(conf, true);
-+ pcclazz.getMethod("setClassPathScanning", String.class).invoke(conf, "index");
-+
-+ // Use plexus container to lookup the reader
-+ Class<?> pclazz = Class.forName("org.codehaus.plexus.DefaultPlexusContainer");
-+ Object plexus = pclazz.getConstructor(pcclazz).newInstance(conf);
-+
-+ // Retrieve the workspace reader from the plexus container
-+ Method mLookup = pclazz.getMethod("lookup", String.class, String.class);
-+ Object reader = mLookup.invoke(plexus, "org.eclipse.aether.repository.WorkspaceReader", "ide");
-+
-+ // Create an Aether Artifact based on GAV, classifier, and extension
-+ Class<?> iartclazz = Class.forName("org.eclipse.aether.artifact.Artifact");
-+ Class<?> artclazz = Class.forName("org.eclipse.aether.artifact.DefaultArtifact");
-+ Constructor<?> cNew = artclazz.getConstructor(String.class, String.class, String.class, String.class,
-+ String.class);
-+ Object artifact = cNew.newInstance(gav.getGroupId(), gav.getArtifactId(), classifier, extension,
-+ gav.getVersion());
-+
-+ // Invoke "findArtifact" method of the workspace reader on the artifact
-+ Method mfindArtifact = reader.getClass().getMethod("findArtifact", iartclazz);
-+ File newFile = (File) mfindArtifact.invoke(reader, artifact);
-+ if (newFile != null) {
-+ file = newFile;
-+ }
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ }
-+ }
-+ return file;
- }
-
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
-index 3e93ee1..c79d4f1 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
-@@ -61,7 +61,11 @@ public class TargetPlatformConfigurationStub {
- }
-
- public void addP2Repository(MavenRepositoryLocation location) {
-- this.repositories.add(location);
-+ // We cannot resolve a non-file URI in local mode while offline
-+ if (System.getProperty("TYCHO_MVN_RPMBUILD") == null || "file".equalsIgnoreCase(location.getURL().getScheme())
-+ || "fedora".equalsIgnoreCase(location.getURL().getScheme())) {
-+ this.repositories.add(location);
-+ }
- }
-
- // convenience method for tests
-diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-index 7e3d5fb..b146c08 100644
---- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-@@ -77,6 +77,7 @@
- <plugin id="org.sat4j.pb"/>
- <plugin id="org.slf4j.api"/>
- <plugin id="org.tukaani.xz"/>
-+ <plugin id="org.fedoraproject.p2"/>
- </plugins>
-
- <configurations>
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
-index 9940561..9a98a40 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
-@@ -27,20 +27,34 @@ public class FileLockerImpl implements FileLocker {
- final File lockMarkerFile;
-
- public FileLockerImpl(File file, Location anyLocation) {
-+ File lockFileCandidate = null;
- try {
- if (file.isDirectory()) {
-- this.lockMarkerFile = new File(file, LOCKFILE_SUFFIX).getCanonicalFile();
-+ lockFileCandidate = new File(file, LOCKFILE_SUFFIX).getCanonicalFile();
- } else {
-- this.lockMarkerFile = new File(file.getParentFile(), file.getName() + LOCKFILE_SUFFIX)
-- .getCanonicalFile();
-+ lockFileCandidate = new File(file.getParentFile(), file.getName() + LOCKFILE_SUFFIX).getCanonicalFile();
- }
-- if (lockMarkerFile.isDirectory()) {
-- throw new RuntimeException("Lock marker file " + lockMarkerFile + " already exists and is a directory");
-+ if (lockFileCandidate.isDirectory()) {
-+ throw new RuntimeException(
-+ "Lock marker file " + lockFileCandidate + " already exists and is a directory");
- }
-- File parentDir = lockMarkerFile.getParentFile();
-+ File parentDir = lockFileCandidate.getParentFile();
- if (!parentDir.isDirectory() && !parentDir.mkdirs()) {
- throw new RuntimeException("Could not create parent directory " + parentDir + " of lock marker file");
- }
-+
-+ String baseDir = System.getProperty("user.dir");
-+ String reactorCache = baseDir + "/.m2/";
-+ // In Fedora we can only assume reactor cache is safe for read/write.
-+ if (!lockFileCandidate.getAbsolutePath().startsWith(reactorCache)) {
-+ String lockFileDir = reactorCache + LOCKFILE_SUFFIX;
-+ // If the file is located within baseDir, no need to repeat
-+ String lockFileName = file.getAbsolutePath().replace(baseDir, "").replace("/", "-").replaceFirst("-",
-+ "/") + LOCKFILE_SUFFIX;
-+ lockFileCandidate = new File(lockFileDir, lockFileName);
-+ }
-+
-+ this.lockMarkerFile = lockFileCandidate;
- this.lockFileLocation = anyLocation.createLocation(null, null, false);
- this.lockFileLocation.set(lockMarkerFile.toURL(), false, lockMarkerFile.getAbsolutePath());
- } catch (MalformedURLException e) {
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-index 4bbb59b..008b9f2 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-@@ -38,6 +38,7 @@ import org.apache.maven.project.MavenProject;
- import org.codehaus.plexus.PlexusContainer;
- import org.codehaus.plexus.component.annotations.Component;
- import org.codehaus.plexus.component.annotations.Requirement;
-+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
- import org.codehaus.plexus.logging.Logger;
- import org.eclipse.tycho.ReactorProject;
- import org.eclipse.tycho.artifacts.DependencyResolutionException;
-@@ -95,6 +96,18 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
-
- configureComponents(session);
-
-+ try {
-+ if (plexus.lookup("org.fedoraproject.xmvn.resolver.Resolver") != null) {
-+ if (session.isOffline()) {
-+ System.setProperty("TYCHO_MVN_RPMBUILD", "");
-+ } else {
-+ System.setProperty("TYCHO_MVN_LOCAL", "");
-+ }
-+ }
-+ } catch (ComponentLookupException e) {
-+ // No XMvn (Upstream Maven in use)
-+ }
-+
- for (MavenProject project : projects) {
- resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
- }
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
-index 8daeef6..126be76 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
-@@ -15,13 +15,19 @@ import java.util.Objects;
-
- import org.apache.maven.execution.MavenSession;
- import org.apache.maven.project.MavenProject;
-+import org.apache.maven.toolchain.ToolchainManager;
-+import org.codehaus.plexus.component.annotations.Requirement;
- import org.codehaus.plexus.logging.AbstractLogEnabled;
-+import org.codehaus.plexus.logging.Logger;
- import org.eclipse.tycho.ReactorProject;
- import org.eclipse.tycho.artifacts.DependencyArtifacts;
- import org.eclipse.tycho.core.TargetPlatformConfiguration;
- import org.eclipse.tycho.core.TychoConstants;
- import org.eclipse.tycho.core.TychoProject;
-+import org.eclipse.tycho.core.ee.ExecutionEnvironmentUtils;
- import org.eclipse.tycho.core.ee.TargetDefinitionFile;
-+import org.eclipse.tycho.core.ee.UnknownEnvironmentException;
-+import org.eclipse.tycho.core.ee.shared.ExecutionEnvironment;
- import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
- import org.eclipse.tycho.core.osgitools.targetplatform.LocalDependencyResolver;
- import org.eclipse.tycho.core.osgitools.targetplatform.MultiEnvironmentDependencyArtifacts;
-@@ -31,6 +37,12 @@ import org.eclipse.tycho.p2.target.facade.TargetDefinition;
-
- public abstract class AbstractTychoProject extends AbstractLogEnabled implements TychoProject {
-
-+ @Requirement
-+ private Logger logger;
-+
-+ @Requirement
-+ private ToolchainManager toolchainManager;
-+
- @Override
- public DependencyArtifacts getDependencyArtifacts(ReactorProject project) {
- return TychoProjectUtils.getDependencyArtifacts(project);
-@@ -99,6 +111,8 @@ public abstract class AbstractTychoProject extends AbstractLogEnabled implements
-
- String configuredForcedProfile = tpConfiguration.getExecutionEnvironment();
- if (configuredForcedProfile != null) {
-+ configuredForcedProfile = overrideToAtLeastJavaSE16(configuredForcedProfile, toolchainManager, mavenSession,
-+ logger);
- sink.overrideProfileConfiguration(configuredForcedProfile,
- "target-platform-configuration <executionEnvironment>");
- } else {
-@@ -113,9 +127,32 @@ public abstract class AbstractTychoProject extends AbstractLogEnabled implements
-
- String configuredDefaultProfile = tpConfiguration.getExecutionEnvironmentDefault();
- if (configuredDefaultProfile != null) {
-+ configuredDefaultProfile = overrideToAtLeastJavaSE16(configuredDefaultProfile, toolchainManager,
-+ mavenSession, logger);
- sink.setProfileConfiguration(configuredDefaultProfile,
- "target-platform-configuration <executionEnvironmentDefault>");
- }
- }
-
-+ public String overrideToAtLeastJavaSE16(String profile, ToolchainManager toolchainManager, MavenSession session,
-+ Logger logger) {
-+ try {
-+ ExecutionEnvironment ee = ExecutionEnvironmentUtils.getExecutionEnvironment(profile, toolchainManager,
-+ session, logger);
-+
-+ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
-+ // EE must be at least JavaSE-1.6
-+ final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6",
-+ toolchainManager, session, logger);
-+ if (!ee.isCompatibleCompilerTargetLevel(javaSE16.getCompilerTargetLevelDefault())) {
-+ ee = javaSE16;
-+ }
-+ }
-+
-+ return ee.getProfileName();
-+ } catch (UnknownEnvironmentException e) {
-+ // can't happen, ee is validated during configuration parsing
-+ return null;
-+ }
-+ }
- }
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
-index 54e8227..2c0e0f9 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
-@@ -514,6 +514,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
- // ... specified in build.properties (for PDE compatibility)
- String pdeProfileName = getEclipsePluginProject(project).getBuildProperties().getJreCompilationProfile();
- if (pdeProfileName != null) {
-+ pdeProfileName = overrideToAtLeastJavaSE16(pdeProfileName, toolchainManager, mavenSession, logger);
- sink.setProfileConfiguration(pdeProfileName.trim(), "build.properties");
- } else {
- // ... derived from BREE in bundle manifest
-@@ -546,16 +547,19 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
- StandardExecutionEnvironment configuredProfile = ExecutionEnvironmentUtils
- .getExecutionEnvironment(configuredProfileName, toolchainManager, mavenSession, logger);
- if (configuredProfile != null) {
-+ configuredProfileName = overrideToAtLeastJavaSE16(configuredProfileName, toolchainManager, mavenSession, logger);
- // non standard profile, stick to it
- sink.setProfileConfiguration(configuredProfileName, reason);
- }
- StandardExecutionEnvironment currentProfile = ExecutionEnvironmentUtils.getExecutionEnvironment(
- "JavaSE-" + Runtime.version().feature(), toolchainManager, mavenSession, logger);
- if (currentProfile.compareTo(configuredProfile) > 0) {
-- sink.setProfileConfiguration(currentProfile.getProfileName(),
-+ String configuredProfile1 = overrideToAtLeastJavaSE16(currentProfile.getProfileName(), toolchainManager, mavenSession, logger);
-+ sink.setProfileConfiguration(configuredProfile1,
- "Currently running profile, newer than configured profile (" + configuredProfileName + ") from ["
- + reason + "]");
- } else {
-+ configuredProfileName = overrideToAtLeastJavaSE16(configuredProfileName, toolchainManager, mavenSession, logger);
- sink.setProfileConfiguration(configuredProfileName, reason);
- }
- }
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
-index 355f64d..ab69849 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
-@@ -88,7 +88,11 @@ public class DefaultTargetPlatformConfigurationReader {
- + configuration.toString());
- }
-
-- addTargetEnvironments(result, project, configuration);
-+ // Use the defined environments only in local mode with tycho.local.keepTarget
-+ if ((System.getProperty("TYCHO_MVN_LOCAL") == null && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
-+ || System.getProperty("tycho.local.keepTarget") != null) {
-+ addTargetEnvironments(result, project, configuration);
-+ }
-
- setTargetPlatformResolver(result, configuration);
-
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
-index ea817a9..c71fc93 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
-@@ -160,40 +160,53 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator {
- Artifact artifact = resolveDependency(session, dependency);
-
- if ("zip".equals(dependency.getType())) {
-- File artifactFile = new File(session.getLocalRepository().getBasedir(), session.getLocalRepository()
-- .pathOf(artifact));
-+ File artifactFile = new File(session.getLocalRepository().getBasedir(),
-+ session.getLocalRepository().pathOf(artifact));
- File eclipseDir = new File(artifactFile.getParentFile(), "eclipse");
-+ File eclipseSaveDir = new File(artifactFile.getParentFile(), "eclipse-save");
-+ File fedoraDir = new File(artifactFile.getParentFile(), "fedora-eclipse");
-
- FileLocker locker = fileLockService.getFileLocker(artifactFile);
- locker.lock();
- try {
-- if (!eclipseDir.exists() || artifact.isSnapshot()) {
-+ if (!fedoraDir.exists() || artifact.isSnapshot()) {
- logger.debug("Extracting Tycho's OSGi runtime");
-
-- if (artifact.getFile().lastModified() > eclipseDir.lastModified()) {
-+ if (artifact.getFile().lastModified() > fedoraDir.lastModified()) {
- logger.debug("Unpacking Tycho's OSGi runtime to " + eclipseDir);
- try {
-- FileUtils.deleteDirectory(eclipseDir);
-+ FileUtils.deleteDirectory(fedoraDir);
-+ if (eclipseDir.exists()) {
-+ FileUtils.rename(eclipseDir, eclipseSaveDir);
-+ }
- } catch (IOException e) {
-- logger.warn("Failed to delete Tycho's OSGi runtime " + eclipseDir + ": " + e.getMessage());
-+ logger.warn("Failed to delete Tycho's OSGi runtime " + fedoraDir + ": " + e.getMessage());
- }
- eclipseDir.mkdirs();
- unArchiver.setSourceFile(artifact.getFile());
- unArchiver.setDestDirectory(eclipseDir);
- try {
- unArchiver.extract();
-+ logger.debug("Moving Tycho's OSGi runtime to " + fedoraDir);
-+ FileUtils.rename(eclipseDir, fedoraDir);
-+ if (eclipseSaveDir.exists()) {
-+ FileUtils.rename(eclipseSaveDir, eclipseDir);
-+ }
- } catch (ArchiverException e) {
-- throw new MavenExecutionException("Failed to unpack Tycho's OSGi runtime: "
-- + e.getMessage(), e);
-+ throw new MavenExecutionException(
-+ "Failed to unpack Tycho's OSGi runtime: " + e.getMessage(), e);
-+ } catch (IOException e) {
-+ throw new MavenExecutionException("Failed to move Tycho's OSGi runtime: " + e.getMessage(),
-+ e);
- }
-
-- eclipseDir.setLastModified(artifact.getFile().lastModified());
-+ fedoraDir.setLastModified(artifact.getFile().lastModified());
- }
- }
- } finally {
- locker.release();
- }
-- description.addInstallation(eclipseDir);
-+ description.addInstallation(fedoraDir);
- } else {
- description.addBundle(artifact.getFile());
- }
-diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
-index 2fa2201..8c5996b 100644
---- a/tycho-p2/tycho-p2-facade/pom.xml
-+++ b/tycho-p2/tycho-p2-facade/pom.xml
-@@ -57,6 +57,11 @@
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
-+ <dependency>
-+ <groupId>org.fedoraproject.p2</groupId>
-+ <artifactId>org.fedoraproject.p2</artifactId>
-+ <version>0.0.1-SNAPSHOT</version>
-+ </dependency>
- </dependencies>
-
- <build>
-diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
-index de4e6aa..5543b01 100644
---- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
-+++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
-@@ -94,6 +94,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
- import org.eclipse.tycho.p2.target.facade.PomDependencyCollector;
- import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
- import org.eclipse.tycho.repository.registry.facade.ReactorRepositoryManagerFacade;
-+import org.fedoraproject.p2.EclipseSystemLayout;
-
- @Component(role = DependencyResolver.class, hint = P2DependencyResolver.ROLE_HINT, instantiationStrategy = "per-lookup")
- public class P2DependencyResolver extends AbstractLogEnabled implements DependencyResolver, Initializable {
-@@ -200,6 +201,14 @@ public class P2DependencyResolver extends AbstractLogEnabled implements Dependen
-
- PomDependencyCollector pomDependencies = collectPomDependencies(project, reactorProjects, session,
- configuration.getPomDependencies());
-+
-+ // Add Fedora Local P2 Repository when running in local mode
-+ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
-+ for (URI uri : EclipseSystemLayout.getRepositories()) {
-+ tpConfiguration.addP2Repository(new MavenRepositoryLocation(uri.getPath(), uri));
-+ }
-+ }
-+
- for (ArtifactRepository repository : project.getRemoteArtifactRepositories()) {
- addEntireP2RepositoryToTargetPlatform(repository, tpConfiguration);
- }
---
-2.28.0
-
diff --git a/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch b/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
deleted file mode 100644
index 7b0bae0..0000000
--- a/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
+++ /dev/null
@@ -1,687 +0,0 @@
-From 9bba214b359e384b3c23b1d31541eda067a62ed3 Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber(a)redhat.com>
-Date: Wed, 18 Jun 2014 13:01:31 -0400
-Subject: [PATCH 3/7] Tycho should always delegate artifact resolution to
- Maven.
-
-Maven resolves dependencies from the following locations in the
-following order:
- * reactor,
- * workspace (eg. XMvn),
- * local repository,
- * remote repositories.
-
-Tycho assumes that all resolved artifacts are present within the reactor
-cache but this is not true for artifacts resolved from workspace
-locations.
-
-Change-Id: Ia44969ed1064965a82c3507a63e54caeebb75b18
----
- .../tycho/core/shared/MavenContext.java | 1 +
- .../tycho/core/shared/MavenContextImpl.java | 9 +++-
- .../core/shared/MavenRepositorySystem.java | 19 +++++++
- .../LocalArtifactRepositoryP2APITest.java | 4 +-
- .../local/LocalMetadataRepositoryTest.java | 3 +-
- .../local/LocalArtifactRepository.java | 8 +--
- .../local/LocalArtifactRepositoryFactory.java | 3 +-
- .../index/LocalRepositoryP2IndicesImpl.java | 6 +++
- .../remote/RemoteAgentMavenMirrorsTest.java | 3 +-
- ...emoteAgentMetadataRepositoryCacheTest.java | 9 ++--
- .../TargetPlatformBundlePublisherTest.java | 4 +-
- .../tycho/p2/target/TestResolverFactory.java | 7 ++-
- .../p2/resolver/P2ResolverFactoryImpl.java | 8 +--
- .../p2/target/PomDependencyCollectorImpl.java | 2 +-
- .../target/TargetPlatformBundlePublisher.java | 6 ++-
- .../MavenBundlesArtifactRepository.java | 7 ++-
- .../repository/LocalRepositoryP2Indices.java | 3 ++
- .../p2/repository/LocalRepositoryReader.java | 50 +++++--------------
- .../TemporaryLocalMavenRepository.java | 4 +-
- .../test/util/MavenRepositorySystemStub.java | 30 +++++++++++
- .../MavenRepositorySystemAdapter.java | 37 ++++++++++++++
- .../MavenContextConfigurator.java | 7 ++-
- 22 files changed, 166 insertions(+), 64 deletions(-)
- create mode 100644 tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
- create mode 100644 tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
- create mode 100644 tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
-
-diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
-index 3836f70..b87d1f3 100644
---- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
-+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
-@@ -50,4 +50,5 @@ public interface MavenContext {
- */
- public Collection<ReactorProject> getProjects();
-
-+ public MavenRepositorySystem getRepositorySystem();
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
-index 4a85819..fd831a1 100644
---- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
-+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
-@@ -29,18 +29,20 @@ public class MavenContextImpl implements MavenContext {
- private boolean offline;
- private Properties mergedProperties;
- private List<ReactorProject> projects = new ArrayList<>();
-+ private MavenRepositorySystem repositorySystem;
-
- public MavenContextImpl(File localRepositoryRoot, boolean offline, MavenLogger mavenLogger,
-- Properties mergedProperties) {
-+ Properties mergedProperties, MavenRepositorySystem repositorySystem) {
- this.localRepositoryRoot = localRepositoryRoot;
- this.offline = offline;
- this.mavenLogger = mavenLogger;
- this.mergedProperties = mergedProperties;
-+ this.repositorySystem = repositorySystem;
- }
-
- // constructor for tests
- public MavenContextImpl(File localRepositoryRoot, MavenLogger mavenLogger) {
-- this(localRepositoryRoot, false, mavenLogger, new Properties());
-+ this(localRepositoryRoot, false, mavenLogger, new Properties(), null);
- }
-
- @Override
-@@ -72,4 +74,7 @@ public class MavenContextImpl implements MavenContext {
- projects.add(reactorProject);
- }
-
-+ public MavenRepositorySystem getRepositorySystem() {
-+ return repositorySystem;
-+ }
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
-new file mode 100644
-index 0000000..965e5cd
---- /dev/null
-+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
-@@ -0,0 +1,19 @@
-+/*******************************************************************************
-+ * Copyright (c) 2014 Red Hat Inc.
-+ * 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
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ *
-+ * Contributors:
-+ * Red Hat Inc. - initial API and implementation
-+ *******************************************************************************/
-+package org.eclipse.tycho.core.shared;
-+
-+import java.io.File;
-+
-+public interface MavenRepositorySystem {
-+
-+ public File resolve(String gid, String aid, String version, String type, String classifier);
-+
-+}
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java
-index 43eb9af..68c7878 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java
-@@ -55,6 +55,7 @@ import org.eclipse.tycho.repository.p2base.artifact.repository.ArtifactRepositor
- import org.eclipse.tycho.repository.streaming.testutil.ProbeArtifactSink;
- import org.eclipse.tycho.repository.streaming.testutil.ProbeOutputStream;
- import org.eclipse.tycho.repository.streaming.testutil.ProbeRawArtifactSink;
-+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
- import org.junit.After;
- import org.junit.Assume;
- import org.junit.Before;
-@@ -116,7 +117,8 @@ public class LocalArtifactRepositoryP2APITest {
- @Before
- public void initSubject() throws Exception {
- temporaryLocalMavenRepo.initContentFromResourceFolder(ResourceUtil.resourceFile("repositories/local"));
-- subject = new LocalArtifactRepository(null, temporaryLocalMavenRepo.getLocalRepositoryIndex());
-+ subject = new LocalArtifactRepository(null, temporaryLocalMavenRepo.getLocalRepositoryIndex(),
-+ new MavenRepositorySystemStub(temporaryLocalMavenRepo.getLocalRepositoryRoot()));
-
- testOutputStream = new ProbeOutputStream();
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java
-index 1c9fba1..b534686 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java
-@@ -35,6 +35,7 @@ import org.eclipse.tycho.p2.repository.LocalRepositoryReader;
- import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper;
- import org.eclipse.tycho.p2.repository.TychoRepositoryIndex;
- import org.eclipse.tycho.repository.local.index.FileBasedTychoRepositoryIndex;
-+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
- import org.eclipse.tycho.test.util.NoopFileLockService;
- import org.junit.Assert;
- import org.junit.Test;
-@@ -53,7 +54,7 @@ public class LocalMetadataRepositoryTest {
-
- protected IMetadataRepository loadRepository(File location) throws ProvisionException {
- return new LocalMetadataRepository(location.toURI(), createMetadataIndex(location),
-- new LocalRepositoryReader(location));
-+ new LocalRepositoryReader(location, new MavenRepositorySystemStub(location)));
- }
-
- private TychoRepositoryIndex createMetadataIndex(File location) {
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
-index 7a11200..649042b 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
-@@ -31,6 +31,7 @@ import java.util.concurrent.locks.ReentrantLock;
- import org.eclipse.equinox.p2.core.IProvisioningAgent;
- import org.eclipse.equinox.p2.metadata.IArtifactKey;
- import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
- import org.eclipse.tycho.p2.maven.repository.Activator;
- import org.eclipse.tycho.p2.maven.repository.xmlio.ArtifactsIO;
- import org.eclipse.tycho.p2.repository.GAV;
-@@ -51,15 +52,16 @@ public class LocalArtifactRepository extends ArtifactRepositoryBaseImpl<GAVArtif
-
- // TODO what is the agent needed for? does using the default agent harm?
- public LocalArtifactRepository(LocalRepositoryP2Indices localRepoIndices) {
-- this(Activator.getProvisioningAgent(), localRepoIndices);
-+ this(Activator.getProvisioningAgent(), localRepoIndices, (MavenRepositorySystem) null);
- }
-
- public LocalArtifactRepository(LocalRepositoryP2Indices localRepoIndices, RepositoryReader contentLocator) {
- this(Activator.getProvisioningAgent(), localRepoIndices, contentLocator);
- }
-
-- public LocalArtifactRepository(IProvisioningAgent agent, LocalRepositoryP2Indices localRepoIndices) {
-- this(agent, localRepoIndices, new LocalRepositoryReader(localRepoIndices.getBasedir()));
-+ public LocalArtifactRepository(IProvisioningAgent agent, LocalRepositoryP2Indices localRepoIndices,
-+ MavenRepositorySystem repositorySystem) {
-+ this(agent, localRepoIndices, new LocalRepositoryReader(localRepoIndices.getBasedir(), repositorySystem));
- }
-
- public LocalArtifactRepository(IProvisioningAgent agent, LocalRepositoryP2Indices localRepoIndices,
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
-index 8d01519..0173a9c 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
-@@ -43,7 +43,8 @@ public class LocalArtifactRepositoryFactory extends ArtifactRepositoryFactory {
- if (localRepositoryDirectory.isDirectory()
- && new File(localRepositoryDirectory, ".meta/p2-artifacts.properties").exists()) {
- // see FileBasedTychoRepositoryIndex#ARTIFACTS_INDEX_RELPATH
-- return new LocalArtifactRepository(getAgent(), lookupLocalRepoIndices());
-+ return new LocalArtifactRepository(getAgent(), lookupLocalRepoIndices(),
-+ lookupLocalRepoIndices().getRepositorySystem());
- }
- }
- return null;
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
-index 4cf6511..fc3cc9f 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
-@@ -17,6 +17,7 @@ import java.io.File;
-
- import org.eclipse.tycho.core.shared.MavenContext;
- import org.eclipse.tycho.core.shared.MavenLogger;
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
- import org.eclipse.tycho.locking.facade.FileLockService;
- import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
- import org.eclipse.tycho.p2.repository.TychoRepositoryIndex;
-@@ -27,6 +28,7 @@ public class LocalRepositoryP2IndicesImpl implements LocalRepositoryP2Indices {
- private FileLockService fileLockService;
- private File localRepositoryRoot;
- private MavenLogger logger;
-+ private MavenRepositorySystem repoSystem;
-
- // derived members
- private boolean initialized = false;
-@@ -41,6 +43,7 @@ public class LocalRepositoryP2IndicesImpl implements LocalRepositoryP2Indices {
- public void setMavenContext(MavenContext mavenContext) {
- this.localRepositoryRoot = mavenContext.getLocalRepositoryRoot();
- this.logger = mavenContext.getLogger();
-+ this.repoSystem = mavenContext.getRepositorySystem();
- }
-
- // injected by DS runtime
-@@ -82,4 +85,7 @@ public class LocalRepositoryP2IndicesImpl implements LocalRepositoryP2Indices {
- return localRepositoryRoot;
- }
-
-+ public MavenRepositorySystem getRepositorySystem() {
-+ return repoSystem;
-+ }
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
-index d7042fc..2f9dbc8 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
-@@ -31,6 +31,7 @@ import org.eclipse.tycho.p2.impl.test.ResourceUtil;
- import org.eclipse.tycho.p2.remote.testutil.MavenRepositorySettingsStub;
- import org.eclipse.tycho.test.util.HttpServer;
- import org.eclipse.tycho.test.util.LogVerifier;
-+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
- import org.junit.Before;
- import org.junit.Rule;
- import org.junit.Test;
-@@ -54,7 +55,7 @@ public class RemoteAgentMavenMirrorsTest {
- public void initSubject() throws Exception {
- File localRepository = tempManager.newFolder("localRepo");
- MavenContext mavenContext = new MavenContextImpl(localRepository, OFFLINE, logVerifier.getLogger(),
-- new Properties());
-+ new Properties(), new MavenRepositorySystemStub(localRepository));
-
- mavenRepositorySettings = new MavenRepositorySettingsStub();
- subject = new RemoteAgent(mavenContext, mavenRepositorySettings, OFFLINE);
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
-index c3bd41c..802da29 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
-@@ -28,6 +28,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
- import org.eclipse.tycho.core.shared.MavenContextImpl;
- import org.eclipse.tycho.test.util.HttpServer;
- import org.eclipse.tycho.test.util.LogVerifier;
-+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
- import org.junit.Before;
- import org.junit.Rule;
- import org.junit.Test;
-@@ -127,13 +128,13 @@ public class RemoteAgentMetadataRepositoryCacheTest {
- }
-
- private RemoteAgent newOnlineAgent() throws Exception {
-- return new RemoteAgent(
-- new MavenContextImpl(localMavenRepository, false, logVerifier.getLogger(), new Properties()));
-+ return new RemoteAgent(new MavenContextImpl(localMavenRepository, false, logVerifier.getLogger(),
-+ new Properties(), new MavenRepositorySystemStub(localMavenRepository)));
- }
-
- private RemoteAgent newOfflineAgent() throws Exception {
-- return new RemoteAgent(
-- new MavenContextImpl(localMavenRepository, true, logVerifier.getLogger(), new Properties()));
-+ return new RemoteAgent(new MavenContextImpl(localMavenRepository, true, logVerifier.getLogger(),
-+ new Properties(), new MavenRepositorySystemStub(localMavenRepository)));
- }
-
- private IMetadataRepository loadHttpRepository(RemoteAgent agent) throws ProvisionException {
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java
-index da8bdf1..176ba81 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java
-@@ -42,6 +42,7 @@ import org.eclipse.tycho.p2.resolver.WrappedArtifact;
- import org.eclipse.tycho.repository.p2base.artifact.provider.IRawArtifactProvider;
- import org.eclipse.tycho.repository.streaming.testutil.ProbeRawArtifactSink;
- import org.eclipse.tycho.test.util.LogVerifier;
-+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
- import org.junit.Before;
- import org.junit.Rule;
- import org.junit.Test;
-@@ -69,7 +70,8 @@ public class TargetPlatformBundlePublisherTest {
-
- localRepositoryRoot = tempFolder.getRoot();
- subject = new TargetPlatformBundlePublisher(localRepositoryRoot,
-- new ReactorProjectStub(tempFolder.newFolder(), "test"), logVerifier.getLogger());
-+ new ReactorProjectStub(tempFolder.newFolder(), "test"), logVerifier.getLogger(),
-+ new MavenRepositorySystemStub(localRepositoryRoot));
- }
-
- @Test
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
-index 33a98e4..0ea66e2 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
-@@ -32,6 +32,7 @@ import org.eclipse.tycho.p2.target.facade.TargetPlatformFactory;
- import org.eclipse.tycho.repository.local.LocalArtifactRepository;
- import org.eclipse.tycho.repository.local.LocalMetadataRepository;
- import org.eclipse.tycho.repository.local.index.LocalRepositoryP2IndicesImpl;
-+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
- import org.eclipse.tycho.test.util.NoopFileLockService;
-
- public class TestResolverFactory implements P2ResolverFactory {
-@@ -50,7 +51,8 @@ public class TestResolverFactory implements P2ResolverFactory {
-
- File localMavenRepoRoot = mavenContext.getLocalRepositoryRoot();
- LocalRepositoryP2Indices localRepoIndices = createLocalRepoIndices(mavenContext);
-- LocalRepositoryReader localRepositoryReader = new LocalRepositoryReader(localMavenRepoRoot);
-+ LocalRepositoryReader localRepositoryReader = new LocalRepositoryReader(localMavenRepoRoot,
-+ mavenContext.getRepositorySystem());
- localMetadataRepo = new LocalMetadataRepository(localMavenRepoRoot.toURI(), localRepoIndices.getMetadataIndex(),
- localRepositoryReader);
- localArtifactRepo = new LocalArtifactRepository(localRepoIndices, localRepositoryReader);
-@@ -61,7 +63,8 @@ public class TestResolverFactory implements P2ResolverFactory {
- }
-
- private MavenContext createMavenContext(boolean offline, MavenLogger logger) {
-- return new MavenContextImpl(getLocalRepositoryLocation(), offline, logger, new Properties());
-+ return new MavenContextImpl(getLocalRepositoryLocation(), offline, logger, new Properties(),
-+ new MavenRepositorySystemStub(getLocalRepositoryLocation()));
- }
-
- // TODO use TemporaryLocalMavenRepository
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
-index bb227a4..9481da4 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
-@@ -37,7 +37,7 @@ public class P2ResolverFactoryImpl implements P2ResolverFactory {
- private static LocalMetadataRepository localMetadataRepository;
- private static LocalArtifactRepository localArtifactRepository;
-
-- private MavenContext mavenContext;
-+ private static MavenContext mavenContext;
- private LocalRepositoryP2Indices localRepoIndices;
- private RemoteAgentManager remoteAgentManager;
- private TargetDefinitionResolverService targetDefinitionResolverService;
-@@ -46,7 +46,8 @@ public class P2ResolverFactoryImpl implements P2ResolverFactory {
- LocalRepositoryP2Indices localRepoIndices) {
- if (localMetadataRepository == null) {
- File localMavenRepoRoot = context.getLocalRepositoryRoot();
-- RepositoryReader contentLocator = new LocalRepositoryReader(localMavenRepoRoot);
-+ RepositoryReader contentLocator = new LocalRepositoryReader(localMavenRepoRoot,
-+ mavenContext.getRepositorySystem());
- localMetadataRepository = new LocalMetadataRepository(localMavenRepoRoot.toURI(),
- localRepoIndices.getMetadataIndex(), contentLocator);
-
-@@ -57,7 +58,8 @@ public class P2ResolverFactoryImpl implements P2ResolverFactory {
- private static synchronized LocalArtifactRepository getLocalArtifactRepository(MavenContext mavenContext,
- LocalRepositoryP2Indices localRepoIndices) {
- if (localArtifactRepository == null) {
-- RepositoryReader contentLocator = new LocalRepositoryReader(mavenContext.getLocalRepositoryRoot());
-+ RepositoryReader contentLocator = new LocalRepositoryReader(mavenContext.getLocalRepositoryRoot(),
-+ mavenContext.getRepositorySystem());
- localArtifactRepository = new LocalArtifactRepository(localRepoIndices, contentLocator);
- }
- return localArtifactRepository;
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
-index 589418e..4ad19f5 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
-@@ -49,7 +49,7 @@ public class PomDependencyCollectorImpl implements PomDependencyCollector {
-
- File localRepositoryRoot = mavenContext.getLocalRepositoryRoot();
- this.bundlesPublisher = new TargetPlatformBundlePublisher(localRepositoryRoot, project,
-- mavenContext.getLogger());
-+ mavenContext.getLogger(), mavenContext.getRepositorySystem());
- }
-
- public File getProjectLocation() {
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
-index d7119d7..83ab36e 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
-@@ -35,6 +35,7 @@ import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
- import org.eclipse.osgi.service.resolver.BundleDescription;
- import org.eclipse.tycho.ReactorProject;
- import org.eclipse.tycho.core.shared.MavenLogger;
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
- import org.eclipse.tycho.p2.impl.publisher.MavenPropertiesAdvice;
- import org.eclipse.tycho.p2.impl.publisher.repo.TransientArtifactRepository;
- import org.eclipse.tycho.p2.metadata.IArtifactFacade;
-@@ -52,9 +53,10 @@ public class TargetPlatformBundlePublisher {
- private final MavenBundlesArtifactRepository publishedArtifacts;
- private ReactorProject project;
-
-- public TargetPlatformBundlePublisher(File localMavenRepositoryRoot, ReactorProject project, MavenLogger logger) {
-+ public TargetPlatformBundlePublisher(File localMavenRepositoryRoot, ReactorProject project, MavenLogger logger,
-+ MavenRepositorySystem repositorySystem) {
- this.project = project;
-- this.publishedArtifacts = new MavenBundlesArtifactRepository(localMavenRepositoryRoot);
-+ this.publishedArtifacts = new MavenBundlesArtifactRepository(localMavenRepositoryRoot, repositorySystem);
- this.logger = logger;
- }
-
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java
-index 59aab38..67df39d 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/repository/MavenBundlesArtifactRepository.java
-@@ -21,6 +21,7 @@ import java.io.File;
- import org.eclipse.core.runtime.AssertionFailedException;
- import org.eclipse.equinox.p2.metadata.IArtifactKey;
- import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
- import org.eclipse.tycho.p2.metadata.IArtifactFacade;
- import org.eclipse.tycho.p2.repository.LocalRepositoryReader;
- import org.eclipse.tycho.p2.repository.MavenRepositoryCoordinates;
-@@ -49,9 +50,11 @@ import org.eclipse.tycho.repository.p2base.artifact.repository.ArtifactRepositor
- * </p>
- */
- public final class MavenBundlesArtifactRepository extends ArtifactRepositoryBaseImpl<GAVArtifactDescriptor> {
-+ private MavenRepositorySystem repositorySystem;
-
-- public MavenBundlesArtifactRepository(File localMavenRepositoryRoot) {
-+ public MavenBundlesArtifactRepository(File localMavenRepositoryRoot, MavenRepositorySystem repositorySystem) {
- super(null, localMavenRepositoryRoot.toURI(), ArtifactTransferPolicies.forLocalArtifacts());
-+ this.repositorySystem = repositorySystem;
- }
-
- public void addPublishedArtifact(IArtifactDescriptor baseDescriptor, IArtifactFacade mavenArtifact) {
-@@ -91,7 +94,7 @@ public final class MavenBundlesArtifactRepository extends ArtifactRepositoryBase
- @Override
- protected File internalGetArtifactStorageLocation(IArtifactDescriptor descriptor) {
- MavenRepositoryCoordinates coord = toInternalDescriptor(descriptor).getMavenCoordinates();
-- LocalRepositoryReader reader = new LocalRepositoryReader(getBaseDir());
-+ LocalRepositoryReader reader = new LocalRepositoryReader(getBaseDir(), repositorySystem);
- return reader.getLocalArtifactLocation(coord.getGav(), coord.getClassifier(),
- coord.getExtensionOrDefault());
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
-index 7a1303b..1a8feb4 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
-@@ -15,6 +15,8 @@ package org.eclipse.tycho.p2.repository;
-
- import java.io.File;
-
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
-+
- /**
- * This service provides access to the tycho p2 index files of the local maven repository.
- */
-@@ -26,4 +28,5 @@ public interface LocalRepositoryP2Indices {
-
- public File getBasedir();
-
-+ public MavenRepositorySystem getRepositorySystem();
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-index 959a257..3c8fb8b 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-@@ -13,57 +13,31 @@
- package org.eclipse.tycho.p2.repository;
-
- import java.io.File;
--import java.lang.reflect.Constructor;
--import java.lang.reflect.Method;
-+
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
-
- public class LocalRepositoryReader implements RepositoryReader {
-
- private final File localMavenRepositoryRoot;
-+ private final MavenRepositorySystem repositorySystem;
-
-- public LocalRepositoryReader(File localMavenRepositoryRoot) {
-+ public LocalRepositoryReader(File localMavenRepositoryRoot, MavenRepositorySystem repositorySystem) {
- this.localMavenRepositoryRoot = localMavenRepositoryRoot;
-+ this.repositorySystem = repositorySystem;
- }
-
- @Override
- public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
-- File file = new File(localMavenRepositoryRoot,
-+ File ret = new File(localMavenRepositoryRoot,
- RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
-- // In Fedora the artifact may be in an XMvn-defined repository location (not in reactor cache)
-- if (!file.exists()) {
-- try {
-- // Create Plexus config
-- Class<?> pcclazz = Class.forName("org.codehaus.plexus.ContainerConfiguration");
-- Object conf = Class.forName("org.codehaus.plexus.DefaultContainerConfiguration").newInstance();
-- pcclazz.getMethod("setAutoWiring", boolean.class).invoke(conf, true);
-- pcclazz.getMethod("setClassPathScanning", String.class).invoke(conf, "index");
--
-- // Use plexus container to lookup the reader
-- Class<?> pclazz = Class.forName("org.codehaus.plexus.DefaultPlexusContainer");
-- Object plexus = pclazz.getConstructor(pcclazz).newInstance(conf);
--
-- // Retrieve the workspace reader from the plexus container
-- Method mLookup = pclazz.getMethod("lookup", String.class, String.class);
-- Object reader = mLookup.invoke(plexus, "org.eclipse.aether.repository.WorkspaceReader", "ide");
--
-- // Create an Aether Artifact based on GAV, classifier, and extension
-- Class<?> iartclazz = Class.forName("org.eclipse.aether.artifact.Artifact");
-- Class<?> artclazz = Class.forName("org.eclipse.aether.artifact.DefaultArtifact");
-- Constructor<?> cNew = artclazz.getConstructor(String.class, String.class, String.class, String.class,
-- String.class);
-- Object artifact = cNew.newInstance(gav.getGroupId(), gav.getArtifactId(), classifier, extension,
-- gav.getVersion());
--
-- // Invoke "findArtifact" method of the workspace reader on the artifact
-- Method mfindArtifact = reader.getClass().getMethod("findArtifact", iartclazz);
-- File newFile = (File) mfindArtifact.invoke(reader, artifact);
-- if (newFile != null) {
-- file = newFile;
-- }
-- } catch (Exception e) {
-- e.printStackTrace();
-+ if (repositorySystem != null) {
-+ File tmp = repositorySystem.resolve(gav.getGroupId(), gav.getArtifactId(), gav.getVersion(), extension,
-+ classifier);
-+ if (tmp != null) {
-+ ret = tmp;
- }
- }
-- return file;
-+ return ret;
- }
-
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
-index fe0c456..8b1a9d1 100644
---- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
-@@ -19,6 +19,7 @@ import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
- import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
- import org.eclipse.tycho.repository.local.LocalArtifactRepository;
- import org.eclipse.tycho.repository.local.index.LocalRepositoryP2IndicesImpl;
-+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
- import org.eclipse.tycho.test.util.NoopFileLockService;
- import org.junit.Rule;
- import org.junit.rules.ExternalResource;
-@@ -74,7 +75,8 @@ public class TemporaryLocalMavenRepository extends ExternalResource {
-
- public LocalArtifactRepository getLocalArtifactRepository() {
- if (repo == null) {
-- repo = new LocalArtifactRepository(null, getLocalRepositoryIndex());
-+ repo = new LocalArtifactRepository(null, getLocalRepositoryIndex(),
-+ new MavenRepositorySystemStub(getLocalRepositoryRoot()));
- }
- return repo;
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
-new file mode 100644
-index 0000000..be02d64
---- /dev/null
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
-@@ -0,0 +1,30 @@
-+/*******************************************************************************
-+ * Copyright (c) 2014 Red Hat Inc.
-+ * 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
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ *
-+ * Contributors:
-+ * Red Hat Inc. - initial API and implementation
-+ *******************************************************************************/
-+package org.eclipse.tycho.test.util;
-+
-+import java.io.File;
-+
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
-+import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper;
-+
-+public class MavenRepositorySystemStub implements MavenRepositorySystem {
-+
-+ private File localMavenRepositoryRoot;
-+
-+ public MavenRepositorySystemStub(File localMavenRepositoryRoot) {
-+ this.localMavenRepositoryRoot = localMavenRepositoryRoot;
-+ }
-+
-+ public File resolve(String gid, String aid, String version, String type, String classifier) {
-+ return new File(localMavenRepositoryRoot,
-+ RepositoryLayoutHelper.getRelativePath(gid, aid, version, classifier, type));
-+ }
-+}
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
-new file mode 100644
-index 0000000..e1d46fa
---- /dev/null
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
-@@ -0,0 +1,37 @@
-+/*******************************************************************************
-+ * Copyright (c) 2014 Red Hat Inc.
-+ * 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
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ *
-+ * Contributors:
-+ * Red Hat Inc. - initial API and implementation
-+ *******************************************************************************/
-+package org.eclipse.tycho.osgi.adapters;
-+
-+import java.io.File;
-+
-+import org.apache.maven.artifact.Artifact;
-+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
-+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-+import org.apache.maven.repository.RepositorySystem;
-+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
-+
-+public class MavenRepositorySystemAdapter implements MavenRepositorySystem {
-+
-+ private RepositorySystem repoSystem;
-+
-+ public MavenRepositorySystemAdapter(RepositorySystem repoSystem) {
-+ this.repoSystem = repoSystem;
-+ }
-+
-+ public File resolve(String gid, String aid, String version, String type, String classifier) {
-+ ArtifactResolutionRequest req = new ArtifactResolutionRequest();
-+ Artifact art = repoSystem.createArtifactWithClassifier(gid, aid, version, type, classifier);
-+ req.setArtifact(art);
-+ ArtifactResolutionResult res = repoSystem.resolve(req);
-+ return res.getArtifacts().size() > 0 ? res.getArtifacts().toArray(new Artifact[0])[0].getFile() : null;
-+ }
-+
-+}
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
-index 4a21341..e16c7e0 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
-@@ -18,6 +18,7 @@ import java.util.Properties;
- import org.apache.maven.execution.MavenSession;
- import org.apache.maven.plugin.LegacySupport;
- import org.apache.maven.project.MavenProject;
-+import org.apache.maven.repository.RepositorySystem;
- import org.apache.maven.settings.Profile;
- import org.apache.maven.settings.Settings;
- import org.codehaus.plexus.component.annotations.Component;
-@@ -29,6 +30,7 @@ import org.eclipse.tycho.core.osgitools.DefaultReactorProject;
- import org.eclipse.tycho.core.shared.MavenContext;
- import org.eclipse.tycho.core.shared.MavenContextImpl;
- import org.eclipse.tycho.osgi.adapters.MavenLoggerAdapter;
-+import org.eclipse.tycho.osgi.adapters.MavenRepositorySystemAdapter;
-
- @Component(role = EquinoxLifecycleListener.class, hint = "MavenContextConfigurator")
- public class MavenContextConfigurator extends EquinoxLifecycleListener {
-@@ -39,6 +41,9 @@ public class MavenContextConfigurator extends EquinoxLifecycleListener {
- @Requirement
- private LegacySupport context;
-
-+ @Requirement
-+ private RepositorySystem repositorySystem;
-+
- @Override
- public void afterFrameworkStarted(EmbeddedEquinox framework) {
- MavenSession session = context.getSession();
-@@ -46,7 +51,7 @@ public class MavenContextConfigurator extends EquinoxLifecycleListener {
- MavenLoggerAdapter mavenLogger = new MavenLoggerAdapter(logger, false);
- Properties globalProps = getGlobalProperties(session);
- MavenContextImpl mavenContext = new MavenContextImpl(localRepoRoot, session.isOffline(), mavenLogger,
-- globalProps);
-+ globalProps, new MavenRepositorySystemAdapter(repositorySystem));
- for (MavenProject project : session.getProjects()) {
- mavenContext.addProject(DefaultReactorProject.adapt(project));
- }
---
-2.28.0
-
diff --git a/0004-Fix-uncaught-exception.patch b/0004-Fix-uncaught-exception.patch
deleted file mode 100644
index aedf401..0000000
--- a/0004-Fix-uncaught-exception.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3ad22ed9fa3d227fa0d508c333be9319d9082fc6 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Thu, 20 Feb 2020 16:08:00 +0000
-Subject: [PATCH 4/7] Fix uncaught exception
-
-"unreported exception org.codehaus.plexus.configuration.PlexusConfigurationException; must be caught or declared to be thrown"
----
- .../tycho/extras/sourcefeature/SourceFeatureMojo.java | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java b/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java
-index 36f1eed..87815d1 100644
---- a/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java
-+++ b/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java
-@@ -576,7 +576,12 @@ public class SourceFeatureMojo extends AbstractMojo {
- }
-
- private String getAttribute(PlexusConfiguration dom, String attrName) {
-- String attr = dom.getAttribute(attrName);
-+ String attr = null;
-+ try {
-+ attr = dom.getAttribute(attrName);
-+ } catch (Exception ex) {
-+ attr = null;
-+ }
- if (attr == null) {
- return null;
- }
---
-2.28.0
-
diff --git a/0005-Fix-dependency-problems-when-bootstrapping-with-extr.patch b/0005-Fix-dependency-problems-when-bootstrapping-with-extr.patch
deleted file mode 100644
index c0a8293..0000000
--- a/0005-Fix-dependency-problems-when-bootstrapping-with-extr.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 085015460b077536f94cafeb21a3ce868fd56096 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Fri, 20 Mar 2020 02:35:02 +0000
-Subject: [PATCH 5/7] Fix dependency problems when bootstrapping with extras
-
----
- tycho-extras/pack200/tycho-pack200b-plugin/pom.xml | 4 ++--
- tycho-extras/pom.xml | 10 +++++-----
- tycho-extras/tycho-source-feature-plugin/pom.xml | 4 ++--
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
-index 55a4107..4af01c5 100644
---- a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
-+++ b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
-@@ -36,7 +36,7 @@
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- </dependency>
- </dependencies>
--</project>
-\ No newline at end of file
-+</project>
-diff --git a/tycho-extras/pom.xml b/tycho-extras/pom.xml
-index 416abd1..53ddf73 100644
---- a/tycho-extras/pom.xml
-+++ b/tycho-extras/pom.xml
-@@ -72,28 +72,28 @@
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-core</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-facade</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.tycho.core.shared</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-testing-harness</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>sisu-equinox-launching</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
-diff --git a/tycho-extras/tycho-source-feature-plugin/pom.xml b/tycho-extras/tycho-source-feature-plugin/pom.xml
-index bfccba8..2d4162c 100644
---- a/tycho-extras/tycho-source-feature-plugin/pom.xml
-+++ b/tycho-extras/tycho-source-feature-plugin/pom.xml
-@@ -42,14 +42,14 @@
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- <type>maven-plugin</type>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
-- <version>${tycho-version}</version>
-+ <version>${project.version}</version>
- <type>maven-plugin</type>
- </dependency>
-
---
-2.28.0
-
diff --git a/0006-Use-custom-resolver-for-tycho-eclipserun-plugin.patch b/0006-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
deleted file mode 100644
index a6d61e0..0000000
--- a/0006-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From cec1526c14fe52697eea6864285f3700c22178fa Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber(a)redhat.com>
-Date: Mon, 6 May 2013 14:20:58 -0400
-Subject: [PATCH 6/7] Use custom resolver for tycho-eclipserun-plugin.
-
-Add various system local OSGi bundle locations to the target platform
-used by tycho-eclipserun-plugin.
-
-Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d
----
- .../tycho/extras/eclipserun/EclipseRunMojo.java | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
-index e10b211..d0f0857 100644
---- a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
-+++ b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
-@@ -15,6 +15,7 @@ package org.eclipse.tycho.extras.eclipserun;
-
- import java.io.File;
- import java.net.MalformedURLException;
-+import java.net.URI;
- import java.util.ArrayList;
- import java.util.List;
- import java.util.Map;
-@@ -57,6 +58,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver;
- import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
- import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
- import org.eclipse.tycho.plugins.p2.extras.Repository;
-+import org.fedoraproject.p2.EclipseSystemLayout;
-
- /**
- * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is
-@@ -240,6 +242,14 @@ public class EclipseRunMojo extends AbstractMojo {
- TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub();
- // we want to resolve from remote repos only
- tpConfiguration.setForceIgnoreLocalArtifacts(true);
-+
-+ // Add Fedora Local P2 Repository when running in local mode
-+ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
-+ for (URI uri : EclipseSystemLayout.getRepositories()) {
-+ tpConfiguration.addP2Repository(new MavenRepositoryLocation(uri.getPath(), uri));
-+ }
-+ }
-+
- for (Repository repository : repositories) {
- tpConfiguration.addP2Repository(new MavenRepositoryLocation(repository.getId(), repository.getLocation()));
- }
---
-2.28.0
-
diff --git a/0007-Accomodate-API-change-in-surefire-3.0.0-M4.patch b/0007-Accomodate-API-change-in-surefire-3.0.0-M4.patch
deleted file mode 100644
index f497742..0000000
--- a/0007-Accomodate-API-change-in-surefire-3.0.0-M4.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 7aae9528d45e45602cf27122c07a065d47a8418d Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Mon, 8 Feb 2021 13:49:24 +0000
-Subject: [PATCH 7/7] Accomodate API change in surefire 3.0.0~M4
-
----
- .../META-INF/MANIFEST.MF | 1 +
- .../pom.xml | 5 +++++
- .../surefire/osgibooter/OsgiSurefireBooter.java | 17 +++++++++++++----
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
-index 9ad1c2e..4ad1fe9 100644
---- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
-+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
-@@ -8,6 +8,7 @@ Bundle-ClassPath: .,
- jars/surefire-booter-2.22.2.jar,
- jars/surefire-api-2.22.2.jar,
- jars/surefire-logger-api-2.22.2.jar,
-+ jars/surefire-extensions-api-2.22.2.jar,
- jars/maven-surefire-common-2.22.2.jar
- Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application
- Bundle-ManifestVersion: 2
-diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-index 1ab4254..8255509 100644
---- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-@@ -57,6 +57,11 @@
- <artifactId>surefire-api</artifactId>
- <version>${surefire-version}</version>
- </artifactItem>
-+ <artifactItem>
-+ <groupId>org.apache.maven.surefire</groupId>
-+ <artifactId>surefire-extensions-api</artifactId>
-+ <version>${surefire-version}</version>
-+ </artifactItem>
- <artifactItem>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-logger-api</artifactId>
-diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
-index 3680799..165c9a3 100644
---- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
-+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
-@@ -28,6 +28,9 @@ import java.util.Properties;
- import java.util.Set;
-
- import org.apache.maven.plugin.surefire.StartupReportConfiguration;
-+import org.apache.maven.plugin.surefire.extensions.SurefireConsoleOutputReporter;
-+import org.apache.maven.plugin.surefire.extensions.SurefireStatelessReporter;
-+import org.apache.maven.plugin.surefire.extensions.SurefireStatelessTestsetInfoReporter;
- import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
- import org.apache.maven.plugin.surefire.report.ConsoleReporter;
- import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
-@@ -93,7 +96,7 @@ public class OsgiSurefireBooter {
-
- ClasspathConfiguration classPathConfig = new ClasspathConfiguration(false, false);
- StartupConfiguration startupConfiguration = new StartupConfiguration(provider, classPathConfig,
-- new ClassLoaderConfiguration(useSystemClassloader, useManifestOnlyJar), forkRequested, inForkedVM);
-+ new ClassLoaderConfiguration(useSystemClassloader, useManifestOnlyJar), forkRequested, inForkedVM, null);
- // TODO dir scanning with no includes done here (done in TestMojo already)
- // but without dirScannerParams we get an NPE accessing runOrder
- DirectoryScannerParameters dirScannerParams = new DirectoryScannerParameters(testClassesDir,
-@@ -106,11 +109,17 @@ public class OsgiSurefireBooter {
- new RunOrderParameters(runOrder, null), failIfNoTests, reporterConfig, null, testRequest,
- extractProviderProperties(testProps), null, false, Collections.<CommandLineOption> emptyList(),
- skipAfterFailureCount, Shutdown.DEFAULT, 30);
-+
-+ SurefireStatelessReporter xmlReporter = new SurefireStatelessReporter(disableXmlReport, "3.0" );
-+ xmlReporter.setDisable(disableXmlReport);
-+ SurefireConsoleOutputReporter outReporter = new SurefireConsoleOutputReporter();
-+ SurefireStatelessTestsetInfoReporter testsetReporter = new SurefireStatelessTestsetInfoReporter();
-+
- StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
-- ConsoleReporter.PLAIN, redirectTestOutputToFile, disableXmlReport, reportsDir, trimStackTrace, null,
-- new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null, false);
-+ ConsoleReporter.PLAIN, redirectTestOutputToFile, reportsDir, trimStackTrace, null,
-+ new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null, false, xmlReporter, outReporter, testsetReporter);
- ReporterFactory reporterFactory = new DefaultReporterFactory(startupReportConfig,
-- new PrintStreamLogger(startupReportConfig.getOriginalSystemOut()));
-+ new PrintStreamLogger(System.out));
- // API indicates we should use testClassLoader below but surefire also tries
- // to load surefire classes using this classloader
- RunResult result = ProviderFactory.invokeProvider(null, createCombinedClassLoader(testPlugin), reporterFactory,
---
-2.28.0
-
diff --git a/EmptyMojo.java b/EmptyMojo.java
deleted file mode 100644
index 84d970f..0000000
--- a/EmptyMojo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.fedoraproject;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.AbstractMojo;
-
-/**
- * Empty goal to fix
- * @goal empty
- * @phase clean
- */
-public class EmptyMojo
- extends AbstractMojo
-{
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- }
-}
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/p2-install.sh b/p2-install.sh
deleted file mode 100755
index e04cb9d..0000000
--- a/p2-install.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-_prefer_jre="true"
-. /usr/share/java-utils/java-functions
-
-set_jvm
-
-set_classpath \
- beust-jcommander \
- eclipse/osgi \
- slf4j/api \
- slf4j/simple \
- tycho/org.fedoraproject.p2 \
- tycho/xmvn-p2-installer-plugin \
- xmvn/xmvn-api \
- xmvn/xmvn-core \
-
-MAIN_CLASS=org.fedoraproject.p2.app.P2InstallerApp
-run "$@"
diff --git a/sources b/sources
deleted file mode 100644
index f2ebcd2..0000000
--- a/sources
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA512 (fedoraproject-p2-0be3abaa1729553b13f384a008b1cd1fb00beaf4.tar.gz) = 0fc3585203eff6dcaf08c679a258dc8f108a6d64a29f88983a8ac10ae82641b85ea5cf05e112daadaeef95d798255d1307efd8b2d55b5d482b36b448709f7ab5
-SHA512 (eclipse-bootstrap-2020-12.tar.xz) = 28d93663bb7e4d86341fc40c648416039f57cee7bb3922ea1cb939f69d70e8fd857120ead181e3877455af5abfb3d400dacb7efcffd3344e1276c0ad11782513
-SHA512 (org.eclipse.tycho-tycho-2.3.0.tar.xz) = 3c486da942561fe4e4d5abb761d280cfe896a619a3c7aadec3ec5971b7eb229c32c2afdc91a2a5907c2493092e79ffbfb0e7f4ac99f06606840dd7afc7d35e32
diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh
deleted file mode 100755
index 279df55..0000000
--- a/tycho-bootstrap.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /bin/bash -e
-
-. $(pwd)/tycho-scripts.sh
-
-preV=$1
-v="$preV-SNAPSHOT"
-osgiV='3.16.100.v20201211-1332'
-osgiCompatV='1.2.200.v20201211-1332'
-fp2V='0.0.1-SNAPSHOT'
-bundles=()
-bundles[0]='tycho-bundles/org.eclipse.tycho.embedder.shared'
-bundles[1]='tycho-bundles/org.eclipse.tycho.core.shared'
-bundles[2]='tycho-bundles/org.eclipse.tycho.p2.resolver.shared'
-bundles[3]='tycho-bundles/org.eclipse.tycho.p2.tools.shared'
-bundles[4]='tycho-bundles/org.eclipse.tycho.p2.maven.repository'
-bundles[5]='tycho-bundles/org.eclipse.tycho.p2.resolver.impl'
-bundles[6]='tycho-bundles/org.eclipse.tycho.p2.tools.impl'
-
-xtraBundles[0]='fedoraproject-p2/org.fedoraproject.p2'
-
-deps[0]=""
-deps[1]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar"
-deps[2]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar"
-deps[3]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar"
-deps[4]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar"
-deps[5]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.maven.repository/target/org.eclipse.tycho.p2.maven.repository-${v}.jar:fedoraproject-p2/org.fedoraproject.p2/target/org.fedoraproject.p2-${fp2V}.jar"
-deps[6]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.tools.shared/target/org.eclipse.tycho.p2.tools.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.maven.repository/target/org.eclipse.tycho.p2.maven.repository-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.impl/target/org.eclipse.tycho.p2.resolver.impl-${v}.jar"
-
-xtraDeps[0]=""
-
-externalDeps[4]="org.eclipse.equinox.common,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.artifact.repository,org.eclipse.osgi"
-externalDeps[5]="org.eclipse.core.runtime,org.eclipse.equinox.security,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.updatesite,org.eclipse.core.net,org.eclipse.equinox.common,org.eclipse.osgi,org.eclipse.equinox.preferences,biz.aQute.bndlib"
-externalDeps[6]="org.eclipse.equinox.p2.director.app,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.updatesite,org.eclipse.core.runtime,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.director,org.eclipse.osgi,org.eclipse.equinox.common,org.eclipse.equinox.app,org.eclipse.equinox.registry"
-
-xtraExternalDeps[0]="org.eclipse.osgi,org.eclipse.core.runtime,org.eclipse.equinox.common,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.updatesite,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.app,slf4j.api"
-
-reactorprojs=( 'tycho-embedder-api' 'tycho-metadata-model' 'sisu-equinox/sisu-equinox-api' 'sisu-equinox/sisu-equinox-embedder' 'tycho-core' 'tycho-packaging-plugin' 'tycho-p2/tycho-p2-facade' 'tycho-maven-plugin' 'tycho-p2/tycho-p2-repository-plugin' 'tycho-p2/tycho-p2-publisher-plugin' 'target-platform-configuration' 'tycho-artifactcomparator' 'sisu-equinox/sisu-equinox-launching' 'tycho-p2/tycho-p2-plugin' 'tycho-lib-detector' 'tycho-compiler-jdt' 'tycho-compiler-plugin' )
-
-for ((i=0; i < ${#xtraBundles[@]}; i++)) ;do
- echo ''
- echo 'Building ' ${xtraBundles[${i}]} '...'
- echo ''
- isolateProject ${xtraBundles[${i}]} ${fp2V}
- minibuild ${xtraBundles[${i}]} "${xtraDeps[${i}]}" ${xtraExternalDeps[${i}]}
- unifyProject ${xtraBundles[${i}]}
-done
-
-# TODO: stop minibuild function from hard-coding org/eclipse/tycho GID path
-dir=$(pwd)/.m2/org/fedoraproject/p2/org.fedoraproject.p2/
-mkdir -p ${dir}
-ln -s $(pwd)/.m2/org/eclipse/tycho/org.fedoraproject.p2/${fp2V} ${dir}
-
-for ((i=0; i < ${#bundles[@]}; i++)) ;do
- echo ''
- echo 'Building ' ${bundles[${i}]} '...'
- echo ''
- isolateProject ${bundles[${i}]}
- minibuild ${bundles[${i}]} "${deps[${i}]}" ${externalDeps[${i}]}
- unifyProject ${bundles[${i}]}
-done
-
-# Run the build on this maven reactor project
-for proj in ${reactorprojs[@]} ; do
- isolateProject ${proj}
- xmvn -B -o -e -f "${proj}/pom.xml" -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.test.skip=true \
- -Dmaven.compiler.source=11 -Dmaven.compiler.target=11 -Dmaven.compiler.release=11 -Dproject.build.sourceEncoding=UTF-8 \
- clean install
- unifyProject ${proj}
-done
-
-# Add org.fedoraproject.p2 to target platform for tycho-bundles-external
-extras='bootstrap/extras'
-mkdir -p ${extras}
-fp2Loc=`find .m2 -name "org.fedoraproject.p2-*.jar"`
-cp ${fp2Loc} ${extras}
-
-# Tycho Bundles External (needed for Tycho's OSGi Runtime)
-tbeDir='tycho-bundles/tycho-bundles-external'
-tbeTargetDir="${tbeDir}/target"
-wantedBundles=`sed 's/ fragment=\"true\"//' "${tbeDir}/tycho-bundles-external.product" | sed -n 's/.*<plugin id=\"\(.*\)\"\/>.*/\1/ p'`
-
-mkdir -p ${tbeTargetDir}'/eclipse/plugins'
-copyBundles "${wantedBundles}" "${tbeTargetDir}/eclipse/plugins"
-
-pushd ${tbeTargetDir}
-
-echo "#Eclipse Product File
-version=${v}
-name=org.eclipse.tycho.p2
-id=tycho-bundles-external" > 'eclipse/.eclipseproduct'
-
-mkdir -p 'eclipse/configuration'
-
-echo '#Product Runtime Configuration File
-osgi.bundles=org.apache.commons.codec,org.apache.commons.logging,org.apache.httpcomponents.httpclient,org.apache.httpcomponents.httpcore,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.runtime@4\:start,org.eclipse.core.runtime.compatibility.registry,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient4,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.ssl,org.eclipse.equinox.app,org.eclipse.equinox.common@2\:start,org.eclipse.equinox.concurrent,org.eclipse.equinox.ds@2\:start,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.launcher,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.transport.ecf,org.eclipse.equinox.p2.updatesite,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.equinox.security,org.eclipse.equinox.simpleconfigurator,org.eclipse.equinox.simpleconfigurator.manipulator,org.eclipse.equinox.util,org.eclipse.osgi.services,org.eclipse.osgi.compatibility.state,org.eclipse.tycho.noopsecurity,org.sat4j.core,org.sat4j.pb,org.eclipse.osgi.util,org.apache.felix.scr,org.kxml2,org.xmlpull,org.fedoraproject.p2
-osgi.bundles.defaultStartLevel=4
-eclipse.product=org.eclipse.equinox.p2.director.app.product
-osgi.splashPath=platform\:/base/plugins/org' > 'eclipse/configuration/config.ini'
-
-zip -r "tycho-bundles-external-${v}.zip" 'eclipse'
-
-popd
-
-loc=".m2/org/eclipse/tycho/tycho-bundles-external/${v}"
-
-mkdir -p ${loc}
-cp "${tbeTargetDir}/tycho-bundles-external-${v}.zip" ${loc}
-cp 'tycho-bundles/tycho-bundles-external/pom.xml' "${loc}/tycho-bundles-external-${v}.pom"
-
-sed -i "s/<equinoxVersion>.*<\/equinoxVersion>/<equinoxVersion>${osgiV}<\/equinoxVersion>/" pom.xml
-sed -i "s/<equinoxCompatVersion>.*<\/equinoxCompatVersion>/<equinoxCompatVersion>${osgiCompatV}<\/equinoxCompatVersion>/" pom.xml
-# xmvn-p2-installer-plugin needs to find the org.eclipse.osgi bundle
-sed -i "s/>\${equinox-version}</>${osgiV}</" fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml
diff --git a/tycho-debundle.sh b/tycho-debundle.sh
deleted file mode 100755
index b7255f1..0000000
--- a/tycho-debundle.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-. $(pwd)/tycho-scripts.sh
-
-projLoc=$1
-zipLoc=$projLoc/target/*.zip
-mfLoc=$2
-
-zipDir=`dirname ${zipLoc}`
-zipFile=`basename ${zipLoc}`
-tmpDir=${zipDir}/tmp
-[ -z "$mfLoc" ] && mfLoc=/dev/null
-
-mkdir -p ${tmpDir}
-unzip -d ${tmpDir} ${zipLoc}
-wantedBundles=`sed 's/ fragment=\"true\"//' ${projLoc}/*.product | sed -n 's/.*<plugin id=\"\(.*\)\"\/>.*/\1/ p'`
-pushd ${tmpDir}
-pluginsDir=`find . -type d -name plugins`
-pushd ${pluginsDir} && rm -rf *
-symlinkBundles "${wantedBundles}"
-for b in *; do readlink $b; done >$mfLoc
-popd
-zip -ry ${zipFile} *
-popd
-mv ${tmpDir}/${zipFile} ${zipLoc}
diff --git a/tycho-scripts.sh b/tycho-scripts.sh
deleted file mode 100755
index 2043adb..0000000
--- a/tycho-scripts.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#! /bin/bash
-
-function minibuild () {
-
-basedir=$1
-
-src=$(cat "${basedir}/build.properties" | grep 'source..' | cut -d'=' -f2 | sed -e 's/ //g')
-output=$(cat "${basedir}/build.properties" | grep 'output..' | cut -d'=' -f2 | sed -e 's/ //g')
-bName=$(cat "${basedir}/META-INF/MANIFEST.MF" | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/')
-artifactId=$(cat "${basedir}/pom.xml" | sed '/<parent>/,/<\/parent>/ d' | grep "<artifactId>" | sed 's/.*<artifactId>\(.*\)<\/artifactId>.*/\1/')
-version=$(cat "${basedir}/pom.xml" | grep "<version>" | sed 's/.*<version>\(.*\)<\/version>.*/\1/')
-
-# External (System) dependencies
-if [ $# -eq 3 ]; then
- mkdir -p "${basedir}/target/externalDeps"
- copyBundles $3 "${basedir}/target/externalDeps"
-else
- mkdir -p "${basedir}/target"
-fi
-
-mkdir -p "${basedir}/${output}"
-
-# Compile
-cp=
-if [ $# -gt 1 ]; then
- cp='-classpath '$2':'"${basedir}"'/target/externalDeps/*'
-fi
-
-javac -d "${basedir}/${output}" -encoding utf8 --release 11 \
- $(for file in `find "${basedir}/${src}" -name "*.java"`; \
- do echo -n "${file} "; \
- done;) \
- ${cp}
-
-# Package
-pushd ${basedir}
-pushd ${output}
-classfiles=`for file in $(find . -name "*.class"); do echo -n ' -C '${output} ${file} ; done;`
-popd
-packagefiles="${classfiles}"
-[ -e about.html ] && packagefiles="about.html $packagefiles"
-[ -e plugin.properties ] && packagefiles="plugin.properties $packagefiles"
-[ -e plugin.xml ] && packagefiles="plugin.xml $packagefiles"
-[ -e OSGI-INF ] && packagefiles="OSGI-INF $packagefiles"
-jar -cfmv "target/${bName}-${version}.jar" 'META-INF/MANIFEST.MF' ${packagefiles}
-popd
-
-# Install
-loc=".m2/org/eclipse/tycho/${artifactId}/${version}"
-mkdir -p ${loc}
-cp "${basedir}/target/${bName}-${version}.jar" ${loc}
-cp "${basedir}/pom.xml" "${loc}/${bName}-${version}.pom"
-
-}
-
-
-function copyBundles () {
-
-# X_SCLS expands to list of currently enabled SCLs, in the order they were enabled, if any
-scls="$X_SCLS"
-baseLocations=( '/usr/share/java' '/usr/lib/java' '/usr/lib/eclipse' )
-osgiLocations=(${baseLocations[@]} ${osgiLocations[@]} )
-for scl in ${scls} ; do
- osgiLocations=( ${baseLocations[@]/#//opt/rh/${scl}/root} ${osgiLocations[@]} )
-done
-
-prefix="$(pwd)/bootstrap"
-osgiLocations=( ${osgiLocations[@]/#/${prefix}} )
-osgiLocations+=( ${osgiLocations[@]/${prefix}/} )
-osgiLocations=( ${prefix}/extras ${osgiLocations[@]} )
-
-wantedBundles=`echo $1 | tr ',' ' '`
-destDir=$2
-
-for loc in ${osgiLocations[@]} ; do
- for jar in `find ${loc} -name "*.jar" 2>/dev/null`; do
- bsn=`readBSN ${jar}`
- if [ -n "${bsn}" ]; then
- versionline=`unzip -p ${jar} 'META-INF/MANIFEST.MF' | grep 'Bundle-Version:'`
- vers=`echo "${versionline}" | sed 's/Bundle-Version: \([a-zA-Z0-9_.-]*\).*/\1/'`
- if echo ${wantedBundles} | grep "${bsn}" ; then
- cp ${jar} "${destDir}/${bsn}_${vers}.jar"
- wantedBundles=`removeFromList "${wantedBundles}" "${bsn}"`
- fi
- fi
- done
-done
-
-}
-
-function symlinkBundles () {
-
-# Bootstrap Built Tycho provides some Eclipse bundles
-# Prevent non-bootstrap build's de-bundling from symlinking to them
-# SCL priority is from right to left.
-# X_SCLS expands to list of currently enabled SCLs, in the order they were enabled, if any
-scls="$X_SCLS"
-baseLocations=( '/usr/share/java/eclipse' '/usr/share/java' '/usr/lib/java' )
-osgiLocations=(${baseLocations[@]} ${osgiLocations[@]} )
-for scl in ${scls} ; do
- osgiLocations=( ${baseLocations[@]/#//opt/rh/${scl}/root} ${osgiLocations[@]} )
-done
-
-
-wantedBundles=`echo $1 | tr ',' ' '`
-
-for loc in ${osgiLocations[@]} ; do
- for jar in `find ${loc} -name "*.jar" 2>/dev/null`; do
- bsn=`readBSN ${jar}`
- if [ -n "${bsn}" ]; then
- echo ${wantedBundles} | grep -q "${bsn}"
- if [ $? -eq 0 ]; then
- ln -s ${jar} "${bsn}.jar"
- wantedBundles=`removeFromList "${wantedBundles}" "${bsn}"`
- fi
- fi
- done
-done
-}
-
-function removeFromList () {
-arr=( ${1} )
-for (( i=0; i < ${#arr[@]}; i++ )); do
- if [ "${arr[${i}]}" = "$2" ]; then
- arr[${i}]=
- fi
-done
-echo ${arr[@]}
-}
-
-function isolateProject () {
- cp $1/pom.xml $1/pom.xml.boot
-
- sed -i -e "/<artifactId>org.eclipse.osgi</ a <version>${osgiV}</version>" \
- -e "/<artifactId>org.eclipse.osgi.compatibility.state</ a <version>${osgiCompatV}</version>" \
- -e '/<parent>/,/<\/parent>/ d' "$1/pom.xml"
- if ! grep -q generate-metadata "$1/pom.xml" ; then
- sed -i -e "/<artifactId>plexus-component-metadata</ a <version>1.5.5</version><executions><execution><goals><goal>generate-metadata</goal></goals></execution></executions>" "$1/pom.xml"
- fi
-
- if [ $# -eq 2 ]; then
- sed -i "/<modelVersion>/ a <groupId>org.eclipse.tycho<\/groupId><version>$2<\/version>" "$1/pom.xml"
- else
- sed -i "/<modelVersion>/ a <groupId>org.eclipse.tycho<\/groupId><version>${v}<\/version>" "$1/pom.xml"
- fi
-}
-
-function unifyProject () {
- cp $1/pom.xml.boot $1/pom.xml
-}
-
-function readBSN () {
-
-bsn=
-manEntryPat="^[a-zA-Z-]*:"
-foundBSNLine=0
-
-while read line; do
-if [ ${foundBSNLine} -eq 1 ]; then
- echo ${line} | grep -qE ${manEntryPat}
- if [ $? -eq 0 ]; then
- break
- else
- bsn=${bsn}"`echo ${line} | sed 's/\([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`"
- fi
-fi
-
-echo ${line} | grep -q "Bundle-SymbolicName:"
-if [ $? -eq 0 ]; then
- bsn=`echo ${line} | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`
- echo ${line} | grep "Bundle-SymbolicName:" | grep -q ";"
- if [ $? -eq 0 ]; then
- break
- fi
- foundBSNLine=1
-fi
-done < <(unzip -p $1 'META-INF/MANIFEST.MF')
-
-echo ${bsn}
-
-}
diff --git a/tycho.spec b/tycho.spec
deleted file mode 100644
index 3e3b5bb..0000000
--- a/tycho.spec
+++ /dev/null
@@ -1,1269 +0,0 @@
-# Tycho depends on itself, and Eclipse to build but in certain cases these
-# requirements may not be satisfiable then building Tycho becomes problematic.
-# For example:
-# * A library (in Fedora) used by Tycho's runtime broke API and so Tycho
-# from the buildroot is broken
-# * Building into a new distro or buildroot, where neither Tycho nor Eclipse
-# is available yet and we need to build Tycho before building Eclipse
-# In bootstrap mode, javac and plain xmvn are used to build a subset of
-# 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
-
-# Allow conditionally building without Junit 5 support
-%bcond_with junit5
-
-# Release tags or git SHAs
-%global git_tag tycho-%{version}
-%global fp_p2_git_tag 0be3abaa1729553b13f384a008b1cd1fb00beaf4
-
-%global fp_p2_version 0.0.1
-%global fp_p2_snap -SNAPSHOT
-
-# The location of the xmvn dir into which we need to install the xmvn plugin
-%global xmvn_libdir %(realpath $(dirname $(readlink -f $(which xmvn)))/../lib)
-
-%define __requires_exclude osgi*
-
-Name: tycho
-Version: 2.3.0
-Release: 3%{?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
-License: ASL 2.0 and EPL-1.0
-URL: https://eclipse.org/tycho
-
-# Tycho project source
-Source0: https://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclips...
-# Eclipse Plugin Project supporting filesystem as p2 repository
-Source1: https://github.com/rgrunber/fedoraproject-p2/archive/%{fp_p2_git_tag}/fed...
-
-# this is a workaround for maven-plugin-plugin changes that happened after
-# version 2.4.3 (impossible to have empty mojo created as aggregate). This
-# should be fixed upstream properly
-Source2: EmptyMojo.java
-Source3: tycho-scripts.sh
-Source4: tycho-bootstrap.sh
-Source5: tycho-debundle.sh
-# Script that can be used to install or simulate installation of P2
-# artifacts. It is used in OSGi requires generation.
-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-2020-12.tar.xz
-%endif
-
-# Fedora-specific patches
-Patch0: 0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
-Patch1: 0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
-Patch2: 0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
-Patch5: 0006-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
-# Fix compile error with uncaught exception
-Patch3: 0004-Fix-uncaught-exception.patch
-# Fix incorrect generated requires
-Patch4: 0005-Fix-dependency-problems-when-bootstrapping-with-extr.patch
-%if 0%{?fedora} >= 34 || 0%{?eln}
-# API between surefire 3.0.0~M3 and 3.0.0~M4
-# Patch is applicable only when building against surefire 3.0.0~M4 and newer
-Patch6: 0007-Accomodate-API-change-in-surefire-3.0.0-M4.patch
-%endif
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildArch: noarch
-
-# Extras was folded into the main tycho package in F31
-Obsoletes: tycho-extras < 1.6.0-1
-Provides: tycho-extras = %{version}-%{release}
-
-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) >= 0.4.6
-BuildRequires: mvn(org.apache.commons:commons-compress)
-BuildRequires: mvn(org.apache.commons:commons-exec)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven:maven-archiver)
-BuildRequires: mvn(org.apache.maven:maven-artifact)
-BuildRequires: mvn(org.apache.maven:maven-compat)
-BuildRequires: mvn(org.apache.maven:maven-core)
-BuildRequires: mvn(org.apache.maven:maven-model)
-BuildRequires: mvn(org.apache.maven:maven-model-builder)
-BuildRequires: mvn(org.apache.maven:maven-plugin-api)
-BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common)
-BuildRequires: mvn(org.apache.maven.surefire:surefire-api)
-BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
-BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api)
-BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager)
-BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires: mvn(org.eclipse.jdt:ecj)
-BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
-BuildRequires: mvn(org.fedoraproject.xmvn:xmvn-api)
-BuildRequires: mvn(org.fedoraproject.xmvn:xmvn-core)
-BuildRequires: mvn(org.fedoraproject.xmvn:xmvn-install)
-BuildRequires: mvn(org.fedoraproject.xmvn:xmvn-parent:pom:)
-BuildRequires: mvn(org.osgi:osgi.annotation)
-BuildRequires: mvn(org.ow2.asm:asm-tree)
-BuildRequires: mvn(org.ow2.asm:asm-util)
-BuildRequires: mvn(org.slf4j:slf4j-api)
-BuildRequires: mvn(org.slf4j:slf4j-simple)
-%if %{with junit5}
-BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform)
-BuildRequires: mvn(org.apiguardian:apiguardian-api)
-BuildRequires: mvn(org.opentest4j:opentest4j)
-%endif
-
-%if ! %{with bootstrap}
-# Ordinarily Tycho additionally requires itself and Eclipse to build
-BuildRequires: %{name}
-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)
-BuildRequires: osgi(org.apache.commons.jxpath)
-BuildRequires: osgi(org.apache.batik.css)
-BuildRequires: osgi(org.apache.felix.scr)
-BuildRequires: osgi(org.sat4j.core)
-BuildRequires: osgi(org.sat4j.pb)
-BuildRequires: osgi(org.w3c.css.sac)
-BuildRequires: glassfish-annotation-api
-BuildRequires: glassfish-servlet-api
-BuildRequires: glassfish-jsp-api
-%endif
-
-Requires: maven-local
-Requires: xmvn-minimal
-Requires: ecj
-Requires: aqute-bndlib
-
-%if ! %{with bootstrap}
-Requires: eclipse-platform >= 1:4.17
-%endif
-
-# maven-clean-plugin is bound to "initialize" Maven phase for
-# "eclipse-repository" projects
-Requires: maven-clean-plugin
-
-%description
-Tycho is a set of Maven plugins and extensions for building Eclipse
-plugins and OSGI bundles with Maven. Eclipse plugins and OSGI bundles
-have their own metadata for expressing dependencies, source folder
-locations, etc. that are normally found in a Maven POM. Tycho uses
-native metadata for Eclipse plugins and OSGi bundles and uses the POM
-to configure and drive the build. Tycho supports bundles, fragments,
-features, update site projects and RCP applications. Tycho also knows
-how to run JUnit test plugins using OSGi runtime and there is also
-support for sharing build results using Maven artifact repositories.
-
-Tycho plugins introduce new packaging types and the corresponding
-lifecycle bindings that allow Maven to use OSGi and Eclipse metadata
-during a Maven build. OSGi rules are used to resolve project
-dependencies and package visibility restrictions are honored by the
-OSGi-aware JDT-based compiler plugin. Tycho will use OSGi metadata and
-OSGi rules to calculate project dependencies dynamically and injects
-them into the Maven project model at build time. Tycho supports all
-attributes supported by the Eclipse OSGi resolver (Require-Bundle,
-Import-Package, Eclipse-GenericRequire, etc). Tycho will use proper
-classpath access rules during compilation. Tycho supports all project
-types supported by PDE and will use PDE/JDT project metadata where
-possible. One important design goal in Tycho is to make sure there is
-no duplication of metadata between POM and OSGi metadata.
-
-%package javadoc
-Summary: Javadocs for %{name}
-# Extras was folded into the main tycho package in F31
-Obsoletes: tycho-extras-javadoc < 1.6.0-1
-Provides: tycho-extras-javadoc = %{version}-%{release}
-
-%description javadoc
-This package contains the API documentation for %{name}.
-
-%prep
-%setup -q -n org.eclipse.tycho-%{git_tag} -a 1
-mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%if 0%{?fedora} >= 34 || 0%{?eln}
-%patch6 -p1
-%endif
-
-# Unneeded for RPM builds
-%pom_remove_plugin :maven-site-plugin
-
-# These tycho plug-ins don't make sense in the context of RPM builds of Eclipse plug-ins
-%pom_disable_module tycho-buildtimestamp-jgit tycho-extras
-%pom_disable_module tycho-sourceref-jgit tycho-extras
-
-%if %{without junit5}
-%pom_disable_module org.eclipse.tycho.surefire.junit5 tycho-surefire
-%pom_disable_module org.eclipse.tycho.surefire.junit54 tycho-surefire
-%pom_disable_module org.eclipse.tycho.surefire.junit55 tycho-surefire
-%pom_disable_module org.eclipse.tycho.surefire.junit56 tycho-surefire
-%pom_disable_module org.eclipse.tycho.surefire.junit57 tycho-surefire
-%pom_remove_dep ":org.eclipse.tycho.surefire.junit5" tycho-surefire/tycho-surefire-plugin
-%pom_remove_dep ":org.eclipse.tycho.surefire.junit54" tycho-surefire/tycho-surefire-plugin
-%pom_remove_dep ":org.eclipse.tycho.surefire.junit55" tycho-surefire/tycho-surefire-plugin
-%pom_remove_dep ":org.eclipse.tycho.surefire.junit56" tycho-surefire/tycho-surefire-plugin
-%pom_remove_dep ":org.eclipse.tycho.surefire.junit57" tycho-surefire/tycho-surefire-plugin
-%endif
-
-# Don't build deprecated pack200 modules
-%pom_disable_module pack200 tycho-extras
-
-# Fix split package issue during bootstrap mode builds
-sed -i -e '/Require-Bundle/s/\(.*\)/\1,org.eclipse.equinox.registry/' tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
-
-# Relax dep on aqute-bndlib
-sed -i -e '/biz.aQute.bndlib/s/5.1.2/3.5.0/' \
- tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
-# Relax dep on asm
-sed -i -e 's/ASM9/ASM8/' \
- tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
-# Fix dep on slf4j
-sed -i -e '/slf4j.api/s/org.slf4j.api/slf4j.api/' \
- tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-
-# Remove repositories section and pom imports
-%pom_xpath_remove "pom:repositories" fedoraproject-p2
-# Use osgi from local repo
-%pom_xpath_remove "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='tycho']" fedoraproject-p2/xmvn-p2-installer-plugin
-%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='org.eclipse.osgi']" "<version>\${equinox-version}</version>" fedoraproject-p2/xmvn-p2-installer-plugin
-
-# place empty mojo in place
-mkdir -p tycho-maven-plugin/src/main/java/org/fedoraproject
-pushd tycho-maven-plugin/src/main/java/org/fedoraproject
-cp %{SOURCE2} .
-popd
-
-# Homogenise requirement on OSGi bundle
-%if %{with bootstrap}
-sed -i -e "s/>org.eclipse.platform</>org.eclipse.tycho</" pom.xml tycho-core/pom.xml sisu-equinox/sisu-equinox-embedder/pom.xml fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml
-%endif
-
-# Target platform does not really apply to RPM builds
-%pom_disable_module tycho-bundles-target tycho-bundles
-%pom_xpath_remove "pom:target" tycho-bundles
-
-# Disable maven-properties-plugin used by tests
-%pom_remove_plugin org.sonatype.plugins:maven-properties-plugin tycho-extras/tycho-p2-extras-plugin
-# Remove dep on maven tarball used by tests
-%pom_remove_dep org.apache.maven:apache-maven tycho-extras/tycho-p2-extras-plugin
-
-# we don't have org.apache.commons:commons-compress:jar:sources
-%pom_xpath_remove "pom:dependency[pom:classifier='sources' and pom:artifactId='commons-compress']" tycho-p2/tycho-p2-director-plugin
-
-# Don't build tests
-for b in core.shared.tests p2.resolver.impl.test p2.resolver.shared.tests p2.maven.repository.tests p2.tools.tests test.utils ; do
- %pom_disable_module org.eclipse.tycho.$b tycho-bundles
-done
-%pom_disable_module org.fedoraproject.p2.tests fedoraproject-p2
-%pom_disable_module tycho-testing-harness
-%pom_remove_dep -r :::test
-
-# Bootstrap Build
-%if %{with bootstrap}
-
-# Break circular dep between tycho-lib-detector and tycho-compiler-jdt for bootstrapping
-%pom_remove_plugin :maven-compiler-plugin tycho-lib-detector
-
-# Unpack a compatible version of Eclipse we can use to build against
-tar -xf %{SOURCE10}
-# Install OSGi bundles into local repo to override any incompatible system version
-# that may be already installed
-pushd bootstrap
-for f in usr/lib/eclipse/plugins/org.eclipse.osgi.compatibility.state_*.jar \
- usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar \
- usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar \
- usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar ; do
- xmvn -o install:install-file -Dfile=$f -Dpackaging=jar -DgroupId=org.eclipse.tycho -Dmaven.repo.local=$(pwd)/../.m2 \
- -DartifactId=$(echo $(basename $f) | cut -d_ -f1) -Dversion=$(echo "${f%.jar}" | cut -d_ -f2)
-done
-popd
-
-# Perform the 'minimal' (bootstrap) build of Tycho
-cp %{SOURCE3} %{SOURCE4} .
-./tycho-bootstrap.sh %{version}
-
-# Non-Bootstrap Build
-%else
-
-# Set some temporary build version so that the bootstrapped build has
-# a different version from the nonbootstrapped. Otherwise there will
-# be cyclic dependencies.
-
-sysVer=`grep -C 1 "<artifactId>tycho</artifactId>" %{_mavenpomdir}/tycho/tycho.pom | grep "version" | sed 's/.*>\(.*\)<.*/\1/'`
-mkdir boot
-sed -e 's/ns[0-9]://g' %{_datadir}/maven-metadata/%{name}.xml > boot/tycho-metadata.xml
-
-# Copy Tycho POMs from system repo and set their versions to %%{version}-SNAPSHOT.
-for pom in $(grep 'pom</path>' boot/tycho-metadata.xml | sed 's|.*>\(.*\)<.*|\1|'); do
- sed -e "s/>$sysVer/>%{version}-SNAPSHOT/g" -e "s/%{fp_p2_version}%{fp_p2_snap}/%{fp_p2_version}/" <$pom >boot/$(basename $pom)
-done
-
-# Update Maven lifecycle mappings for Tycho packaging types provided by tycho-maven-plugin.
-cp -p $(build-classpath tycho/tycho-maven-plugin) boot/tycho-maven-plugin.jar
-jar xf boot/tycho-maven-plugin.jar META-INF/plexus/components.xml
-sed -i s/$sysVer/%{version}-SNAPSHOT/ META-INF/plexus/components.xml
-jar uf boot/tycho-maven-plugin.jar META-INF/plexus/components.xml
-
-# Create XMvn metadata for the new JARs and POMs by customizing system Tycho metadata.
-sed -i -e 's/xmlns=".*"//' boot/tycho-metadata.xml
-%pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi']" boot/tycho-metadata.xml
-%pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi.util']" boot/tycho-metadata.xml
-%pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi.services']" boot/tycho-metadata.xml
-%pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi.compatibility.state']" boot/tycho-metadata.xml
-sed -i '
- s|>/[^<]*/\([^/]*\.pom\)</path>|>'$PWD'/boot/\1</path>|
- s|>'$sysVer'</version>|>%{version}-SNAPSHOT</version><compatVersions><version>%{version}-SNAPSHOT</version></compatVersions>|
- s|>'%{fp_p2_version}%{fp_p2_snap}'</version>|>%{fp_p2_version}</version><compatVersions><version>%{fp_p2_version}</version></compatVersions>|
- s|%{_javadir}/tycho/tycho-maven-plugin.jar|'$PWD'/boot/tycho-maven-plugin.jar|
-' boot/tycho-metadata.xml
-%mvn_config resolverSettings/metadataRepositories/repository $PWD/boot/tycho-metadata.xml
-%endif
-
-# Add fp-p2 to main build
-%pom_xpath_inject "pom:modules" "<module>fedoraproject-p2</module>"
-
-%build
-%mvn_build -f -- \
- -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \
- -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap -Dasm-version=8.0.1 -Dequinox-version=3.16.100.v20201211-1332
-
-%mvn_artifact fedoraproject-p2/org.fedoraproject.p2/pom.xml
-
-# Relying on xmvn p2 plugin being present would be a circular dep
-# So install as if all artifacts are normal jar files
-sed -i -e 's|type>eclipse.*<|type>jar<|' .xmvn-reactor
-
-# Don't package target platform definition files
-%mvn_package "::target::" __noinstall
-
-%install
-# Get debundling scripts
-cp %{SOURCE3} %{SOURCE5} .
-
-%if ! %{with bootstrap}
-# Debundle p2 runtime
-./tycho-debundle.sh $(pwd)/tycho-bundles/tycho-bundles-external \
- $(pwd)/tycho-bundles/tycho-bundles-external/target/tycho-bundles-external-manifest.txt
-%endif
-
-%if %{with bootstrap}
-# Install our own copy of OSGi runtime when bootstrapping to avoid external dep on Eclipse
-for b in org.eclipse.osgi \
- org.eclipse.osgi.util \
- org.eclipse.osgi.services \
- org.eclipse.osgi.compatibility.state ; do
- osgiJarPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.jar")
- osgiPomPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.pom")
- %mvn_artifact $osgiPomPath $osgiJarPath
-done
-%endif
-
-%mvn_install
-
-%if ! %{with bootstrap}
-install -pm 644 tycho-bundles/tycho-bundles-external/target/tycho-bundles-external-manifest.txt %{buildroot}%{_javadir}/tycho
-%add_maven_depmap org.eclipse.tycho:tycho-bundles-external:txt:manifest:%{version} tycho/tycho-bundles-external-manifest.txt
-%endif
-
-%if %{with bootstrap}
-# Misc other bundles needed for bootstrapping
-for bnd in \
- core.contenttype \
- core.expressions \
- core.filesystem \
- core.jobs \
- core.net \
- core.resources \
- core.runtime \
- equinox.app \
- equinox.common \
- equinox.concurrent \
- equinox.preferences \
- equinox.registry \
- equinox.security ; do
-bndJarPath=$(find bootstrap -name "org.eclipse.${bnd}_*.jar")
-install -m 644 -T $bndJarPath $RPM_BUILD_ROOT%{_javadir}/tycho/$bnd.jar
-done
-%endif
-
-# For some reason fp-p2 is treated as a compat version, this prevents that
-# TODO: figure out why
-sed -i '/<resolvedVersion>/d' %{buildroot}%{_datadir}/maven-metadata/%{name}.xml
-
-# p2-install script
-install -dm 755 %{buildroot}%{_javadir}-utils/
-install -pm 755 %{SOURCE6} %{buildroot}%{_javadir}-utils/
-
-# Symlink XMvn P2 plugin with all dependencies so that it can be loaded by XMvn
-install -dm 755 %{buildroot}%{xmvn_libdir}/installer/
-%if %{with bootstrap}
-ln -s %{_javadir}/tycho/org.eclipse.osgi.jar %{buildroot}%{xmvn_libdir}/installer/
-%else
-ln -s %{_javadir}/eclipse/osgi.jar %{buildroot}%{xmvn_libdir}/installer/
-%endif
-ln -s %{_javadir}/tycho/xmvn-p2-installer-plugin.jar %{buildroot}%{xmvn_libdir}/installer/
-ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/installer/
-
-%files -f .mfiles
-%{xmvn_libdir}/installer/*
-%{_javadir}-utils/p2-install.sh
-%if %{with bootstrap}
-%{_javadir}/tycho/core.*.jar
-%{_javadir}/tycho/equinox.*.jar
-%endif
-%doc README.md
-
-%files javadoc -f .mfiles-javadoc
-
-%changelog
-* Mon Aug 23 2021 Mat Booth <mat.booth(a)gmail.com> - 2.3.0-3
-- Don't ship deprecated pack200 plugins and fix a split package resolution issue
- during bootstrap builds
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Apr 8 2021 Alexander Kurtakov <akurtako(a)redhat.com> 2.3.0-1
-- Update to upstream 2.3.0 release.
-
-* Mon Feb 8 2021 Mat Booth <mat.booth(a)redhat.com> - 2.2.0-4
-- Fix eln build
-
-* Mon Feb 8 2021 Mat Booth <mat.booth(a)redhat.com> - 2.2.0-3
-- Accomodate for API change in surefire 3.0.0~M4
-
-* Thu Feb 4 2021 Mat Booth <mat.booth(a)redhat.com> - 2.2.0-2
-- Add missing runtime dep on aqute-bnd
-
-* Tue Feb 2 2021 Mat Booth <mat.booth(a)redhat.com> - 2.2.0-1
-- Update to latest upstream release
-- Update bootstrap Eclipse version
-
-* Tue Feb 2 2021 Mat Booth <mat.booth(a)redhat.com> - 2.1.0-5
-- Debootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Mat Booth <mat.booth(a)redhat.com> - 2.1.0-3
-- Enable bootstrap mode
-- Update fp-p2 snapshot to fix xmvn installation failure
-
-* Thu Jan 14 2021 Mat Booth <mat.booth(a)redhat.com> - 2.1.0-2
-- Fix embedded equinox location discovery and fix bootstrapping on Java 11
-
-* Tue Nov 24 2020 Mat Booth <mat.booth(a)redhat.com> - 2.1.0-1
-- Update to latest upstream release
-
-* Wed Nov 11 2020 Mat Booth <mat.booth(a)redhat.com> - 1.7.0-4
-- Debootstrap build
-
-* Wed Nov 11 2020 Mat Booth <mat.booth(a)redhat.com> - 1.7.0-3
-- Add deps needed for bootstrapping
-
-* Wed Nov 11 2020 Mat Booth <mat.booth(a)redhat.com> - 1.7.0-2
-- Bootstrap against Eclipse 4.17
-
-* Wed Nov 11 2020 Mat Booth <mat.booth(a)redhat.com> - 1.7.0-1
-- Interrim update to tycho version
-
-* Tue Aug 18 2020 Mat Booth <mat.booth(a)redhat.com> - 1.6.0-6
-- Fix bootstrap mode against Java 11
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.6.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 1.6.0-4
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Sat Mar 21 2020 Mat Booth <mat.booth(a)redhat.com> - 1.6.0-3
-- Add missing resolver patch for eclipserun plugin
-
-* Fri Mar 20 2020 Mat Booth <mat.booth(a)redhat.com> - 1.6.0-2
-- Add obsoletes/provides for extras javadoc package
-
-* Wed Feb 19 2020 Mat Booth <mat.booth(a)redhat.com> - 1.6.0-1
-- Update to latest upstream release
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 27 2020 Mat Booth <mat.booth(a)redhat.com> - 1.5.0-5
-- Fix build with Eclipse 4.14
-
-* Thu Jan 23 2020 Mat Booth <mat.booth(a)redhat.com> - 1.5.0-4
-- Remove references to kxml/xpp3
-
-* Wed Dec 18 2019 Mat Booth <mat.booth(a)redhat.com> - 1.5.0-3
-- Full build
-
-* Wed Dec 18 2019 Mat Booth <mat.booth(a)redhat.com> - 1.5.0-2
-- Bootstrap mode
-
-* Tue Dec 17 2019 Mat Booth <mat.booth(a)redhat.com> - 1.5.0-1
-- Update to latest upstream release
-
-* Fri Aug 09 2019 Mat Booth <mat.booth(a)redhat.com> - 1.4.0-2
-- Fix bootstrapping with new ECF
-
-* Fri May 24 2019 Mat Booth <mat.booth(a)redhat.com> - 1.4.0-1
-- Update to latest upstream release
-
-* Tue May 07 2019 Mat Booth <mat.booth(a)redhat.com> - 1.3.0-5
-- Don't build tests, they are not being run anyway
-
-* Mon Mar 11 2019 Mat Booth <mat.booth(a)redhat.com> - 1.3.0-4
-- Debootstrap build
-- Restrict to the same architectures as Eclipse itself
-
-* Mon Mar 11 2019 Mat Booth <mat.booth(a)redhat.com> - 1.3.0-3
-- Bootstrap with new felix-scr
-
-* Tue Feb 19 2019 Mat Booth <mat.booth(a)redhat.com> - 1.3.0-2
-- Allow building against ASM 6
-
-* Mon Feb 18 2019 Mat Booth <mat.booth(a)redhat.com> - 1.3.0-1
-- Update to latest upstream release
-- Allow conditionally building Junit5 support
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 13 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-7
-- Fix build against newest Mockito and ASM
-
-* Mon Aug 20 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-6
-- Rebuild against Eclipse 2018-09
-
-* Fri Aug 17 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-5
-- Bootstrap mode improvements
-- Patch to use Java 8 as the default target EE, prevents unnecessary dep
- on Java 9
-
-* Wed Jul 25 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-4
-- Fix build against new surefire
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 12 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-2
-- Bootstrap build
-
-* Tue Jun 05 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-1
-- Update to latest release for Java 10 support
-- Drop upstreamed patch
-
-* Wed May 09 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-0.5.git5d018bb
-- Surefure now used maven-shared-utils instead of plexus-utils, fixes test runs
- in other packages
-
-* Thu May 03 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-0.4.git5d018bb
-- Add a proper patch for ebz#534255
-
-* Wed May 02 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-0.3.git5d018bb
-- Update tycho snapshot and simplify bootstrapping
-
-* Wed May 02 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-0.2.gitd9ce75d
-- Non-bootstrap build
-
-* Mon Apr 30 2018 Mat Booth <mat.booth(a)redhat.com> - 1.2.0-0.1.gitd9ce75d
-- Update to latest tycho snapshot
-- Bootstrap build
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Dec 08 2017 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-10
-- Calculate xmvn/lib path, allow building against older and newer surefire
-
-* Wed Oct 11 2017 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-9
-- Port to latest surefire
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jun 21 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.0-7
-- Update to latest fp-p2 snapshot for XMvn 3.0.0 support
-
-* Tue Jun 20 2017 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-6
-- Improve bootstrap mode
-
-* Sat Jun 17 2017 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-5
-- Debootstrap build
-
-* Sat Jun 17 2017 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-4
-- Add osgi.util bundle to tycho runtime
-
-* Wed May 24 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.0-3
-- Remove no longer needed requires on Maven plugins
-
-* Wed Apr 26 2017 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-2
-- Debootstrap build
-
-* Thu Apr 20 2017 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-1
-- Update to 1.0.0
-- Simplify artifact installation
-- Tycho 1.0 requires Eclipse Oxygen
-- Add felix-scr and deps to tycho-bundles-external
-
-* Thu Apr 20 2017 Mat Booth <mat.booth(a)redhat.com> - 0.26.0-3
-- Fix and enable bootstrap mode
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.26.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Nov 02 2016 Mat Booth <mat.booth(a)redhat.com> - 0.26.0-1
-- Update to latest upstream
-
-* Mon Jul 25 2016 Mat Booth <mat.booth(a)redhat.com> - 0.25.0-7
-- Remove incomplete SCL macros
-
-* Thu Jun 30 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.25.0-6
-- Add missing requires on maven-plugin-testing-harness
-
-* Thu Jun 30 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.25.0-5
-- Require full xmvn
-
-* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.25.0-4
-- Add missing requires on maven-source-plugin
-
-* Fri Apr 22 2016 Mat Booth <mat.booth(a)redhat.com> - 0.25.0-3
-- Require newer ECJ with correct aliases
-
-* Thu Apr 21 2016 Mat Booth <mat.booth(a)redhat.com> - 0.25.0-2
-- Non-bootstrap build against Eclipse Neon
-
-* Wed Apr 20 2016 Mat Booth <mat.booth(a)redhat.com> - 0.25.0-1
-- Update to latest upstream release
-- Full bootstrap mode due to incompatibility with Eclipse Mars
-
-* Thu Apr 14 2016 Mat Booth <mat.booth(a)redhat.com> - 0.23.0-17
-- Fix build against new maven-archiver, which removed some deprecated methods
- that tycho was using
-
-* Tue Mar 15 2016 Mat Booth <mat.booth(a)redhat.com> - 0.23.0-16
-- Update to latest fp-p2 snapshot
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.23.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 25 2016 Mat Booth <mat.booth(a)redhat.com> - 0.23.0-14
-- Updates to latest version of fedoraproject-p2.
-- fedoraproject-p2: Fix a concurrent modification exception when feature
- plugins have circular deps
-
-* Mon Jan 11 2016 Roland Grunberg <rgrunber(a)redhat.com> - 0.23.0-13
-- Updated to latest version of fedoraproject-p2.
-- fedoraproject-p2: Correctly handle splitting virtual packages.
-
-* Mon Jan 4 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.23.0-12
-- Update for maven-surefire 2.19.1
-
-* Mon Oct 26 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.23.0-11
-- Fix bug in org.eclipse.tycho.surefire.junit4 provider.
-
-* Tue Oct 20 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.23.0-10
-- Update to work with maven-surefire 2.19.
-
-* Thu Aug 27 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.23.0-9
-- fedoraproject-p2: Enable support for p2 Droplets.
-
-* Tue Jul 28 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.23.0-8
-- fedoraproject-p2: Single IU resolving requirements with multiple matches.
-
-* Fri Jul 17 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.23.0-7
-- fedoraproject-p2: Remove host localization fragments from reactor units.
-
-* Tue Jun 30 2015 Mat Booth <mat.booth(a)redhat.com> - 0.23.0-6
-- Fix bootstrap build
-- fedoraproject-p2: Allow xmvn-p2-installer to work in bootstrap mode
-
-* Thu Jun 25 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.23.0-5
-- fedoraproject-p2: Do not generate requires for fragments.
-- Update to work with maven-surefire 2.18.
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.23.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Jun 09 2015 Mat Booth <mat.booth(a)redhat.com> - 0.23.0-3
-- Fix bootstrap build
-
-* Tue Jun 9 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.23.0-2
-- Port to Plexus Archiver 3.0.1
-
-* Fri Jun 05 2015 Mat Booth <mat.booth(a)redhat.com> - 0.23.0-1
-- Update to 0.23.0 release
-- Allow tycho-bootstrap.sh to work with "set -e" to fail faster
- and see errors more easily
-
-* Sat May 30 2015 Alexander Kurtakov <akurtako(a)redhat.com> 0.22.0-18
-- Fix build with no tomcat servlet.
-
-* Thu May 07 2015 Mat Booth <mat.booth(a)redhat.com> - 0.22.0-17
-- Add org.tukaani.xz to tycho-bundles-external
-
-* Tue Apr 28 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-16
-- Fix resolution issues when upstream version in local repository.
-- Resolves: rhbz#1216170
-
-* Thu Apr 23 2015 Mat Booth <mat.booth(a)redhat.com> - 0.22.0-15
-- fedoraproject-p2: Add support for archful dropins
-
-* Mon Apr 20 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-14
-- Handle possible changes to metadata namespace (ns[0-9]).
-
-* Fri Apr 17 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-13
-- fedoraproject-p2: Subpackages '*-tests' should not be in dropins.
-
-* Sun Mar 29 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-12
-- Port to Jetty 9.3.0
-
-* Thu Feb 5 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-11
-- fedoraproject-p2: Fix support for shallow dropin directory layout
-
-* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-10
-- fedoraproject-p2: Bump BREE to JavaSE-1.8
-- fedoraproject-p2: Fix installing of virtual bundles provided by p2.inf
-
-* Wed Jan 28 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-9
-- fedoraproject-p2: Allow installation of bundles not built with tycho
-
-* Mon Jan 19 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-8
-- Introduce basic SCL support.
-- Minor changes for bootstrap build.
-- Suppress failed lookups on non-existing paths in scripts.
-- Explicitly depend on org.hamcrest.core where necessary.
-
-* Thu Dec 11 2014 Mat Booth <mat.booth(a)redhat.com> - 0.22.0-7
-- fedoraproject-p2: Fix for bundles containing underscores
-
-* Wed Dec 10 2014 Mat Booth <mat.booth(a)redhat.com> - 0.22.0-6
-- fedoraproject-p2: Update to latest snapshot
-
-* Wed Dec 10 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-5
-- Rebuild to pick up arch-independent ECF bundle locations.
-
-* Mon Dec 08 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-4
-- fedoraproject-p2: Permit installation of tycho-generated source features.
-
-* Thu Dec 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-3
-- Non-bootstrap build
-
-* Thu Dec 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-2.1
-- fedoraproject-p2: Add support for installation into SCLs
-- Bootstrap build
-
-* Thu Dec 04 2014 Mat Booth <mat.booth(a)redhat.com> - 0.22.0-2
-- Fix osgi.jar symlink when in eclipse-bootstrap mode
-- Remove no longer needed workaround for rhbz#1139180
-- Tidy up and remove unneeded R/BRs
-- Also reduce number of changes needed to SCL-ise package
-
-* Mon Dec 01 2014 Mat Booth <mat.booth(a)redhat.com> - 0.22.0-1
-- Update to tagged release
-
-* Thu Nov 27 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-0.1.gitb1051d
-- Update to 0.22.0 pre-release.
-
-* Thu Nov 27 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-23
-- fedoraproject-p2: Obtain SCL roots by parsing Java conf files
-- fedoraproject-p2: Add support for installing into SCL root
-
-* Thu Nov 27 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-22
-- Install p2-install.sh script in java-utils/
-
-* Thu Nov 27 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-21
-- fedoraproject-p2: Implement installer application
-
-* Tue Nov 25 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-20
-- fedoraproject-p2: Update to latest snapshot (SCL improvements)
-
-* Thu Nov 06 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-19
-- fedoraproject-p2: Fix occasionally failing to generate metadata
-
-* Tue Oct 28 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-18
-- Fixes to bootstrap build.
-- Package com.ibm.icu (icu4j-eclipse) for bootstrap build.
-- Resolves: rhbz#1129801
-
-* Thu Oct 09 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-17
-- fedoraproject-p2: Fix incorrect metadata generation bugs
-
-* Tue Oct 07 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-16
-- fedoraproject-p2: Update to latest snapshot
-
-* Thu Oct 02 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-15
-- Update to build against plexus-archiver 2.6.
-
-* Thu Sep 25 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-14
-- fedoraproject-p2: Fix requires generation bug
-
-* Wed Sep 24 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-13
-- fedoraproject-p2: Allow installation of source bundles
-
-* Mon Sep 22 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-12
-- Add Fedora system repos to target definition resolver.
-- Look for any IU if IU/Version query fails in target definition resolver.
-
-* Fri Sep 12 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-11
-- fedoraproject-p2: Allow installing the same symlink into separate dropins
-
-* Wed Sep 10 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-10
-- Fix tycho-bundles-external-manifest.txt generation
-
-* Wed Sep 10 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-9
-- fedoraproject-p2: Fix self-dependencies failing builds
-
-* Tue Sep 9 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-8
-- Make debundling more resilient to changes.
-- fedoraproject-p2: Update to latest (Fix metapackage merging).
-
-* Mon Sep 8 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-8
-- fedoraproject-p2: Import XMvn P2 plugin
-- fedoraproject-p2: Fix NPE bug
-- fedoraproject-p2: Avoid extracting tycho-bundles-external.zip
-
-* Fri Sep 05 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-7
-- Debundle tycho-bundles-external and tycho-standalone-p2-director.
-- Resolves: rhbz#789272
-
-* Thu Sep 04 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-6
-- Use fedoraproject-p2 to do OSGi bundle discovery.
-
-* Wed Sep 03 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-5
-- Include eclipse features dir in custom resolver
-
-* Wed Sep 03 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-4
-- fedoraproject-p2: Do not regenerate IU metadata on every query.
-
-* Thu Aug 28 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-3
-- Perform non-bootstrap build
-- Update running-env-only patch
-
-* Wed Aug 27 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-2.1
-- fedoraproject-p2: Fix issues with creation of feature IUs.
-- fedoraproject-p2: Fix jar corruption bug.
-
-* Thu Aug 21 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-2
-- Integrate fedoraproject-p2 into Tycho.
-
-* Thu Jul 24 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-1
-- Update to 0.21.0 Release.
-
-* Fri Jul 11 2014 Mat Booth <mat.booth(a)redhat.com> - 0.20.0-18
-- Allow director plugin to only assemble products for the current arch
-- Drop some unneeded BR/Rs on surefire (maven-local pulls these in)
-
-* Wed Jul 02 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-17
-- Return non-existant expected local path when resolution fails.
-- Resolves: rhbz#1114120
-
-* Fri Jun 27 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-16
-- Tycho should always delegate artifact resolution to Maven.
-
-* Wed Jun 25 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0.20.0-15
-- Non-bootstrap build now that aarch64 is done.
-
-* Tue Jun 24 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-14.1
-- Add swt aarch64 fragment to bootstrap repo.
-
-* Tue Jun 24 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0.20.0-14
-- Full bootstrap build for secondary archs.
-
-* Thu Jun 12 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.20.0-13
-- Restore runtime dependencies on XMvn
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.20.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Jun 3 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.20.0-11
-- Skip intermediary build in non-bootstrap mode
-- Resolves: rhbz#1103839
-- Remove unneeded XMvn bits
-
-* Fri May 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.20.0-10
-- Fix runtime dependencies on XMvn in POMs
-- Use custom Plexus config to lookup XMvn classes
-- Lookup Aether WorkspaceReader using role hint "ide"
-
-* Thu May 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.20.0-9
-- Don'n install duplicate Maven metadata for sisu-equinox
-
-* Wed May 21 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.20.0-8
-- Use .mfiles generated during build
-
-* Fri May 16 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.20.0-7
-- Add support for XMvn 2.0
-
-* Tue May 13 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0.20.0-6
-- Make tycho copy licence feature to the system repo.
-
-* Wed Apr 30 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0.20.0-5
-- Non-bootstrap build.
-
-* Tue Apr 29 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0.20.0-4
-- Organize patches.
-
-* Tue Apr 22 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-3
-- Add support for compact profiles (Bug 1090003).
-
-* Wed Apr 02 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-2
-- Non-bootstrap build.
-
-* Thu Mar 27 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-1.1
-- Update to Eclipse Luna (4.4).
-
-* Mon Mar 24 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-1
-- Update to 0.20.0 Release.
-
-* Wed Mar 12 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-11
-- Respect %%{eclipse_bootstrap} flag in tycho-bootstrap.sh.
-- Update Eclipse bootstrap cache.
-- Fix Equinox Launcher usage logic in copy-platform-all.
-
-* Thu Mar 06 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-10
-- Non-bootstrap build.
-
-* Thu Mar 06 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-9.1
-- Do not check %%{_libdir}/eclipse plugins/features folders twice.
-
-* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.19.0-9
-- Improve logging and error handling fop copy-platform-all
-
-* Wed Jan 15 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-8
-- Perform a pure bootstrap build.
-- Fix issues with bootstrap build.
-
-* Thu Jan 09 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-7
-- Fix bootstrap build.
-
-* Mon Jan 6 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.19.0-6
-- Fix usage of %%add_maven_depmap for zip files
-- Resolves: rhbz#1004310
-
-* Mon Dec 9 2013 Alexander Kurtakov <akurtako(a)redhat.com> 0.19.0-5
-- Switch to using %%mvn_build.
-- Update BR/R names.
-- Adapt to asm5.
-
-* Thu Nov 21 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-4
-- Return expected reactor cache location when XMvn resolution fails.
-
-* Wed Nov 20 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-3
-- Bump release for rebuild (Bug 1031769).
-
-* Mon Nov 18 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-2
-- Reduce length of file lock name when file is in build directory.
-
-* Thu Oct 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-1
-- Update to 0.19.0 Release.
-
-* Fri Oct 04 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-7
-- Do not use XMvn internals (Bug 1015038).
-
-* Thu Oct 3 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.18.1-6
-- Adjust to latest Xmvn (workaround for 1015038).
-
-* Mon Sep 9 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.18.1-5
-- Add workaround for rhbz#1004310
-
-* Tue Jul 30 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-4
-- Improve artifact resolution using XMvn Resolver. (Bug 986900)
-
-* Mon Jul 29 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-3
-- Fix Tycho file locking to work in Fedora.
-- Skip validateConsistentTychoVersion by default. (Bug 987271)
-
-* Wed Jul 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-2
-- Non-bootstrap build.
-
-* Wed Jul 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-1.1
-- Update to use Eclipse Aether.
-- Use MavenSession and Plexus to determine state.
-- Fix bootstrap build.
-
-* Thu Jul 18 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.18.1-1
-- Make changes to ensure intermediary build succeeds.
-- Remove %%Patch6 in favour of call to sed.
-
-* Thu Jul 18 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.18.1-1
-- Update to 0.18.1.
-
-* Tue Jul 16 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.0-5
-- Look for maven artifacts using XMvn Resolver.
-
-* Tue Jul 9 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.18.0-4
-- Update to use maven-surefire 2.15 API.
-
-* Fri Jul 5 2013 Alexander Kurtakov <akurtako(a)redhat.com> 0.18.0-3
-- Use _jnidir too when building local p2 repo.
-
-* Thu Jun 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.18.0-2
-- Add Requires on plugins present in Maven super POM
-- Resolves: rhbz#971301
-
-* Tue May 28 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.18.0-1
-- Update to 0.18.0 Release.
-
-* Thu Apr 11 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-1
-- Fix bootstrap build for potential future use.
-
-* Tue Apr 2 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-1
-- Update to 0.17.0 Release.
-
-* Mon Mar 18 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-0.11.git3351b1
-- Non-bootstrap build.
-
-* Mon Mar 18 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.17.0-0.10.git3351b1
-- Merge mizdebsk patch with existing custom resolver patch.
-
-* Mon Mar 18 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.17.0-0.9.git3351b1
-- Move the patch into better place.
-
-* Mon Mar 18 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.17.0-0.8.git3351b1
-- Non-bootstrap build.
-
-* Mon Mar 18 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.17.0-0.7.git3351b1
-- Commit the patch.
-
-* Mon Mar 18 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.17.0-0.6.git3351b1
-- Use plexus to instantiate workspace reader.
-
-* Sun Mar 17 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-0.5.git3351b1
-- Non-bootstrap build.
-
-* Fri Mar 15 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-0.4.git3351b1
-- Update bootstrapped build for 0.17.0-SNAPSHOT to work against 0.16.0.
-- Update to Plexus Compiler 2.2 API.
-
-* Thu Feb 28 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-0.3.git3351b1
-- Update to using Jetty 9 API.
-
-* Mon Feb 25 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-0.2.git3351b1
-- Set the global default execution environment to JavaSE-1.6.
-- Patch clean-up.
-
-* Mon Feb 25 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.17.0-0.1.git3351b1
-- Update to latest upstream.
-- RHBZ#915194 - API changed in maven-surefire
-
-* Wed Feb 6 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-21
-- Non-bootstrap build.
-
-* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 0.16.0-20.2
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Wed Feb 6 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-20.1
-- Change BR/R on maven to maven-local for XMvn support.
-- Build bootstrapped to fix missing Fedora Maven class.
-
-* Thu Jan 24 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-20
-- Use TYCHO_MVN_{LOCAL,RPMBUILD} to determine how maven was called.
-- Update to maven-surefire 2.13.
-
-* Thu Dec 20 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-19
-- Fix upstream Bug 361204.
-
-* Mon Dec 3 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-18
-- Add support for more flexible OSGi bundle paths.
-- Use OSGi Requires instead of package name.
-- Expand Requires to include the Eclipse platform.
-
-* Mon Nov 19 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-17
-- Make additional changes to get Tycho building bootstrapped.
-
-* Mon Nov 5 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-16
-- Add capability to build without depending on Tycho or Eclipse.
-
-* Sat Oct 20 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-15
-- Package org.eclipse.osgi and org.eclipse.jdt.core.
-
-* Fri Oct 19 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-14
-- Update to finalized 0.16.0 Release.
-
-* Wed Oct 17 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-13
-- Build Tycho properly in one RPM build.
-- Update to 0.16.0 Release.
-
-* Thu Oct 11 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-12.d7f885
-- Non-bootstrap build.
-
-* Thu Oct 11 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-11.1.d7f885
-- Remove dependence on eclipse by use of self-bundled equinox launcher.
-
-* Wed Oct 10 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-11.d7f885
-- copy-platform-all should make symlinked jars from %%{_javadir} unique.
-- Non-bootstrap build (reset the %%bootstrap flag properly).
-
-* Mon Oct 8 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0.16.0-10.d7f885
-- Non-bootstrap build.
-
-* Mon Oct 8 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0.16.0-9.1.d7f885
-- Filter out OSGi dependencies.
-
-* Thu Oct 4 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-9.d7f885
-- Non-bootstrap build.
-
-* Thu Oct 4 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-8.1.d7f885
-- Fix Bug in overriding of BREE to JavaSE-1.6.
-
-* Wed Oct 3 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-8.d7f885
-- Non-bootstrap build.
-
-* Wed Oct 3 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-7.1.d7f885
-- Update to latest 0.16.0 SNAPSHOT.
-- First attempts to build without cyclic dependency to JDT.
-
-* Mon Aug 27 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-7.df2c35
-- Non bootstrap-build.
-
-* Mon Aug 27 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-6.1.df2c35
-- Add BR/R on explicit dependency objectweb-asm4.
-- Use consistent whitespace in specfile.
-
-* Fri Aug 24 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-6.df2c35
-- Non-bootstrap build.
-
-* Thu Aug 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-5.1.df2c35
-- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
-- Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
-
-* Wed Aug 15 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-5.df2c35
-- Non-bootstrap build.
-
-* Mon Aug 13 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4.1.df2c35
-- Correctly reference objectweb-asm4 and fix local mode resolution bug.
-- Update spec file to honour new java packaging guidelines.
-
-* Thu Aug 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4.df2c35
-- Non-bootstrap build.
-
-* Thu Aug 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-3.1.df2c35
-- Add tycho.local.keepTarget flag to bypass ignoring environments.
-
-* Thu Aug 9 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0.16.0-3.df2c35
-- Non-bootstrap build.
-
-* Thu Aug 9 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0.16.0-2.1.df2c35
-- Use recommended %%add_maven_depmap.
-
-* Thu Aug 9 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0.16.0-2.df2c35
-- Non-bootstrap build.
-
-* Thu Aug 9 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0.16.0-1.2.df2c35
-- Properly change bootstrap flag.
-- Add some git ignores.
-
-* Thu Aug 9 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0.16.0-1.1.df2c35
-- Install missing tycho-standalone-p2-director.zip.
-
-* Thu Aug 2 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-1.df2c35
-- Update to 0.16.0 SNAPSHOT.
-
-* Tue Jul 31 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-3
-- Non-bootstrap build.
-
-* Tue Jul 31 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-2.1
-- Ignore defined environments in local mode.
-
-* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-2
-- Non-bootstrap build.
-
-* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1.1
-- Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
-
-* Thu Jul 26 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1
-- Update to 0.15.0.
-- Set BREE to at least JavaSE-1.6 for Eclipse feature bundles.
-
-* Wed Jul 25 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-7
-- Non-bootstrap build.
-
-* Mon Jul 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-6
-- Detect OSGi jars using presence of Bundle-SymbolicName entry (BZ #838513).
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.14.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jun 11 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-5
-- Non-bootstrap build.
-
-* Tue May 29 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-4.1
-- Fix Tycho Surfire to run Eclipse test bundles.
-- Implement automatic creation of a system p2 repository.
-- Allow building SWT fragments (BZ #380934).
-
-* Wed May 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-4
-- Non-bootstrap build.
-
-* Thu May 17 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-3.1
-- Set BREE to be at least JavaSE-1.6 for Eclipse OSGi bundles.
-
-* Wed May 16 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-3
-- Non-bootstrap build.
-
-* Wed Apr 25 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-2.1
-- Implement a custom resolver when running in local mode.
-- Use upstream solution for BZ #372395 to fix the build.
-
-* Wed Apr 4 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-2
-- Non-bootstrap build.
-
-* Tue Mar 27 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1.1
-- Add missing tycho-testing-harness to be packaged.
-- Use %%{_eclipse_base} from eclipse-platform.
-
-* Fri Mar 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1
-- Update to 0.14.1 upstream tag.
-- Allow building against maven-surefire 2.12 (instead of 2.10).
-- Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
-
-* Thu Feb 16 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.0-4
-- Non-bootstrap build.
-
-* Tue Feb 14 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.0-3
-- Update to 0.14.0 upstream tag.
-
-* Thu Feb 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.0-2
-- Non-bootstrap build.
-
-* Wed Feb 01 2012 Roland Grunberg <rgrunber(a)redhat.com> - 0.14.0-1
-- Update to 0.14.0.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri May 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.12.0-0.1.a74b1717
-- Update to new version do bootstrap from scratch
-
-* Fri May 6 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0.10.0-3
-- Non-bootstrap build.
-
-* Tue May 3 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.10.0-2
-- Add README and make build more silent
-
-* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.10.0-1
-- First bootstrapped version
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/eclipse-webtools.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-webtools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-webtools.git/commit/?id=a....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit af1afad84bb75ffcfb850738a7cae33cba1d3687
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:21:08 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8a4880b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-/eclipse-webtools-3.6.0.tar.xz
-/eclipselink.runtime-7816e2b523adf5e65ad0c245f13ca4b59ff329f2.tar.bz2
-/*.src.rpm
-/.project
-/eclipse-webtools-3.6.1.tar.xz
-/eclipse-webtools-3.6.2.tar.xz
-/eclipse-webtools-3.6.3.tar.xz
-/eclipse-webtools-3.7.0.tar.xz
-/eclipse-webtools-3.7.1.tar.xz
-/eclipse-webtools-3.8.0.tar.xz
-/eclipse-webtools-3.8.1.tar.xz
-/eclipse-webtools-3.8.2.tar.xz
-/eclipse-webtools-3.9.0.tar.xz
-/eclipse-webtools-3.9.1.tar.xz
-/eclipse-webtools-3.9.2.tar.xz
-/eclipse-webtools-3.9.3RC4.tar.xz
-/eclipse-webtools-3.9.4.tar.xz
-/eclipse-webtools-3.10.0.tar.xz
-/eclipse-webtools-3.11.0.tar.xz
-/eclipse-webtools-3.12.0.tar.xz
-/eclipse-webtools-3.13.0.tar.xz
-/eclipse-webtools-3.14.0.tar.xz
-/eclipse-webtools-3.15.0.tar.xz
-/eclipse-webtools-3.18.0.tar.xz
-/eclipse-webtools-3.19.0.tar.xz
-/eclipse-webtools-3.21.0.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/eclipse-webtools-rm-version-checks-from-xml_core-feature.patch b/eclipse-webtools-rm-version-checks-from-xml_core-feature.patch
deleted file mode 100644
index c966547..0000000
--- a/eclipse-webtools-rm-version-checks-from-xml_core-feature.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- webtools.sourceediting/xml/features/org.eclipse.wst.xml_core.feature/feature.xml.orig 2014-05-11 14:55:50.090590996 +0100
-+++ webtools.sourceediting/xml/features/org.eclipse.wst.xml_core.feature/feature.xml 2014-05-11 14:56:42.236079871 +0100
-@@ -35,28 +35,28 @@
- id="javax.xml"
- download-size="190"
- install-size="190"
-- version="1.3.4.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.xml.resolver"
- download-size="96"
- install-size="96"
-- version="1.2.0.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.xml.serializer"
- download-size="270"
- install-size="270"
-- version="2.7.1.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.xerces"
- download-size="1200"
- install-size="1200"
-- version="2.12.1.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
diff --git a/eclipse-webtools.spec b/eclipse-webtools.spec
deleted file mode 100644
index 55b4677..0000000
--- a/eclipse-webtools.spec
+++ /dev/null
@@ -1,410 +0,0 @@
-Name: eclipse-webtools
-Version: 3.21.0
-Release: 2%{?dist}
-Summary: Eclipse Webtools Projects
-
-License: EPL-1.0 and EPL-2.0
-URL: http://www.eclipse.org/webtools/
-
-# Generate tarball with script:
-# $ sh get-sources.sh
-Source0: %{name}-%{version}.tar.xz
-
-# Remove version checks from
-# webtools.sourceediting/features/org.eclipse.wst.xml_core.feature/feature.xml
-Patch0: %{name}-rm-version-checks-from-xml_core-feature.patch
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildRequires: maven-local
-BuildRequires: tycho
-BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires: eclipse-emf-runtime
-BuildRequires: eclipse-gef
-BuildRequires: eclipse-jdt
-BuildRequires: eclipse-license2
-BuildRequires: eclipse-xsd
-BuildRequires: osgi(org.eclipse.jetty.http)
-BuildRequires: osgi(org.eclipse.jetty.webapp)
-BuildRequires: osgi(osgi.core)
-BuildRequires: xalan-j2
-BuildRequires: xerces-j2
-
-%description
-Eclipse Webtools. This contains sub-packages for different sub-projects
-of Eclipse Webtools project, including Server Tools, SourceEditing Tools,
-Webservices Tools, Java EE Tools, JSF Tools, and Dali (JPA) Tools.
-
-%package common
-Summary: WST Common UI and Faceted Project Framework
-Requires: eclipse-gef >= 3.11.0
-# Obsoletes added in F31 -- retirement of jpa/datatools support
-Obsoletes: %{name}-dali <= 3.16.0-1
-Obsoletes: eclipse-dtp <= 1.14.105-1
-# Obsoletes added in F33 -- retirement of javaee/webservices/jsf support
-Obsoletes: %{name}-javaee <= 3.18.0-2
-
-%description common
-This package includes WST common UI functionality, and faceted projects
-framework. The Faceted Project Framework allows the plugin developer to think
-of projects as composed of units of functionality, otherwise known as facets,
-that can be added and removed by the user.
-
-%package servertools
-Summary: Eclipse Server Tools Framework
-
-%description servertools
-This package includes Server tools framework UI, and adapters for use
-with the WST and JST server tools.
-
-%package sourceediting
-Summary: Eclipse Web Developer, XML, XPath, and XSL Tools
-
-%description sourceediting
-Eclipse Web Developer Tools, including HTML, CSS, XHTML, XML, DTD and XML
-Schema Editors, validators, and XML Catalog support.
-
-%prep
-%setup -q -n %{name}-%{version}
-%patch0
-
-# Find and delete any hidden jar or zip files
-find -name *.class -type f -delete
-find -name *.jar -type f -delete
-find -name *.zip -type f -delete
-
-# Fixup erroneous license info, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=538094
-sed -i -e '/license-feature-version/s/.\..\..\.qualifier/0.0.0/' \
- $(find -name feature.xml)
-
-# Build useless jar that is needed to build but does nothing
-# See http://dev.eclipse.org/mhonarc/lists/wtp-dev/msg08607.html
-# and PERFMSR.README.txt in org.eclipse.perfmsr.core.stub/
-CORE_RUNTIME_JAR=$(ls %{_prefix}/lib/eclipse/plugins/org.eclipse.core.runtime_*)
-pushd webtools.common/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src
- javac -cp $(build-classpath osgi-core):${CORE_RUNTIME_JAR} \
- org/eclipse/perfmsr/core/*.java
- jar cf ../perfmsr.jar org/
-popd
-
-# Disable JPA/JSF/JavaEE features
-%pom_disable_module webtools.dali pom-build-everything.xml
-%pom_disable_module webtools.javaee pom-build-everything.xml
-%pom_disable_module webtools.jsf pom-build-everything.xml
-%pom_disable_module webtools.webservices pom-build-everything.xml
-
-# Disable JSDT features
-%pom_disable_module webtools.jsdt pom-build-everything.xml
-%pom_disable_module org.eclipse.wst.jsdt.web.core webtools.sourceediting/web/bundles
-%pom_disable_module org.eclipse.wst.jsdt.web.support.jsp webtools.sourceediting/web/bundles
-%pom_disable_module org.eclipse.wst.jsdt.web.ui webtools.sourceediting/web/bundles
-%pom_disable_module org.eclipse.wst.web_js_support.feature webtools.sourceediting/web/features
-%pom_disable_module org.eclipse.wst.web_js_support_sdk.feature webtools.sourceediting/web/features
-%pom_disable_module org.eclipse.wst.web_js_support_tests.feature webtools.sourceediting/web/features
-%pom_xpath_remove "includes[@id='org.eclipse.wst.web_js_support.feature']" \
- webtools.sourceediting/web/features/org.eclipse.wst.web_ui.feature/feature.xml
-
-# Disable XSL/XPATH editing features
-%pom_disable_module xsl webtools.sourceediting
-%pom_disable_module xpath webtools.sourceediting
-
-# Disable capabilities because they hide stuff by default
-%pom_disable_module org.eclipse.wtp.javascript.capabilities webtools.sourceediting/web/bundles
-%pom_disable_module org.eclipse.wtp.web.capabilities webtools.sourceediting/web/bundles
-%pom_disable_module org.eclipse.wtp.xml.capabilities webtools.sourceediting/xml/bundles
-
-# Disable building all repositories and tests for now
-%pom_disable_module webtools.releng pom-build-everything.xml
-%pom_disable_module webtools.repositories pom-build-everything.xml
-%pom_disable_module site webtools.common
-%pom_disable_module site webtools.servertools
-%pom_disable_module site webtools.sourceediting
-%pom_disable_module tests webtools.common
-%pom_disable_module org.eclipse.wst.common_tests.feature webtools.common/features
-%pom_disable_module tests webtools.sourceediting/{core,json,web,xml}
-%pom_disable_module org.eclipse.wst.json_tests.feature webtools.sourceediting/json/features
-%pom_disable_module org.eclipse.wst.web_tests.feature webtools.sourceediting/web/features
-%pom_disable_module org.eclipse.wst.xml_tests.feature webtools.sourceediting/xml/features
-%pom_disable_module org.eclipse.wst.web_sdk.feature webtools.sourceediting/web/features
-%pom_disable_module tests/org.eclipse.wst.internet.monitor.core.tests webtools.servertools
-%pom_disable_module tests/org.eclipse.wst.server.core.tests webtools.servertools
-%pom_disable_module tests/org.eclipse.wst.server.http.core.tests webtools.servertools
-%pom_disable_module tests/org.eclipse.wst.server.util.tests webtools.servertools
-%pom_disable_module features/org.eclipse.jst.server_adapters.ext_tests.feature webtools.servertools
-%pom_disable_module features/org.eclipse.jst.server_tests.feature webtools.servertools
-%pom_disable_module features/org.eclipse.wst.server_tests.feature webtools.servertools
-
-# Loosen dep on xerces
-sed -i -e '/org.apache.xerces/s/2\.12\.1/2.11.0/' webtools.sourceediting/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
-sed -i -e '/JavaSE-11/s/JavaSE-11/JavaSE-1.8/' webtools.sourceediting/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF \
- webtools.sourceediting/web/bundles/org.eclipse.wst.{css,html}.{core,ui}/META-INF/MANIFEST.MF \
- webtools.sourceediting/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
-
-# Fix dep on javax.servlet-api
-sed -i -e '/javax.servlet/s/3.1.0,4.0.0/3.1.0,5.0.0/' webtools.servertools/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
-sed -i -e 's/jakarta.servlet/jakarta.servlet-api/' webtools.sourceediting/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF
-
-# Don't use strict project settings, webtools is not ready (fixes 'unnecessary cast' errors and API access errors, etc)
-%pom_xpath_inject "pom:plugin[pom:artifactId = 'tycho-compiler-plugin']/pom:configuration" \
- "<useProjectSettings>false</useProjectSettings>" wtp-parent
-
-# Don't use jgit providers in packaging plugin
-%pom_remove_dep :tycho-buildtimestamp-jgit wtp-parent
-%pom_remove_dep :tycho-sourceref-jgit wtp-parent
-%pom_xpath_remove pom:plugin/pom:configuration/pom:sourceReferences wtp-parent
-%pom_xpath_remove pom:plugin/pom:configuration/pom:timestampProvider wtp-parent
-%pom_xpath_remove pom:plugin/pom:configuration/pom:jgit.ignore wtp-parent
-%pom_xpath_remove pom:plugin/pom:configuration/pom:jgit.dirtyWorkingTree wtp-parent
-
-# Remove pre-built indexes
-for index in $(find -name indexed_docs) ; do
- rm $(dirname $index)/*
- %pom_xpath_remove "plugin/extension[@point='org.eclipse.help.toc']/index" $(dirname $(dirname $index))/plugin.xml
-done
-
-# Don't install poms
-%mvn_package "::pom::" __noinstall
-
-# SDK bits
-%mvn_package ":*sdk{,.feature,.documentation}" __noinstall
-%mvn_package ":*.assembly.feature" __noinstall
-%mvn_package ":*{.api.doc,.doc.api,.doc.isv,.doc.dev}" __noinstall
-%mvn_package ":::sources{,-feature}:" __noinstall
-
-# Common features and plugins
-%mvn_package "org.eclipse.webtools.common:" common
-
-# Server Tools features and plugins
-%mvn_package "org.eclipse.webtools.servertools:" servertools
-
-# Source Editing features and plugins
-%mvn_package "org.eclipse.webtools.sourceediting:" sourceediting
-%mvn_package "org.eclipse.webtools.javaee:" sourceediting
-
-%build
-# Avoid running out of heap on s390x
-export MAVEN_OPTS="-Xmx1024m"
-
-# Qualifier generated from last modification time of source tarball
-QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d%H%M)
-%mvn_build -j -f -- -DforceContextQualifier=$QUALIFIER -f pom-build-everything.xml
-
-%install
-%mvn_install
-
-%files common -f .mfiles-common
-%license webtools.releng/releng.wtpbuilder/rootfiles/epl-2.0.html
-
-%files servertools -f .mfiles-servertools
-
-%files sourceediting -f .mfiles-sourceediting
-
-%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.21.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Mar 11 2021 Mat Booth <mat.booth(a)redhat.com> - 3.21.0-1
-- Update to latest upstream release
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.19.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Nov 6 2020 Mat Booth <mat.booth(a)redhat.com> - 3.19.0-1
-- Update to latest upstream release
-
-* Thu Aug 20 2020 Mat Booth <mat.booth(a)redhat.com> - 3.18.0-5
-- Patch to allow building against JDK 11
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.18.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Mat Booth <mat.booth(a)redhat.com> - 3.18.0-3
-- Remove no longer needed dep on jdom and json-simple and add missing BRs
- on xml deps
-- Drop xsl and xpath features
-- Always use java 1.8 for building due to use of CORBA
-
-* Fri Jul 10 2020 Mat Booth <mat.booth(a)redhat.com> - 3.18.0-2
-- Drop javaee/webservices/jsf plugins
-
-* Wed Jun 24 2020 Mat Booth <mat.booth(a)redhat.com> - 3.18.0-1
-- Update to latest upstream release
-
-* Fri Jan 24 2020 Mat Booth <mat.booth(a)redhat.com> - 3.15.0-4
-- Drop JPA tooling and remove requirement on Datatools
-
-* Mon Dec 09 2019 Mat Booth <mat.booth(a)redhat.com> - 3.15.0-3
-- Fix build against latest jetty version
-
-* Mon Dec 09 2019 Mat Booth <mat.booth(a)redhat.com> - 3.15.0-2
-- Drop JSDT features
-
-* Mon Sep 16 2019 Mat Booth <mat.booth(a)redhat.com> - 3.15.0-1
-- Update to latest upstream release
-
-* Wed Jun 26 2019 Mat Booth <mat.booth(a)redhat.com> - 3.14.0-3
-- Build missing xinclude embedded jar
-
-* Fri Jun 14 2019 Mat Booth <mat.booth(a)redhat.com> - 3.14.0-2
-- Avoid running out of heap on s390x
-
-* Wed Jun 12 2019 Mat Booth <mat.booth(a)redhat.com> - 3.14.0-1
-- Update to latest upstream release
-
-* Tue Jun 11 2019 Mat Booth <mat.booth(a)redhat.com> - 3.13.0-2
-- Avoid using jgit providers from tycho-extras
-
-* Fri Mar 15 2019 Mat Booth <mat.booth(a)redhat.com> - 3.13.0-1
-- Update to 2019-03 release
-- Update license tag
-- Restrict to same architectures as Eclipse itself
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 10 2019 Mat Booth <mat.booth(a)redhat.com> - 3.12.0-1
-- Update to upstream 3.12 release to add support for JPA 2.2
-
-* Mon Nov 19 2018 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-3
-- Rebuild for xerces update
-
-* Tue Sep 25 2018 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-2
-- Fix missing R on commons-discovery
-
-* Tue Sep 25 2018 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-1
-- Update to latest upstream release
-- Amend license tag
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 07 2018 Mat Booth <mat.booth(a)redhat.com> - 3.10.0-1
-- Update to Photon release
-- Drop ancient provides/obsoletes
-- Drop upstreamed patches
-
-* Mon May 21 2018 Mat Booth <mat.booth(a)redhat.com> - 3.10.0-0.2
-- Update to latest Photon snapshot
-
-* Wed May 16 2018 Mat Booth <mat.booth(a)redhat.com> - 3.10.0-0.1
-- Update to Photon snapshot
-
-* Fri Apr 13 2018 Mat Booth <mat.booth(a)redhat.com> - 3.9.4-4
-- Stop shipping deprecated Apache Axis support
-- Merge jsf and javaee sub-packages; there is a dep cycle between
- them so one is always installed with the other anyway
-
-* Tue Apr 10 2018 Mat Booth <mat.booth(a)redhat.com> - 3.9.4-3
-- Minor spec file updates
-
-* Tue Apr 10 2018 Mat Booth <mat.booth(a)redhat.com> - 3.9.4-2
-- Fix source tarball to include missing changes from servertools
-
-* Mon Apr 09 2018 Mat Booth <mat.booth(a)redhat.com> - 3.9.4-1
-- Update to Oxygen.3a release for Java 10 support
-
-* Wed Mar 21 2018 Mat Booth <mat.booth(a)redhat.com> - 3.9.3-1
-- Update to latest Oxygen.3 release
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Dec 18 2017 Mat Booth <mat.booth(a)redhat.com> - 3.9.2-1
-- Update to latest release
-
-* Tue Oct 03 2017 Mat Booth <mat.booth(a)redhat.com> - 3.9.1-1
-- Update to Oxygen.1a release
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.9.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 27 2017 Mat Booth <mat.booth(a)redhat.com> - 3.9.0-1
-- Update to Oxygen final release
-
-* Mon May 08 2017 Mat Booth <mat.booth(a)redhat.com> - 3.8.2-6
-- Fix build against latest tycho and oxygen
-
-* Thu Apr 20 2017 Mat Booth <mat.booth(a)redhat.com> - 3.8.2-5
-- Revised patch for ebz#511793
-
-* Mon Apr 10 2017 Mat Booth <mat.booth(a)redhat.com> - 3.8.2-4
-- Backport patch to fix a thread deadlock ebz#511793
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.8.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 27 2017 Mat Booth <mat.booth(a)redhat.com> - 3.8.2-2
-- Use glassfish servlet api in wst.server.preview.adapter
-
-* Thu Jan 26 2017 Mat Booth <mat.booth(a)redhat.com> - 3.8.2-1
-- Update to latest maintenance version
-
-* Thu Oct 06 2016 Mat Booth <mat.booth(a)redhat.com> - 3.8.1-1
-- Update to latest maintenance release
-- Fix some broken symlinks
-
-* Tue Aug 16 2016 Mat Booth <mat.booth(a)redhat.com> - 3.8.0-2
-- Fix breakpoint inteference with CDT
-
-* Tue Jul 05 2016 Mat Booth <mat.booth(a)redhat.com> - 3.8.0-1
-- Update to tagged version
-- Drop ancient provides/obsoletes
-- Merge some sub-packages to eliminate cyclical deps and simplify
- the packaging a little bit
-- Rationalise BRs and Rs
-
-* Wed Jun 1 2016 Alexander Kurtakov <akurtako(a)redhat.com> 3.8.0-0.1gitb640484
-- Update to Neon pre release.
-
-* Tue Feb 09 2016 Roland Grunberg <rgrunber(a)redhat.com> - 3.7.1-3
-- Update to use proper xmvn provided macros.
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Oct 03 2015 Gerard Ryan <gerard(a)ryan.lt> - 3.7.1-1
-- Update to latest upstream release tag R3_7_1 for Mars.1
-
-* Sun Sep 13 2015 Gerard Ryan <gerard(a)ryan.lt> - 3.7.0-1
-- Update to latest upstream release tag R3_7_0 for Mars
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.6.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Mar 02 2015 Gerard Ryan <gerard(a)ryan.lt> - 3.6.3-2
-- Update to latest upstream release tag R3_6_3
-
-* Sat Jan 24 2015 Gerard Ryan <gerard(a)ryan.lt> - 3.6.2-1
-- Update to latest upstream release tag R3_6_2
-
-* Thu Dec 11 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.6.1-3
-- Remove unneeded BR on feclipse-maven-plugin.
-
-* Tue Nov 18 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.6.1-2
-- Fix typo in webtools-servertools installation.
-
-* Fri Sep 26 2014 Gerard Ryan <gerard(a)ryan.lt> - 3.6.1-1
-- Update to latest upstream release tag R3_6_1
-
-* Fri Aug 22 2014 Mat Booth <mat.booth(a)redhat.com> - 3.6.0-7
-- Prefix qualifier to ensure it is lexographically greater than the
- upstream's update site (prevents unnecessary updates)
-- Make use of build-jar-repository and build-classpath utils
-
-* Tue Aug 12 2014 Gerard Ryan <gerard(a)ryan.lt> - 3.6.0-6
-- Use forceContextQualifier instead of git
-
-* Sat Jul 19 2014 Gerard Ryan <gerard(a)ryan.lt> - 3.6.0-5
-- Add features from webtools.webservices.jaxws
-
-* Sun Jul 06 2014 Gerard Ryan <gerard(a)ryan.lt> - 3.6.0-4
-- Add missing Obsoletes for old sdk packages
-
-* Thu Jul 03 2014 Gerard Ryan <gerard(a)ryan.lt> - 3.6.0-3
-- Add missing BRs
-
-* Tue Jul 01 2014 Gerard Ryan <gerard(a)ryan.lt> - 3.6.0-2
-- Initial RPM
diff --git a/get-sources.sh b/get-sources.sh
deleted file mode 100644
index b107d9c..0000000
--- a/get-sources.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -e
-
-tag=cb62ff752253bdf5180220e7cb4992109568dba3
-version=3.21.0
-
-git clone git://git.eclipse.org/gitroot/webtools/webtools.releng.aggregator.git
-
-pushd webtools.releng.aggregator
-git submodule init
-git pull --recurse-submodules
-git submodule update
-git checkout $tag --recurse-submodules
-
-(cd webtools.common && git checkout e6b288bc99f64e6c2a168d529c6c1a4c6817e934)
-(cd webtools.dali && git checkout R3_19)
-(cd webtools.javaee && git checkout R3_19)
-(cd webtools.jsdt && git checkout R3_19)
-(cd webtools.jsf && git checkout R3_19)
-(cd webtools.releng && git checkout R3_19)
-(cd webtools.servertools && git checkout 807109cd839a2b4bf224e0be32e1f73fc25b6055)
-(cd webtools.sourceediting && git checkout 190e3eb04132155beadd60d31fb769246e41ec64)
-(cd webtools.webservices && git checkout 9ef83acfcb54f7b2e049dd480ff10b446caa9f14)
-
-# Remove pre-built binaries
-find -name *.jar -type f -delete
-find -name *.class -type f -delete
-find -name *.zip -type f -delete
-
-popd
-
-rm -rf eclipse-webtools-$version/
-mkdir eclipse-webtools-$version/
-cp -pr webtools.releng.aggregator/*.xml webtools.releng.aggregator/webtools.* webtools.releng.aggregator/wtp-parent/ eclipse-webtools-$version/
-tar caf eclipse-webtools-$version.tar.xz eclipse-webtools-$version/
diff --git a/sources b/sources
deleted file mode 100644
index 9f5b0d8..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (eclipse-webtools-3.21.0.tar.xz) = 1cbc5c71bf953b04bc4ec2a201ffae9911435ee1b6c1f32a195d74921d38e8a34e4d1acb153525204c47918fa1ca4033c82b4cd9d9d5737b0782cae2308cdd3f
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/eclipse-subclipse.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-subclipse.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-subclipse.git/commit/?id=....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 4632be6087ecc27566b9d584ded557a0eb2db0ba
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:20:44 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fff5263..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/noarch
-/subclipse-*
-/.project
-/adapter-*
-/.build-*.log
-/*.src.rpm
-/4.2.2.tar.gz
-/svnclientadapter-1.9.4.tar.gz
-/svnclientadapter-1.10.0.tar.gz
-/svnclientadapter-1.11.0.tar.gz
-/javahl-windows-1.11.1.tar.gz
-/javahl-windows-1.14.0.tar.gz
-/svnclientadapter-1.14.0.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/eclipse-subclipse.metainfo.xml b/eclipse-subclipse.metainfo.xml
deleted file mode 100644
index b28b3f7..0000000
--- a/eclipse-subclipse.metainfo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Mat Booth <mat.booth(a)redhat.com> -->
-<component type="addon">
- <id>eclipse-subclipse</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>EPL-1.0</project_license>
- <name>Subclipse</name>
- <summary>Support for Subversion within the Eclipse IDE</summary>
- <extends>eclipse.desktop</extends>
- <url type="homepage">http://subclipse.tigris.org/</url>
- <updatecontact>mat.booth(a)redhat.com</updatecontact>
-</component>
-
diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
deleted file mode 100644
index bb8b0ca..0000000
--- a/eclipse-subclipse.spec
+++ /dev/null
@@ -1,497 +0,0 @@
-# Conditionally build svnkit/javahl support; we build javahl support by default becuase it's rock solid
-# Otherwise fallback to svnkit where subversion is not present or not new enough
-%bcond_without javahl
-
-Name: eclipse-subclipse
-Version: 4.3.3
-Release: 3%{?dist}
-Summary: Subversion Eclipse plugin
-
-# The svnclientadaptor layer is Apache licensed
-# The actual Subclipse plugins are Eclipse licensed
-License: EPL-1.0 and ASL 2.0
-URL: https://github.com/subclipse/subclipse/wiki
-
-%global svnclientadapter_version 1.14.0
-%global javahl_version 1.14.0
-%global svnkit_version 1:1.8.12
-
-%global subclipse_tag %{version}
-%global svnclientadapter_tag fd5bd3587c578ef76df75d8021424b4c1306459c
-%global javahl_tag %{javahl_version}
-
-Source0: https://github.com/subclipse/subclipse/archive/%{subclipse_tag}/subclipse...
-# Upstream moved the svnclientadapter into a separate repo which could be packaged separately if needed
-Source1: https://github.com/subclipse/svnclientadapter/archive/%{svnclientadapter_...
-# Upstream moved the javahl fragments into a separate repo which could be packaged separately if needed
-Source2: https://github.com/subclipse/javahl-windows/archive/%{javahl_tag}/javahl-...
-
-Source3: eclipse-subclipse.metainfo.xml
-
-# Allow building against Fedora's svnkit
-# TODO fix this properly when deps are properly OSGified
-Patch1: svnkit.patch
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildRequires: tycho
-BuildRequires: tycho-extras
-BuildRequires: maven-install-plugin
-BuildRequires: eclipse-gef
-BuildRequires: libappstream-glib
-%if %{with javahl}
-BuildRequires: subversion-javahl >= 1.12.0
-Requires: subversion-javahl >= 1.12.0
-%endif
-BuildRequires: svnkit-javahl >= %{svnkit_version}
-Requires: svnkit-javahl >= %{svnkit_version}
-
-%description
-Subclipse is an Eclipse plugin that adds Subversion integration to the Eclipse
-IDE.
-
-%prep
-%setup -q -n subclipse-%{subclipse_tag} -a 1
-%patch1
-
-# Fix pom xml declarations
-# PR sent upstream here: https://github.com/subclipse/subclipse/pull/138
-sed -i -e 's/4\.2\.0/4.0.0/g' {.,features,bundles}/pom.xml
-
-cp -p svnclientadapter-%{svnclientadapter_tag}/LICENSE.md LICENSE-apache.md
-
-# Insert Javahl features/bundles into build
-tar xf %{SOURCE2} --strip-components=1 javahl-windows-%{javahl_version}/{releng/javahl.configuration,features/feature.javahl,bundles/svnapi.javahl}
-%pom_xpath_inject "pom:modules" "<module>feature.javahl</module>" features
-%pom_xpath_inject "pom:modules" "<module>svnapi.javahl</module>" bundles
-%pom_xpath_remove "feature/plugin[@os='win32']" features/feature.javahl/feature.xml
-
-# Delete pre-built artifacts
-find -name '*.jar' -delete
-
-# Don't need to build update site
-%pom_disable_module releng
-
-# Dont't ship source jars
-%pom_remove_plugin :maven-source-plugin svnclientadapter*
-
-%if %{without javahl}
-# Don't build javahl
-%pom_disable_module feature.javahl features
-%pom_disable_module svnapi.javahl bundles
-%pom_change_dep "org.apache.subversion:javahl" "org.tmatesoft.svnkit:svnkit-javahl16" svnclientadapter-%{svnclientadapter_tag}/javahl
-%endif
-
-# Must be dir-shaped bundles so we can symlink system versions of libs
-for b in bundles/svnapi.* ; do
- echo "Eclipse-BundleShape: dir" >> $b/META-INF/MANIFEST.MF
- sed -i -e 's/-1\.[0-9]\+\.[0-9]\+\.jar/.jar/' $b/META-INF/MANIFEST.MF $b/build.properties
-done
-
-# Don't build mylyn features because mylyn is not shipped in Fedora
-%pom_disable_module feature.mylyn features
-%pom_disable_module subclipse.mylyn bundles
-
-%pom_remove_plugin ":tycho-compiler-plugin" releng/subclipse.configuration
-
-pushd svnclientadapter-%{svnclientadapter_tag}
-%pom_remove_plugin ":bnd-maven-plugin" base cmdline javahl svnkit
-%pom_remove_plugin ":maven-jar-plugin" base cmdline javahl svnkit
-popd
-
-# Don't install poms
-%mvn_package "::pom::" __noinstall
-
-%build
-pushd svnclientadapter-%{svnclientadapter_tag}
-# TODO: Make subversion-javahl package install a pom file
-%if %{with javahl}
-xmvn -B -o install:install-file -Dfile=$(build-classpath svn-javahl) -Dpackaging=jar \
- -DgroupId=org.apache.subversion -DartifactId=javahl -Dversion=%{svnclientadapter_version}
-%endif
-
-%mvn_build -j
-popd
-
-cp -p $(find svnclientadapter-%{svnclientadapter_tag} -name adapter-base*.jar) bundles/svnapi.core/lib/adapter-base.jar
-%if %{with javahl}
-# JavaHL libs
-cp -p $(find svnclientadapter-%{svnclientadapter_tag} -name adapter-javahl*.jar) bundles/svnapi.javahl/lib/adapter-javahl.jar
-ln -s $(build-classpath svn-javahl) bundles/svnapi.javahl/lib/javahl.jar
-%endif
-# SVNKit libs
-cp -p $(find svnclientadapter-%{svnclientadapter_tag} -name adapter-svnkit*.jar) bundles/svnapi.svnkit/lib/adapter-svnkit.jar
-cp -p $(find svnclientadapter-%{svnclientadapter_tag} -name adapter-javahl*.jar) bundles/svnapi.svnkit/lib/adapter-javahl.jar
-for j in \
- svnkit/svnkit svnkit/svnkit-javahl16 \
- sqljet antlr32/antlr-runtime-3.2 sequence-library trilead-ssh2 \
- jsch-agent-proxy/jsch.agentproxy.connector-factory \
- jsch-agent-proxy/jsch.agentproxy.core \
- jsch-agent-proxy/jsch.agentproxy.pageant \
- jsch-agent-proxy/jsch.agentproxy.sshagent \
- jsch-agent-proxy/jsch.agentproxy.svnkit-trilead-ssh2 \
- jsch-agent-proxy/jsch.agentproxy.usocket-jna \
- jsch-agent-proxy/jsch.agentproxy.usocket-nc \
- jna/jna jna/jna-platform ; do
- ln -s $(build-classpath $j) bundles/svnapi.svnkit/lib/$(basename $j).jar
- sed -i -e "/Bundle-ClassPath/s/: /: lib\/$(basename $j).jar,/" bundles/svnapi.svnkit/META-INF/MANIFEST.MF
-done
-
-# Qualifier generated from last modification time of source tarball
-QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +%Y%m%d%H%M)
-%mvn_build -j -- -DforceContextQualifier=$QUALIFIER -Dmaven.compiler.target=11 -Dmaven.compiler.source=11
-
-%install
-%mvn_install
-
-droplet=%{buildroot}%{_datadir}/eclipse/droplets/subclipse
-
-# Replace jar with link to system libraries
-%if %{with javahl}
-# JavaHL libs
-pushd $droplet/plugins/org.tigris.subversion.clientadapter.javahl_*
-rm lib/javahl.jar
-ln -s $(build-classpath svn-javahl) lib/javahl.jar
-popd
-%endif
-# SVNKit libs
-pushd $droplet/plugins/org.tigris.subversion.clientadapter.svnkit_*
-for j in \
- svnkit/svnkit svnkit/svnkit-javahl16 \
- sqljet antlr32/antlr-runtime-3.2 sequence-library trilead-ssh2 \
- jsch-agent-proxy/jsch.agentproxy.connector-factory \
- jsch-agent-proxy/jsch.agentproxy.core \
- jsch-agent-proxy/jsch.agentproxy.pageant \
- jsch-agent-proxy/jsch.agentproxy.sshagent \
- jsch-agent-proxy/jsch.agentproxy.svnkit-trilead-ssh2 \
- jsch-agent-proxy/jsch.agentproxy.usocket-jna \
- jsch-agent-proxy/jsch.agentproxy.usocket-nc \
- jna/jna jna/jna-platform ; do
- rm lib/$(basename $j).jar
- ln -s $(build-classpath $j) lib/$(basename $j).jar
-done
-popd
-
-# Install appdata
-install -m644 -D %{SOURCE3} %{buildroot}%{_datadir}/appdata/eclipse-subclipse.metainfo.xml
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/eclipse-subclipse.metainfo.xml
-
-%files -f .mfiles
-%doc CHANGELOG.md README.md
-%license LICENSE.md LICENSE-apache.md
-%{_datadir}/appdata/eclipse-subclipse.metainfo.xml
-
-%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sun Jan 17 2021 Alexander Kurtakov <akurtako(a)redhat.com> 4.3.3-1
-- Update to latest upstream release
-
-* Wed Aug 26 2020 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-8
-- Actual minimum supported native JavaHL version is 1.12
-
-* Wed Aug 26 2020 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-7
-- Update JavaHL support bundles to 1.14
-
-* Mon Aug 17 2020 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-6
-- Clarify licensing and install copy of the Apache license
-
-* Mon Aug 17 2020 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-5
-- Update project URL
-
-* Tue May 05 2020 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-4
-- Drop dependency on mylyn
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Mar 19 2019 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-1
-- Update to final 4.3.0 release
-
-* Fri Mar 15 2019 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-0.3.git43b895a
-- Restrict to same architectures as Eclipse itself
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.0-0.2.git43b895a
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Oct 22 2018 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-0.1
-- Update to latest upstream snapshot for SVN 1.10 support
-- Update license tag
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed May 09 2018 Mat Booth <mat.booth(a)redhat.com> - 4.2.3-4
-- Fix reference to droplets directory tree
-
-* Wed Mar 21 2018 Mat Booth <mat.booth(a)redhat.com> - 4.2.3-3
-- Enable conditional build support for svn backends
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Nov 24 2017 Mat Booth <mat.booth(a)redhat.com> - 4.2.3-1
-- Update to latest upstream release
-- Add patch to fix "unable to auto-share" error, rhbz#1380666
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue May 30 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.2-3
-- Add missing build-requires on maven-install-plugin
-- Run xmvn in batch mode
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Jan 21 2017 Mat Booth <mat.booth(a)redhat.com> - 4.2.2-1
-- Update to latest upstream release
-- Project moved to github and absorbed the merge client plugin
-- Obsolete/Provide the collabnet-merge package
-
-* Wed Apr 20 2016 Mat Booth <mat.booth(a)redhat.com> - 1.10.11-3
-- Build/install with tycho/xmvn
-
-* Wed Mar 09 2016 Mat Booth <mat.booth(a)redhat.com> - 1.10.11-2
-- Add appdata add-on metadata
-
-* Wed Mar 09 2016 Mat Booth <mat.booth(a)redhat.com> - 1.10.11-1
-- Update to latest upstream release
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.10.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Oct 29 2015 Mat Booth <mat.booth(a)redhat.com> - 1.10.10-1
-- Update to 1.10.10 with Subversion 1.9 support
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.10.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Mar 03 2015 Mat Booth <mat.booth(a)redhat.com> - 1.10.9-1
-- Update to latest upstream release
-
-* Thu Jan 15 2015 Alexander Kurtakov <akurtako(a)redhat.com> 1.10.5-2
-- Adapt pde-build.sh call to gef path change.
-
-* Fri Jul 18 2014 Mat Booth <mat.booth(a)redhat.com> - 1.10.5-1
-- Update to latest upstream release
-- Drop ancient obsoletes on subclipse-book, drop unnecessary BRs
-- Fix bogus dates in changelog
-- Install license files as %%doc
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.10.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Oct 1 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1.10.2-2
-- Fix the javahl version.
-
-* Tue Oct 1 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1.10.2-1
-- Update to 1.10.2.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.10.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jun 19 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1.10.0-2
-- Upload sources.
-
-* Wed Jun 19 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1.10.0-1
-- Update to 1.10.0.
-
-* Wed Jun 19 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1.8.21-1
-- Update to 1.8.21.
-
-* Fri May 3 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1.8.20-1
-- Update to latest upstream release.
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Oct 11 2012 Sami Wagiaalla <swagiaal(a)redhat.com> 1.8.16-1
-- Update to release 1.8.16.
-
-* Wed Aug 8 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1.8.13-2
-- Get rid off eclipse-svnkit dependency.
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jul 13 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1.8.13-1
-- Update to latest upstream release.
-
-* Thu May 3 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1.8.9-2
-- Bug 818472 - Bump javahl BR/R.
-
-* Wed May 2 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1.8.9-1
-- Update to latest upstream release.
-
-* Wed Feb 29 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.8.5-1
-- Update to latest upstream release.
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Jul 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.18-1
-- Update to 1.6.18.
-
-* Fri Feb 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.17-1
-- Update to 1.6.17.
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Dec 14 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.16-1
-- Update to 1.6.16.
-
-* Tue Nov 9 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.15-1
-- Update to 1.6.15.
-
-* Tue Jul 13 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.12-1
-- Update to 1.6.12.
-
-* Thu Mar 11 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.10-1
-- Update to 1.6.10.
-
-* Tue Feb 23 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.8-1
-- Update to upstream 1.6.8.
-
-* Fri Feb 19 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.7-1
-- Update to upstream 1.6.7.
-
-* Thu Feb 4 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.6-1
-- Update to upstream 1.6.6.
-
-* Sun Nov 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.5-3
-- Fix typo.
-
-* Sun Nov 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.5-2
-- Do not pass non-existing folders to pdebuild -o.
-- Switch to using %%global instead of %%define.
-
-* Tue Aug 18 2009 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.5-1
-- Update to upstream 1.6.5.
-
-* Mon Aug 10 2009 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.4-1
-- Update to upstream 1.6.4.
-
-* Mon Jul 27 2009 Alexander Kurtakov <akurtako(a)redhat.com> 1.6.2-1
-- Update to upstream 1.6.2.
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun Apr 26 2009 Robert Marcano <robert(a)marcanoonline.com> 1.6.0-1
-- Update to upstream 1.6.0
-
-* Mon Mar 23 2009 Alexander Kurtakov <akurtako(a)redhat.com> 1.4.7-4
-- Rebuild to not ship p2 context.xml.
-
-* Tue Feb 24 2009 Robert Marcano <robert(a)marcanoonline.com> 1.4.7-3
-- Update to upstream 1.4.7
-- eclipse-subclipse-book is obsoleted, not provided upstream
-- New eclipse-subclipse-graph subpackage
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.4-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Oct 13 2008 Alexander Kurtakov <akurtako(a)redhat.com> - 1.2.4-12
-- Bump revision.
-
-* Mon Oct 13 2008 Alexander Kurtakov <akurtako(a)redhat.com> - 1.2.4-11
-- Fix build with eclipse 3.4.
-- Rediff plugin-classpath.patch.
-
-* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.2.4-10
-- Fix Patch0:/%%patch mismatch.
-
-* Fri Apr 04 2008 Robert Marcano <robert(a)marcanoonline.com> 1.2.4-9
-- Fix Bug 440818: changed links to svn-javahl.jar
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.2.4-7
-- Autorebuild for GCC 4.3
-
-* Mon Nov 12 2007 Robert Marcano <robert(a)marcanoonline.com> 1.2.4-6
-- Build for all supported arquitectures
-
-* Fri Oct 19 2007 Robert Marcano <robert(a)marcanoonline.com> 1.2.4-3
-- Disable ppc64 build for f8, see Bug #298071
-
-* Wed Sep 19 2007 Robert Marcano <robert(a)marcanoonline.com> 1.2.4-2
-- Fix wrong applied classpath patch, fixing error: An error occurred while
-automatically activating bundle org.tigris.subversion.subclipse.core
-
-* Mon Sep 10 2007 Robert Marcano <robert(a)marcanoonline.com> 1.2.4-1
-- Update to upstream 1.2.4
-- Build for all supported arquitectures
-
-* Sun Sep 09 2007 Robert Marcano <robert(a)marcanoonline.com> 1.2.2-6
-- Change MANIFEST.MF patch to be applied on prep stage
-
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
-- Rebuild for selinux ppc32 issue.
-
-* Wed Jun 20 2007 Robert Marcano <robert(a)marcanoonline.com> 1.2.2-2
-- Update to upstream 1.2.2
-- Dependency changed from javasvn to svnkit
-- Patch to support EPEL5 sent by Rob Myers
-
-* Thu Dec 21 2006 Robert Marcano <robert(a)marcanoonline.com> 1.1.9-2
-- Update to upstream 1.1.9
-- Removed patch that added source attribute to the javac ant task
-- Using the "eclipse" launcher
-
-* Wed Nov 08 2006 Robert Marcano <robert(a)marcanoonline.com> 1.1.8-2
-- Update to upstream 1.1.8
-
-* Mon Aug 28 2006 Robert Marcano <robert(a)marcanoonline.com> 1.1.5-2
-- Rebuild
-
-* Mon Aug 21 2006 Robert Marcano <robert(a)marcanoonline.com> 1.1.5-1
-- Update to upstream 1.1.5
-- svnClientAdapter documentation files added. Subclipse includes an eclipse
- based documentation for the plugins
-
-* Sun Aug 06 2006 Robert Marcano <robert(a)marcanoonline.com> 1.1.4-1
-- Update to upstream 1.1.4
-- License changed to EPL
-- svnClientAdapter-1.1.4-javac-target.patch added fix to svnClientAdapter ant
- script
-
-* Tue Jul 04 2006 Andrew Overholt <overholt(a)redhat.com> 1.0.3-2
-- Use versionless pde.build.
-- Remove strict SDK version requirement due to above.
-
-* Sun Jul 02 2006 Robert Marcano <robert(a)marcanoonline.com> 1.0.3-2
-- Embeeding the script that fetch the source code
-
-* Sun Jun 25 2006 Robert Marcano <robert(a)marcanoonline.com> 1.0.3-1
-- Update to 1.0.3
-- Dependency name changed to ganymed-ssh2
-
-* Sun Jun 11 2006 Robert Marcano <robert(a)marcanoonline.com> 1.0.1-6
-- rpmlint fixes and debuginfo generation workaround
-
-* Thu Jun 01 2006 Robert Marcano <robert(a)marcanoonline.com> 1.0.1-5
-- Use package-build from eclipse SDK
-
-* Sun May 28 2006 Robert Marcano <robert(a)marcanoonline.com> 1.0.1-4
-- Integrated svnClientAdapter inside this package
-
-* Tue May 23 2006 Ben Konrath <bkonrath(a)redhat.com> 1.0.1-3
-- Rename package to eclipse-subclipse.
-- Use copy-platform script for now.
-
-* Sun May 07 2006 Robert Marcano <robert(a)marcanoonline.com> 1.0.1-2
-- use external libraries from dependent packages
-
-* Wed Apr 26 2006 Ben Konrath <bkonrath(a)redhat.com> 1.0.1-1
-- initial version based on the work of Robert Marcano
diff --git a/sources b/sources
deleted file mode 100644
index 624c010..0000000
--- a/sources
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA512 (javahl-windows-1.14.0.tar.gz) = c93a7d9d1b6230b2add27cbaea3510d2f08cdf8a0f440cb281a49aa670eb6a6d02088332c58d5f9abf8ce480ed0d14f760de5e80d69e98cfe529e2ca3b5b8a33
-SHA512 (subclipse-4.3.3.tar.gz) = 2b6b6a8099e23a13280ac0f7aa8049ffacfe5e6d72e95985bdb408b81727a5d00e611aeee035b9e767bc8b05fb7b948304098a1e5546704e83e05c7c01248efd
-SHA512 (svnclientadapter-1.14.0.tar.gz) = 5dc10dd9d98a17620f4cdf337c9f0f2c2db697c25ff5ef48ca8f1e70658c5c3026ced0ff76d9982d7a7f12042c391810fffcd540405e1f7ae884f9da907d62a9
diff --git a/svnkit.patch b/svnkit.patch
deleted file mode 100644
index 12ef5b8..0000000
--- a/svnkit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./bundles/svnapi.svnkit/META-INF/MANIFEST.MF.orig 2018-04-11 21:08:59.043196718 +0100
-+++ ./bundles/svnapi.svnkit/META-INF/MANIFEST.MF 2018-04-11 21:16:55.834067117 +0100
-@@ -6,8 +6,7 @@
- Bundle-Activator: org.tigris.subversion.clientadapter.svnkit.Activator
- Bundle-Vendor: Subclipse
- Require-Bundle: org.eclipse.core.runtime,
-- org.tigris.subversion.clientadapter;bundle-version="[1.9.4,1.11.0)",
-- org.tmatesoft.svnkit;bundle-version="[1.8.0,2.0.0)"
-+ org.tigris.subversion.clientadapter;bundle-version="[1.9.4,1.11.0)"
- Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-ClassPath: lib/adapter-javahl-1.9.4.jar,
---- features/feature.svnkit/feature.xml.orig 2018-04-11 21:20:27.581253391 +0100
-+++ features/feature.svnkit/feature.xml 2018-04-11 21:20:39.300208416 +0100
-@@ -21,7 +21,6 @@
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.tigris.subversion.clientadapter"/>
-- <import plugin="org.tmatesoft.svnkit" version="1.8.0" match="compatible"/>
- </requires>
-
- <plugin
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/eclipse-m2e-workspace.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-m2e-workspace.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-m2e-workspace.git/commit/....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 41cb4318eda8550988615b01fde213b5d0d17c6d
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:20:21 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 21ee3ab..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/m2e-workspace-0.2.0.tar.bz2
-/epl-v10.html
-/m2e-workspace-0.4.0.tar.bz2
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/eclipse-m2e-workspace.spec b/eclipse-m2e-workspace.spec
deleted file mode 100644
index 1ee270e..0000000
--- a/eclipse-m2e-workspace.spec
+++ /dev/null
@@ -1,149 +0,0 @@
-%global short_name m2e-workspace
-
-Name: eclipse-m2e-workspace
-Version: 0.4.0
-Release: 18%{?dist}
-Summary: M2E CLI workspace resolver
-License: EPL-1.0
-URL: https://www.eclipse.org/m2e/
-BuildArch: noarch
-
-Source0: http://git.eclipse.org/c/m2e/org.eclipse.m2e.workspace.git/snapshot/%{sho...
-Source1: http://www.eclipse.org/legal/epl-v10.html
-
-Patch0: takari.patch
-
-BuildRequires: maven-local
-BuildRequires: mvn(javax.inject:javax.inject)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven:maven-core)
-BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires: mvn(org.eclipse.aether:aether-api)
-BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-%description
-Workspace dependency resolver implementation for Maven command line
-build.
-
-%package javadoc
-Summary: API documentation for %{name}
-
-%description javadoc
-This package provides %{summary}.
-
-
-%prep
-%setup -q -n %{short_name}-%{version}
-
-%patch0 -p1
-
-cp -a %{SOURCE1} .
-pushd org.eclipse.m2e.workspace.cli
-# Remove support for Maven 3.0.x (requires Sonatype Aether, which is
-# not available in Fedora)
-%pom_remove_dep org.sonatype.aether
-rm src/main/java/org/eclipse/m2e/workspace/internal/Maven30WorkspaceReader.java
-
-# Avoid deps on takari stack and build like a normal bundle
-%pom_remove_plugin io.takari.maven.plugins:takari-lifecycle-plugin
-%pom_xpath_set pom:project/pom:packaging bundle
-%pom_add_plugin :maven-compiler-plugin '
-<configuration>
-<source>1.7</source>
-<target>1.7</target>
-</configuration>'
-%pom_add_plugin org.eclipse.sisu:sisu-maven-plugin '
- <executions>
- <execution>
- <id>generate-index</id>
- <goals>
- <goal>main-index</goal><goal>test-index</goal>
- </goals>
- </execution>
- </executions>'
-sed -i -e '/>maven-bundle-plugin</i<extensions>true</extensions>' \
- -e '/<supportedProjectTypes/,+2d' \
- -e '/Export-Package/a<Include-Resource>META-INF/sisu/javax.inject.Named=${project.build.outputDirectory}/META-INF/sisu/javax.inject.Named,{maven-resources}</Include-Resource>' pom.xml
-popd
-
-%build
-pushd org.eclipse.m2e.workspace.cli
-%mvn_build
-popd
-
-%install
-pushd org.eclipse.m2e.workspace.cli
-%mvn_install
-popd
-
-%files -f org.eclipse.m2e.workspace.cli/.mfiles
-%license epl-v10.html
-
-%files javadoc -f org.eclipse.m2e.workspace.cli/.mfiles-javadoc
-%license epl-v10.html
-
-
-%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek(a)redhat.com> - 0.4.0-15
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Dec 20 2019 Mat Booth <mat.booth(a)redhat.com> - 0.4.0-13
-- Always avoid takari stack, even when not bootstrapping
-
-* Mon Sep 23 2019 Mat Booth <mat.booth(a)redhat.com> - 0.4.0-12
-- Restrict arches to same as Eclipse itself
-
-* Tue Apr 23 2019 Mat Booth <mat.booth(a)redhat.com> - 0.4.0-11
-- Add a bootstrap mode to break circular deps
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Aug 22 2018 Mat Booth <mat.booth(a)redhat.com> - 0.4.0-9
-- License update
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jul 19 2016 Michael Simacek <msimacek(a)redhat.com> - 0.4.0-4
-- Regenerate buildrequires
-
-* Fri Feb 19 2016 Michael Simacek <msimacek(a)redhat.com> - 0.4.0-3
-- Fix FTBFS
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Oct 14 2015 Sopot Cela <scela(a)redhat.com>- 0.4.0-1
-- Upgrade to 0.4.0 for Mars. 1 release
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Mar 06 2015 Michael Simacek <msimacek(a)redhat.com> - 0.2.0-1
-- Initial packaging
diff --git a/epl-v10.html b/epl-v10.html
deleted file mode 100644
index 3998fce..0000000
--- a/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
- body {
- size: 8.5in 11.0in;
- margin: 0.25in 0.5in 0.25in 0.5in;
- tab-interval: 0.5in;
- }
- p {
- margin-left: auto;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- }
- p.list {
- margin-left: 0.5in;
- margin-top: 0.05em;
- margin-bottom: 0.05em;
- }
- </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/sources b/sources
deleted file mode 100644
index 6304a6b..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-c8e20638e15a256a1fca543571b9f317 m2e-workspace-0.4.0.tar.bz2
diff --git a/takari.patch b/takari.patch
deleted file mode 100644
index aaa3546..0000000
--- a/takari.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 2ac12b65d89eff4cd60261762793e5cd50398767
-Author: Sopot Cela <scela(a)redhat.com>
-Date: Wed Oct 14 13:37:12 2015 +0200
-
- proc tweak for takari
-
-diff --git a/org.eclipse.m2e.workspace.cli/pom.xml b/org.eclipse.m2e.workspace.cli/pom.xml
-index 94d9593..e013ae3 100644
---- a/org.eclipse.m2e.workspace.cli/pom.xml
-+++ b/org.eclipse.m2e.workspace.cli/pom.xml
-@@ -119,6 +119,7 @@
- <extensions>true</extensions>
- <version>1.11.4</version>
- <configuration>
-+ <proc>none</proc>
- <compilerId>jdt</compilerId>
- <source>1.7</source>
- <archive>
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/eclipse-license.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-license.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-license.git/commit/?id=60....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 60af6b4fe640b83bdf5fc6ae7fce484324aa5679
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:19:59 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 4829832..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/.build-*
-/noarch
-/org.eclipse.license-license-*.tar.bz2
-/org.eclipse.license-license-*/
-/.project
-/*.src.rpm
-
-/org.eclipse.license-57a2c5aac0e8cb3a0bfbb4468826e5c2a45d5029.tar.bz2
-/org.eclipse.license-e80ffa9b3652eb2534d92a9b8729bc70ed0b4d06.tar.xz
-/org.eclipse.license-license-1.0.1.v20140414-1359.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/eclipse-license.spec b/eclipse-license.spec
deleted file mode 100644
index 0192fc6..0000000
--- a/eclipse-license.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-# We need to ship both versions of the EPL
-# Some plug-ins are moving to EPL 2, but some plug-ins might stay with EPL 1
-%global eplv2_ver 2.0.2
-%global eplv2_tag org.eclipse.license-e80ffa9b3652eb2534d92a9b8729bc70ed0b4d06
-%global eplv1_ver 1.0.1
-%global eplv1_tag org.eclipse.license-license-%{eplv1_ver}.v20140414-1359
-
-Name: eclipse-license
-Version: %{eplv2_ver}
-Release: 4%{?dist}
-Summary: Shared license features for Eclipse
-License: EPL-1.0 and EPL-2.0
-URL: https://wiki.eclipse.org/CBI
-Source1: https://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv1_ta...
-Source2: https://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv2_ta...
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildRequires: tycho
-
-%description
-Shared license features for Eclipse. Other features may consume these
-features to avoid unnecessary duplication of license boiler plate.
-
-%package -n %{name}1
-Version: %{eplv1_ver}
-Release: 14%{?dist}
-Summary: Shared EPL v1.0 license feature for Eclipse
-License: EPL-1.0
-
-%description -n %{name}1
-Shared license feature for Eclipse. Other features may consume this
-feature to avoid unnecessary duplication of license boiler plate.
-
-%package -n %{name}2
-Version: %{eplv2_ver}
-Summary: Shared EPL v2.0 license feature for Eclipse
-License: EPL-2.0
-
-%description -n %{name}2
-Shared license feature for Eclipse. Other features may consume this
-feature to avoid unnecessary duplication of license boiler plate.
-
-%prep
-%setup -q -c -T
-
-tar xf %{SOURCE1}
-tar xf %{SOURCE2}
-
-%pom_remove_plugin ":tycho-packaging-plugin" */pom.xml
-
-%build
-pushd %{eplv1_tag}
-%mvn_build -j
-popd
-
-pushd %{eplv2_tag}
-sed -i -e 's/\(-SNAPSHOT\|\.qualifier\)/.v20181016-2210/' pom.xml */*.xml
-%mvn_build -j
-popd
-
-%install
-pushd %{eplv1_tag}
-%mvn_package "::pom::" __noinstall
-%mvn_package ":" 1
-%mvn_install
-popd
-
-# Remove exploded tycho external bundles zipfile in case we are operating
-# in bootstrap mode
-rm -rf /tmp/tycho-bundles-external*
-
-pushd %{eplv2_tag}
-%mvn_package "::pom::" __noinstall
-%mvn_package ":" 2
-%mvn_install
-popd
-
-%files -n %{name}1 -f %{eplv1_tag}/.mfiles-1
-%license %{eplv1_tag}/org.eclipse.license/*.html
-
-%files -n %{name}2 -f %{eplv2_tag}/.mfiles-2
-%license %{eplv2_tag}/org.eclipse.license/*.html
-
-%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Nov 13 2020 Mat Booth <mat.booth(a)redhat.com> - 2.0.2-2
-- Fix release tag in license1 subpackage
-
-* Fri Oct 30 2020 Mat Booth <mat.booth(a)redhat.com> - 2.0.2-1
-- Update to latest upstream release
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Mar 13 2019 Mat Booth <mat.booth(a)redhat.com> - 2.0.1-7
-- Restrict to same architectures as Eclipse itself
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Aug 16 2018 Mat Booth <mat.booth(a)redhat.com> - 2.0.1-5
-- Allow building when tycho is bootstrapped
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 05 2018 Mat Booth <mat.booth(a)redhat.com> - 2.0.1-3
-- Use actual release tag
-
-* Mon Jun 11 2018 Mat Booth <mat.booth(a)redhat.com> - 2.0.1-2
-- Avoid reliance on tycho-extras
-
-* Wed May 30 2018 Mat Booth <mat.booth(a)redhat.com> - 2.0.1-1
-- Ship both EPL v1.0 and EPL v2.0 features
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Aug 25 2015 Mat Booth <mat.booth(a)redhat.com> - 1.0.1-8
-- No need to package pom file
-
-* Tue Jun 30 2015 Mat Booth <mat.booth(a)redhat.com> - 1.0.1-7
-- BR on eclipse-filesystem
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Aug 26 2014 Mat Booth <mat.booth(a)redhat.com> - 1.0.1-5
-- Build/install with xmvn
-- Require eclipse-filesystem
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri May 09 2014 Mat Booth <mat.booth(a)redhat.com> - 1.0.1-3
-- Update to latest upstream.
-
-* Thu Mar 13 2014 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-2
-- Use Xmvn.
-
-* Thu Mar 13 2014 Mat Booth <mat.booth(a)redhat.com> - 1.0.0-1
-- Initial version of license shared feature.
-
diff --git a/sources b/sources
deleted file mode 100644
index 766fa53..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA512 (org.eclipse.license-e80ffa9b3652eb2534d92a9b8729bc70ed0b4d06.tar.xz) = 777823c8923fde365641bbae39498e9fa56f29a4cf8e9f1e4ef61018a72bfb31e27d2c54736399f0385e015f6db8f5bac64027cceda50cb57184215554fe600d
-SHA512 (org.eclipse.license-license-1.0.1.v20140414-1359.tar.xz) = ca6aed167025841f2af56efbcdfffa69556aa1a2391e4d028c927aa2a3c7784dcc807252a62352b0da0b6f641f6c8fd4fe94472b0b4332dd9a1efba099a78266
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/eclipse-jgit.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-jgit.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-jgit.git/commit/?id=2f43d....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 2f43dd990ec86a6f8bfaac2a11cad8e3dfde2b24
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:19:35 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ededfbc..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/jgit-*.tar.xz
-/jgit-*.tar.gz
-/jgit-*/
-/results_eclipse-jgit
-/noarch
-/*.src.rpm
-/.build-*.log
-/.project
diff --git a/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch b/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch
deleted file mode 100644
index 7120ace..0000000
--- a/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 55bae4b1398715c987537b0957c08c8616ea8b61 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Fri, 7 Dec 2018 10:04:44 +0000
-Subject: [PATCH 1/2] Ensure the correct classpath is set for the jgit command
- line tool
-
----
- org.eclipse.jgit.pgm/jgit.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh
-index a369220..2dd26aa 100644
---- a/org.eclipse.jgit.pgm/jgit.sh
-+++ b/org.eclipse.jgit.pgm/jgit.sh
-@@ -60,7 +60,7 @@ esac
- this_script=`which "$0" 2>/dev/null`
- [ $? -gt 0 -a -f "$0" ] && this_script="$0"
- cp=$this_script
--
-+export JGIT_CLASSPATH="$(build-classpath jgit slf4j/api slf4j/simple args4j jzlib jsch commons-compress xz-java javaewah httpcomponents/httpcore httpcomponents/httpclient commons-logging commons-codec eddsa apache-sshd/sshd-osgi apache-sshd/sshd-sftp)"
- platform="`uname`"
- if [ -n "$JGIT_CLASSPATH" ]
- then
---
-2.28.0
-
diff --git a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch b/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
deleted file mode 100644
index f3362fc..0000000
--- a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From a6efa36a04bee412b06af2823281ff9b78827ebf Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Fri, 29 Jan 2021 18:35:25 +0000
-Subject: [PATCH 2/2] Don't embed versions of third-party libs, use feature
- requirements instead
-
----
- .../feature.xml | 24 +++----------------
- .../feature.xml | 2 ++
- 2 files changed, 5 insertions(+), 21 deletions(-)
-
-diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
-index 92d171f..ca1f6de 100644
---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
-+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
-@@ -24,6 +24,9 @@
-
- <requires>
- <import plugin="com.jcraft.jsch"/>
-+ <import plugin="org.apache.commons.logging"/>
-+ <import plugin="org.apache.sshd.osgi"/>
-+ <import plugin="org.apache.sshd.sftp"/>
- <import plugin="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
- </requires>
-
-@@ -55,25 +58,4 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-- id="org.apache.commons.logging"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.apache.sshd.osgi"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.apache.sshd.sftp"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
- </feature>
-diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
-index 48660d5..843896f 100644
---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
-+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
-@@ -24,6 +24,8 @@
-
- <requires>
- <import feature="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
-+ <import plugin="org.apache.sshd.osgi"/>
-+ <import plugin="org.apache.sshd.sftp"/>
- </requires>
-
- <plugin
---
-2.28.0
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
deleted file mode 100644
index 9afe769..0000000
--- a/eclipse-jgit.spec
+++ /dev/null
@@ -1,600 +0,0 @@
-%global gittag 5.11.0.202103091610-r
-
-Name: eclipse-jgit
-Version: 5.11.0
-Release: 2%{?dist}
-Summary: Eclipse JGit
-
-# The jgit Eclipse plug-ins are "EDL" licensed, which is equivilent to the new BSD license
-License: BSD
-URL: https://www.eclipse.org/jgit/
-Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz
-
-# Set the correct classpath for the command line tools
-Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch
-# Switch to feature requirements for third-party bundles, also makes the following changes:
-# javaewah -> com.googlecode.javaewah.JavaEWAH
-# org.slf4j.api -> slf4j.api
-# org.slf4j.impl.log4j12 -> slf4j.simple
-Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildRequires: tycho
-BuildRequires: jgit = %{version}
-
-Requires: eclipse-platform
-Requires: jgit = %{version}
-
-%description
-A pure Java implementation of the Git version control system.
-
-%prep
-%setup -n jgit-%{gittag} -q
-%patch0 -p1
-%patch1 -p1
-
-# Disable multithreaded build
-rm .mvn/maven.config
-
-# Don't try to get deps from local *maven* repo, use tycho resolved ones
-for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do
- grep -q dependencies $p && %pom_xpath_remove "pom:dependencies" $p
-done
-
-# Don't need target platform or repository modules with xmvn
-%pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging
-%pom_disable_module org.eclipse.jgit.repository org.eclipse.jgit.packaging
-%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin/pom:configuration/pom:target" org.eclipse.jgit.packaging/pom.xml
-
-# Don't build source features
-%pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging
-
-# Don't build junit testing features
-%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging
-
-# Remove unnecessary plugins for RPM builds
-%pom_remove_plugin :maven-enforcer-plugin org.eclipse.jgit.packaging
-
-pushd org.eclipse.jgit.packaging
-%mvn_package "::pom::" __noinstall
-popd
-
-%build
-pushd org.eclipse.jgit.packaging
-%mvn_build -j
-popd
-
-%install
-pushd org.eclipse.jgit.packaging
-%mvn_install
-popd
-
-%files -f org.eclipse.jgit.packaging/.mfiles
-%license LICENSE
-%doc README.md
-
-%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Mar 10 2021 Mat Booth <mat.booth(a)redhat.com> - 5.11.0-1
-- Update to latest upstream release
-
-* Fri Jan 29 2021 Mat Booth <mat.booth(a)redhat.com> - 5.10.0-3
-- Fix build picking up incorrect sshd bundle
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 13 2021 Alexander Kurtakov <akurtako(a)redhat.com> - 5.10.0
-- Update to latest upstream release
-
-* Fri Oct 30 2020 Jeff Johnston <jjohnstn(a)redhat.com> - 5.9.0-1
-- Update to latest upstream release
-
-* Fri Aug 21 2020 Mat Booth <mat.booth(a)redhat.com> - 5.8.1-1
-- Update to latest upstream release
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jun 22 2020 Mat Booth <mat.booth(a)redhat.com> - 5.8.0-1
-- Update to latest upstream release
-
-* Sun Mar 22 2020 Mat Booth <mat.booth(a)redhat.com> - 5.7.0-1
-- Update to latest upstream release
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Dec 19 2019 Mat Booth <mat.booth(a)redhat.com> - 5.6.0-1
-- Update to latest upstream release
-
-* Tue Sep 17 2019 Mat Booth <mat.booth(a)redhat.com> - 5.5.0-1
-- Update to latest upstream release
-
-* Thu Jul 25 2019 Mat Booth <mat.booth(a)redhat.com> - 5.4.0-4
-- Move the core jgit library out into a separate package, allows us to simplify
- this package tremendously; see https://pagure.io/stewardship-sig/issue/13 and
- rhbz#1732894 for details
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.4.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Mat Booth <mat.booth(a)redhat.com> - 5.4.0-2
-- Fix jgit command line launching script
-
-* Thu Jun 27 2019 Mat Booth <mat.booth(a)redhat.com> - 5.4.0-1
-- Update to final tagged release
-
-* Fri May 31 2019 Mat Booth <mat.booth(a)redhat.com> - 5.4.0-0.1
-- Update to latest milestone release
-
-* Fri Apr 19 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-6
-- Allowing conditional build of eclipse features without being in 'bootstrap'
- mode
-
-* Tue Mar 19 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-5
-- Disable incomplete source feature
-
-* Sat Mar 16 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-4
-- Rebuild to regenerate symlinks
-
-* Sat Mar 16 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-3
-- Rebuild against apache sshd 2
-
-* Wed Mar 13 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-2
-- Rebuild to regenerate symlinks
-
-* Wed Mar 13 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-1
-- Update to 2019-03 release
-
-* Wed Mar 13 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-0.5
-- Full build
-
-* Wed Mar 13 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-0.4
-- Improved feature versions patch
-- Skip hanging tests
-
-* Wed Mar 13 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-0.3
-- Restrict to same architectures as Eclipse itself
-
-* Tue Mar 12 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-0.2
-- Update to 2019-03 RC1 release
-
-* Tue Feb 26 2019 Mat Booth <mat.booth(a)redhat.com> - 5.3.0-0.1
-- Update to latest milestone build
-
-* Mon Feb 11 2019 Todd Zullinger <tmz(a)pobox.com> - 5.2.0-5
-- Add javapackages-tools requires to jgit for /usr/bin/build-classpath
-
-* Thu Feb 07 2019 Mat Booth <mat.booth(a)redhat.com> - 5.2.0-4
-- Add missing requires for optional dep on bouncycastle
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Dec 07 2018 Mat Booth <mat.booth(a)redhat.com> - 5.2.0-2
-- Full rebuild
-
-* Fri Dec 07 2018 Mat Booth <mat.booth(a)redhat.com> - 5.2.0-1
-- Update to 5.2.0 release
-- Port to apache-sshd 2.1.0
-
-* Tue Sep 25 2018 Mat Booth <mat.booth(a)redhat.com> - 5.1.1-2
-- Full build
-
-* Mon Sep 24 2018 Mat Booth <mat.booth(a)redhat.com> - 5.1.1-1
-- Update to 5.1.1 release
-
-* Wed Aug 22 2018 Mat Booth <mat.booth(a)redhat.com> - 5.1.0-0.2
-- Full build
-
-* Wed Aug 22 2018 Mat Booth <mat.booth(a)redhat.com> - 5.1.0-0.1
-- Update to latest snapshot
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 22 2018 Mat Booth <mat.booth(a)redhat.com> - 5.0.1-1
-- Update to latest upstream release
-
-* Wed Mar 21 2018 Alexander Kurtakov <akurtako(a)redhat.com> 4.11.0-2
-- Full build.
-
-* Tue Mar 20 2018 nickboldt <nboldt(a)redhat.com> - 4.11.0-1
-- Update to latest upstream release 4.11.0
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.10.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Jan 05 2018 Mat Booth <mat.booth(a)redhat.com> - 4.10.0-2
-- Rebuild to generate Eclipse features
-
-* Fri Jan 05 2018 Mat Booth <mat.booth(a)redhat.com> - 4.10.0-1
-- Update to latest upstream release
-
-* Fri Dec 15 2017 Mat Booth <mat.booth(a)redhat.com> - 4.9.1-2
-- Rebuild to generate Eclipse features
-
-* Fri Dec 15 2017 Mat Booth <mat.booth(a)redhat.com> - 4.9.1-1
-- Update to latest release
-- Bootstrap mode
-
-* Tue Nov 21 2017 Mat Booth <mat.booth(a)redhat.com> - 4.9.0-2
-- Rebuild to generate Eclipse features
-
-* Tue Nov 21 2017 Mat Booth <mat.booth(a)redhat.com> - 4.9.0-1
-- Update to latest upstream version
-- Allow bootstrap build to work without tycho/eclipse
-
-* Mon Jul 31 2017 Mat Booth <mat.booth(a)redhat.com> - 4.8.0-4
-- Add requires on eclipse-platform to the subpackage that contains the Eclipse
- features
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.8.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jun 15 2017 Mat Booth <mat.booth(a)redhat.com> - 4.8.0-2
-- Rebuild to regenerate symlinks
-- Add missing BR on jetty-continuation
-
-* Thu Jun 15 2017 Mat Booth <mat.booth(a)redhat.com> - 4.8.0-1
-- Update to Oxygen release
-
-* Tue May 30 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.7.0-8
-- Add missing build-requires on maven-install-plugin
-
-* Tue May 23 2017 Mat Booth <mat.booth(a)redhat.com> - 4.7.0-7
-- Fix NCDFE when doing jgit clone over http, resolves: rhbz#1454585
-
-* Fri May 12 2017 Mat Booth <mat.booth(a)redhat.com> - 4.7.0-6
-- Allow using jgit from ant tasks
-
-* Wed May 10 2017 Mat Booth <mat.booth(a)redhat.com> - 4.7.0-5
-- Full build once again
-- Don't package tests with main artifacts
-- Enable test suite at build-time
-
-* Wed May 10 2017 Mat Booth <mat.booth(a)redhat.com> - 4.7.0-4
-- Rebuild for new javaewah
-- Temporarily disable features
-
-* Thu May 04 2017 Mat Booth <mat.booth(a)redhat.com> - 4.7.0-3
-- Re-enable jetty-using features
-
-* Wed May 03 2017 Mat Booth <mat.booth(a)redhat.com> - 4.7.0-2
-- Temporarily disable features that use jetty
-
-* Mon Apr 10 2017 nboldt <nickboldt+redhat(a)gmail.com> - 4.7.0-1
-- Update to jgit 4.7
-
-* Mon Mar 27 2017 Nick Boldt <nboldt(a)redhat.com> - 4.6.1-1
-- Update to Neon.3 release version; remove jetty 9.4.0 patch
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 05 2017 Mat Booth <mat.booth(a)redhat.com> - 4.6.0-2
-- Bump to rebuild symlinks
-
-* Wed Jan 04 2017 Mat Booth <mat.booth(a)redhat.com> - 4.6.0-1
-- Update to latest release
-
-* Tue Oct 4 2016 Alexander Kurtakov <akurtako(a)redhat.com> 4.5.0-2
-- Remove no longer needed patch.
-
-* Tue Oct 4 2016 Alexander Kurtakov <akurtako(a)redhat.com> 4.5.0-1
-- Update to upstream 4.5.0 release.
-
-* Wed Aug 03 2016 Sopot Cela <scela(a)redhat.com> - 4.4.1-1
-- Upgrade to 4.4.1
-
-* Fri Jul 01 2016 Mat Booth <mat.booth(a)redhat.com> - 4.4.0-4
-- Fix IllegalStateException when starting git daemon from the command line
-
-* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.4.0-3
-- Add missing build-requires
-
-* Mon Jun 13 2016 Mat Booth <mat.booth(a)redhat.com> - 4.4.0-2
-- Rebuild to regenerate symlinks
-
-* Mon Jun 13 2016 Mat Booth <mat.booth(a)redhat.com> - 4.4.0-1
-- Update to latest release
-
-* Mon May 02 2016 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-2
-- Avoid embedding versions of external deps in features. This avoids the need to
- rebuild when a dependency changes version.
-
-* Fri Apr 15 2016 Sopot Cela <scela(a)redhat.com> - 4.3.0-1
-- Upgrade to 4.3.0
-
-* Wed Apr 6 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-9
-- Rebuild for slf4j 1.7.21
-
-* Wed Mar 30 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-8
-- Rebuild for slf4j 1.7.20
-
-* Thu Mar 24 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-7
-- Rebuild for slf4j 1.7.19
-
-* Mon Feb 29 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-6
-- Rebuild for slf4j 1.7.18
-
-* Mon Feb 22 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-5
-- Rebuild for slf4j 1.7.17
-
-* Wed Feb 17 2016 Alexander Kurtakov <akurtako(a)redhat.com> 4.2.0-4
-- Rebuild for latest slf4j.
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 25 2016 Mat Booth <mat.booth(a)redhat.com> - 4.2.0-2
-- Rebuilt to generate symlinks
-
-* Fri Jan 22 2016 Mat Booth <mat.booth(a)redhat.com> - 4.2.0-1
-- Update to latest upstream release
-- Add patch for latest version of jetty
-
-* Tue Dec 08 2015 Mat Booth <mat.booth(a)redhat.com> - 4.1.1-2
-- Rebuild to re-generate symlinks
-
-* Tue Dec 08 2015 Mat Booth <mat.booth(a)redhat.com> - 4.1.1-1
-- Update to latest upstream release
-
-* Sun Nov 29 2015 Mat Booth <mat.booth(a)redhat.com> - 4.1.0-6
-- Fix a problem with command line "jgit daemon" invocation
-- This should also fix rhbz#1228138
-
-* Mon Nov 16 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.1.0-5
-- Rebuild for latest slf4j.
-
-* Mon Oct 12 2015 Mat Booth <mat.booth(a)redhat.com> - 4.1.0-4
-- Drop R on slf4j.
-
-* Thu Oct 08 2015 Roland Grunberg <rgrunber(a)redhat.com> - 4.1.0-3
-- Use slf4j.simple instead of slf4j.log4j12.
-
-* Wed Sep 30 2015 Mat Booth <mat.booth(a)redhat.com> - 4.1.0-2
-- Regenerate symlinks
-
-* Tue Sep 29 2015 Mat Booth <mat.booth(a)redhat.com> - 4.1.0-1
-- Update to 4.1.0
-
-* Mon Sep 14 2015 Roland Grunberg <rgrunber(a)redhat.com> - 4.0.1-5
-- Rebuild as an Eclipse p2 Droplet.
-
-* Tue Jul 7 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.0.1-4
-- Relax version restriction for args4j
-
-* Tue Jun 30 2015 Mat Booth <mat.booth(a)redhat.com> - 4.0.1-3
-- Does not require eclipse-platform, only eclipse-filesystem
-- Drop incomplete SCL macros
-
-* Wed Jun 24 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.1-2
-- Rebuild to fix symlinks.
-
-* Wed Jun 24 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.1-1
-- Update to 4.0.1.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Jun 10 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-2
-- Rebuild to fix symlinks.
-
-* Tue Jun 9 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-1
-- Update to 4.0 final.
-
-* Mon Jun 1 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-0.2.rc2
-- Switch to xz tarball.
-
-* Wed May 27 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-0.1.rc2
-- Update to 4.0 rc2.
-
-* Thu May 14 2015 Alexander Kurtakov <akurtako(a)redhat.com> 3.7.1-1
-- Update to 3.7.1 release.
-
-* Mon Mar 02 2015 Roland Grunberg <rgrunber(a)redhat.com> - 3.7.0-2
-- Manually add slf4j-log4j12 requires.
-
-* Mon Mar 02 2015 Roland Grunberg <rgrunber(a)redhat.com> - 3.7.0-1
-- Update to upstream 3.7.0.
-
-* Fri Jan 23 2015 Roland Grunberg <rgrunber(a)redhat.com> - 3.6.2-2
-- Use Equinox's OSGi runtime instead of Felix's.
-
-* Fri Jan 23 2015 Alexander Kurtakov <akurtako(a)redhat.com> 3.6.2-1
-- Update to upstream 3.6.2.
-
-* Mon Jan 5 2015 Alexander Kurtakov <akurtako(a)redhat.com> 3.6.1-1
-- Update to upstream 3.6.1.
-
-* Fri Dec 19 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.5.3-1
-- Update to upstream 3.5.3 release.
-
-* Thu Dec 18 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.5.2-1
-- Update to upstream 3.5.2 release.
-
-* Tue Nov 11 2014 Mat Booth <mat.booth(a)redhat.com> - 3.5.0-3
-- Rebuild to generate correct symlinks
-- Drop unnecessary requires (now autogenerated by xmvn)
-
-* Fri Nov 07 2014 Mat Booth <mat.booth(a)redhat.com> - 3.5.0-2
-- Build/install eclipse plugin with mvn_build/mvn_install
-
-* Fri Oct 03 2014 Mat Booth <mat.booth(a)redhat.com> - 3.5.0-1
-- Update to latest upstream release 3.5.0
-
-* Thu Jun 26 2014 Mat Booth <mat.booth(a)redhat.com> - 3.4.1-1
-- Update to latest upstream release 3.4.1
-- Drop unnecessary BRs
-
-* Fri Jun 13 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.4.0-1
-- Update to upstream 3.4.0.
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.3.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri May 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.3.2-5
-- Use .mfiles geterated during build
-
-* Fri May 30 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.3.2-4
-- Add missing Rs ( rhbz #1079706 ).
-
-* Wed May 28 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.3.2-3
-- Rebuild for latest commons-compress.
-
-* Wed May 21 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.3.2-2
-- Fix compile against latest args4j.
-
-* Fri Apr 25 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.3.2-1
-- Update to 3.3.2.
-
-* Mon Mar 31 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.3.1-2
-- Remove bundled commons-compress.
-
-* Fri Mar 28 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.3.1-1
-- Update to 3.3.1.
-
-* Tue Mar 11 2014 Alexander Kurtakov <akurtako(a)redhat.com> 3.3.0-1
-- Update to 3.3.0.
-
-* Sun Dec 29 2013 Alexander Kurtakov <akurtako(a)redhat.com> 3.2.0-1
-- Update to 3.2.0.
-
-* Thu Oct 3 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.1.0-1
-- Update to Kepler SR1.
-
-* Mon Aug 5 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.0.0-7
-- Add missing jgit plugin back.
-
-* Tue Jul 16 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.0.0-6
-- Change the build system to mvn-rpmbuild.
-- Use feclipse-maven-plugin to install things.
-- Bug 413163 - Incompatible change in latest args4j: multiValued removed from @Option
-
-* Fri Jul 5 2013 Neil Brian Guzman <nguzman(a)redhat.com> 3.0.0-5
-- Bump release
-
-* Tue Jun 25 2013 Neil Brian Guzman <nguzman(a)redhat.com> 3.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Jun 25 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.0.0-3
-- Add missing R: javaewah to eclipse-jgit.
-
-* Tue Jun 25 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.0.0-2
-- Move symlinks to eclipse-jgit.
-- Fix jgit classpath.
-
-* Thu Jun 20 2013 Neil Brian Guzman <nguzman(a)redhat.com> 3.0.0-1
-- Update to 3.0.0 release
-
-* Tue May 14 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 2.3.1-2
-- Rebuild with latest icu4j.
-
-* Thu Feb 21 2013 Roland Grunberg <rgrunber(a)redhat.com> - 2.3.1-1
-- SCL-ize package.
-
-* Thu Feb 21 2013 Roland Grunberg <rgrunber(a)redhat.com> - 2.3.1-1
-- Update to 2.3.1 release.
-
-* Thu Feb 14 2013 Roland Grunberg <rgrunber(a)redhat.com> - 2.2.0-3
-- jgit subpackage should own its symlinked dependencies.
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jan 3 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 2.2.0-1
-- Update to 2.2.0 release.
-
-* Mon Oct 1 2012 Alexander Kurtakov <akurtako(a)redhat.com> 2.1.0-1
-- Update to 2.1.0 release.
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jul 2 2012 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-1
-- Update to 2.0.0 upstream release.
-
-* Fri Apr 27 2012 Severin Gehwolf <sgehwolf(a)redhat.com> 1.3.0-3
-- Use eclipse-pdebuild over old pdebuild script.
-
-* Thu Apr 26 2012 Severin Gehwolf <sgehwolf(a)redhat.com> 1.3.0-2
-- Tweak .spec so as to avoid modifying to much of the .spec file
-- Fix upstream 1.3 release sources.
-
-* Fri Feb 17 2012 Andrew Robinson <arobinso(a)redhat.com> 1.3.0-1
-- Update to 1.3.0 upstream release.
-
-* Thu Jan 5 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.2.0-2
-- Build eclipse plugin first to not interfere with maven artifacts.
-
-* Thu Jan 5 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.2.0-1
-- Update to 1.2.0 release.
-
-* Fri Oct 28 2011 Andrew Robinson <arobinso(a)redhat.com> 1.1.0-4
-- Add jsch jar to the classpath.
-
-* Fri Oct 28 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.1.0-3
-- Drop libs subpackage and use the sh script directly instead of the shaded executable.
-- Install jars in _javadir subdir as per guidelines.
-
-* Thu Oct 27 2011 Andrew Robinson <arobinso(a)redhat.com> 1.1.0-2
-- Added Java libraries, javadocs and console binary subpackages.
-
-* Fri Sep 23 2011 Andrew Robinson <arobinso(a)redhat.com> 1.1.0-1
-- Update to upstream release 1.1.0.
-
-* Tue Jun 14 2011 Chris Aniszczyk <zx(a)redhat.com> 1.0.0-2
-- Update to upstream release 1.0.0.201106090707-r.
-
-* Tue Jun 07 2011 Chris Aniszczyk <zx(a)redhat.com> 1.0.0-1
-- Update to upstream release 1.0.0.
-
-* Tue May 03 2011 Chris Aniszczyk <zx(a)redhat.com> 0.12.1-1
-- Update to upstream release 0.12.1.
-
-* Tue Feb 22 2011 Chris Aniszczyk <zx(a)redhat.com> 0.11.3-1
-- Update to upstream release 0.11.3.
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Dec 22 2010 Chris Aniszczyk <zx(a)redhat.com> 0.10.1-1
-- Update to upstream release 0.10.1.
-
-* Thu Oct 7 2010 Chris Aniszczyk <zx(a)redhat.com> 0.9.3-1
-- Update to upstream release 0.9.3.
-
-* Wed Sep 15 2010 Severin Gehwolf <sgehwolf(a)redhat.com> 0.9.1-1
-- Update to upstream release 0.9.1.
-
-* Thu Aug 26 2010 Severin Gehwolf <sgehwolf at, redhat.com> 0.9.0-0.1.20100825git
-- Make release tag more readable (separate "0.1" and pre-release tag by ".").
-
-* Wed Aug 25 2010 Severin Gehwolf <sgehwolf at, redhat.com> 0.9.0-0.120100825git
-- Pre-release version of JGit 0.9.0
-
-* Fri Jun 25 2010 Severin Gehwolf <sgehwolf at, redhat.com> 0.8.4-2
-- Increase release number to make tagging work.
-
-* Wed Jun 23 2010 Severin Gehwolf <sgehwolf at, redhat.com> 0.8.4-1
-- Rebase to 0.8.4 release.
-
-* Mon Apr 12 2010 Jeff Johnston <jjohnstn(a)redhat.com> 0.7.1-1
-- Rebase to 0.7.1 release.
-
-* Tue Feb 9 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0.6.0-0.1.git20100208
-- New git snapshot.
-
-* Thu Nov 5 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0.6.0-0.1.git20091029
-- Correct release.
-
-* Thu Oct 29 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0.6.0-0.git20091029.1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index b9edc67..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (jgit-5.11.0.202103091610-r.tar.xz) = 554f190b42a41989b57adaf80bf504c7fd8df1ae9f0fda7a694f6f1366ca6c84df2f5876a38415cf2d29b8d4860e2c40d6a952ee413cb923963366bd6f5fbfa7
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/eclipse-gef.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-gef.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-gef.git/commit/?id=32629b....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 32629b029353a23aa5857b62325cd7f79c88ff31
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:19:11 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 94d753b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/noarch
-/org.eclipse.gef-*.tar.bz2
-/org.eclipse.gef-*/
-/*.src.rpm
-/.build-*.log
-/.project
-/R3_10_0.tar.xz
-/R3_10_1.tar.xz
-/org.eclipse.gef-d3e8eb20484e4800477b3e9e8ac904f47587278e.tar.xz
-/org.eclipse.gef-R4_0_0.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
deleted file mode 100644
index da74228..0000000
--- a/eclipse-gef.spec
+++ /dev/null
@@ -1,384 +0,0 @@
-%global git_version R4_0_0
-
-Name: eclipse-gef
-Version: 3.11.0
-
-Release: 17%{?dist}
-Summary: Graphical Editing Framework (GEF) Eclipse plug-in
-License: EPL-1.0
-URL: https://www.eclipse.org/gef/
-
-Source0: https://git.eclipse.org/c/gef/org.eclipse.gef.git/snapshot/org.eclipse.ge...
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildRequires: tycho
-BuildRequires: maven-antrun-plugin
-BuildRequires: eclipse-license1
-BuildRequires: ant-contrib
-Requires: eclipse-platform
-
-# Obsoletes added in F30
-Obsoletes: %{name}-examples < %{version}-%{release}
-# Obsoletes added in F33
-Obsoletes: %{name}-sdk < %{version}-%{release}
-Obsoletes: %{name}-tests < %{version}-%{release}
-
-%description
-The Graphical Editing Framework (GEF) allows developers to create a rich
-graphical editor from an existing application model. GEF is completely
-application neutral and provides the groundwork to build almost any
-application, including but not limited to: activity diagrams, GUI builders,
-class diagram editors, state machines, and even WYSIWYG text editors.
-
-%prep
-%setup -q -n org.eclipse.gef-%{git_version}
-
-find -name *.jar -exec rm -rf {} \;
-find -name *.class -exec rm -rf {} \;
-
-%pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin org.eclipse.gef.releng/pom.xml
-
-# Don't ship examples
-for m in .flow .logic .shapes .text .ui.capabilities .source-feature -feature .ui.pde ; do
- %pom_disable_module "../org.eclipse.gef.examples$m" org.eclipse.gef.releng
-done
-# Don't ship tests
-%pom_disable_module "../org.eclipse.draw2d.tests" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.gef.tests" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.zest.tests" org.eclipse.gef.releng
-# Don't ship sources
-%pom_disable_module "../org.eclipse.draw2d.source-feature" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.gef.source-feature" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.zest.source-feature" org.eclipse.gef.releng
-# Don't ship SDK features
-%pom_disable_module "../org.eclipse.draw2d.sdk-feature" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.gef.sdk-feature" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.zest.sdk-feature" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.draw2d.doc.isv" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.gef.doc.isv" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.zest.doc.isv" org.eclipse.gef.releng
-
-# Not needed for RPM builds
-%pom_disable_module "../org.eclipse.gef.all-feature" org.eclipse.gef.releng
-%pom_disable_module "../org.eclipse.gef.repository" org.eclipse.gef.releng
-
-%mvn_package "org.eclipse.gef:" __noinstall
-%mvn_package "::jar:sources:" __noinstall
-
-%build
-%mvn_build -j -f -- -f org.eclipse.gef.releng/pom.xml -P !MARS.target
-
-%install
-%mvn_install
-
-%files -f .mfiles
-
-%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Feb 4 2021 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-16
-- Drop SDK subpackage
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Oct 30 2020 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-14
-- Fix requirement on eclipse-license
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Mar 23 2020 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Sep 13 2019 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-11
-- Don't ship test packages
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-9
-- Restrict to same architectures as Eclipse itself
-- Obsolete examples subpackage
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Nov 05 2018 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-7
-- Rebuild to regenerate requires
-- Update license tag
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue May 30 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.11.0-3
-- Add missing build-requires on maven-dependency-plugin
-- Remove unneeded requires on tycho-extras
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jul 05 2016 Mat Booth <mat.booth(a)redhat.com> - 3.11.0-1
-- Update to tagged release
-- Split tests in into separate subpackage
-
-* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.11.0-0.2gitd3e8eb2
-- Add missing build-requires
-
-* Tue May 31 2016 Alexander Kurtakov <akurtako(a)redhat.com> 3.11.0-0.1gitd3e8eb2
-- Update to Neon pre-release.
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.10.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Sep 28 2015 Sopot Cela <scela(a)redhat.com> - 3.10.1-1
-- Updated to 3.10.1-1 (Mars SR1)
-
-* Mon Sep 14 2015 Roland Grunberg <rgrunber(a)redhat.com> - 3.10.0-2
-- Rebuild as an Eclipse p2 Droplet.
-
-* Mon Jun 22 2015 Alexander Kurtakov <akurtako(a)redhat.com> 3.10.0-1
-- Update to upstream 3.10.0 release.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.9.101-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.9.101-3
-- Rebuild to generate missing OSGi auto-requires
-
-* Wed Jan 14 2015 Mat Booth <mat.booth(a)redhat.com> - 3.9.101-2
-- Migrate to mvn_build/mvn_install
-
-* Tue Sep 30 2014 Mat Booth <mat.booth(a)redhat.com> - 3.9.101-1
-- Update to 3.9.101
-
-* Mon Jun 30 2014 Mat Booth <mat.booth(a)redhat.com> - 3.9.100-1.gitb63ec56
-- Update to latest upstream release
-- Add a script to make smaller source tarballs
-- Add BR on eclipse-license
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.9.1-0.4.gitb9f2e9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Mar 28 2014 Michael Simacek <msimacek(a)redhat.com> - 3.9.1-0.3.gitb9f2e9
-- Use Requires: java-headless rebuild (#1067528)
-
-* Mon Oct 28 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.9.1-0.2.gitb9f2e9
-- Deploy missing bundles and features.
-
-* Tue Oct 1 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.9.1-0.1.gitb9f2e9
-- Update to Kepler SR1.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.9.0-2.git22becd5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Jun 17 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.9.0-1.git22becd5
-- Kepler release.
-
-* Tue Apr 9 2013 Alexander Kurtakov <akurtako(a)redhat.com> 3.9.0-0.2.gitbd7178d
-- New snapshot containing upstream fix for icu4j 50.x.
-
-* Wed Apr 3 2013 Alexander Kurtakov <akurtako(a)redhat.com> 3.9.0-0.1.gitdbf4cef
-- Update to 3.9.0 snapshot (aka Kepler).
-- SCL-ize.
-
-* Thu Feb 21 2013 Alexander Kurtakov <akurtako(a)redhat.com> 3.8.1-7
-- Adapt to the icu4j version jump.
-- Skip tests for now.
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.8.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Jan 22 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.1-5
-- Ignore Tycho version check.
-
-* Thu Oct 4 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.1-4
-- Configure only one Tycho version.
-
-* Thu Oct 4 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.1-3
-- Properly unpack features.
-
-* Wed Oct 3 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.1-2
-- Fix installation location
-
-* Tue Oct 2 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.1-1
-- Update to Juno SR1.
-- Build reflects upstream build now.
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jul 10 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.0-1
-- Update to upstream Juno release.
-
-* Mon Apr 16 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.0-0.3.20120402
-- Generate documentation contents & reference API.
-
-* Fri Apr 13 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.0-0.2.20120402
-- Update to Eclipse 4.2
-- Fix documentation build
-
-* Mon Apr 2 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 3.8.0-0.1.20120402
-- Update to 3.8.0 post M6 build.
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Jul 11 2011 Andrew Overholt <overholt(a)redhat.com> 3.7.0-1
-- Update to 3.7.0.
-
-* Fri Mar 18 2011 Mat Booth <fedora(a)matbooth.co.uk> 3.6.2-1
-- Update to 3.6.2.
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Oct 7 2010 Chris Aniszczyk <zx(a)redhat.com> 3.6.1-1
-- Update to 3.6.1.
-
-* Fri Jul 9 2010 Alexander Kurtakov <akurtako(a)redhat.com> 3.6.0-1
-- Update to 3.6.0.
-
-* Sun Feb 28 2010 Mat Booth <fedora(a)matbooth.co.uk> 3.5.2-1
-- Update to 3.5.2 upstream version.
-- Now requires Eclipse 3.5.1.
-
-* Sun Nov 8 2009 Mat Booth <fedora(a)matbooth.co.uk> 3.5.1-2
-- Update context qualifier to be later than the tags of the individual plugins.
-
-* Tue Oct 27 2009 Alexander Kurtakov <akurtako(a)redhat.com> 3.5.1-1
-- Update to 3.5.1 upstream version.
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jul 02 2009 Mat Booth <fedora(a)matbooth.co.uk> 3.5.0-2
-- SDK requires PDE for example plug-in projects.
-
-* Wed Jul 01 2009 Mat Booth <fedora(a)matbooth.co.uk> 3.5.0-1
-- Update to 3.5.0 final release (Galileo).
-- Build the features seperately to allow for a saner %%files section.
-- Use %%global instead of %%define.
-
-* Wed May 27 2009 Alexander Kurtakov <akurtako(a)redhat.com> 3.5.0-0.2.RC2
-- Update to 3.5.0 RC2.
-
-* Sat Apr 18 2009 Mat Booth <fedora(a)matbooth.co.uk> 3.5.0-0.1.M6
-- Update to Milestone 6 release of 3.5.0.
-- Require Eclipse 3.5.0.
-
-* Tue Apr 7 2009 Alexander Kurtakov <akurtako(a)redhat.com> 3.4.2-3
-- Fix directory ownership.
-- Drop gcj support.
-
-* Mon Mar 23 2009 Alexander Kurtakov <akurtako(a)redhat.com> 3.4.2-2
-- Rebuild to not ship p2 context.xml.
-- Remove context.xml from %%files section.
-
-* Sat Feb 28 2009 Mat Booth <fedora(a)matbooth.co.uk> 3.4.2-1
-- Update for Ganymede SR2.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Dec 22 2008 Mat Booth <fedora(a)matbooth.co.uk> 3.4.1-2
-- Rebuild GCJ DB during post and postun in sub-packages.
-
-* Thu Nov 20 2008 Mat Booth <fedora(a)matbooth.co.uk> 3.4.1-1
-- New maintainer.
-- Updated to verion 3.4.1.
-- Update package for new Eclipse plugin guidelines.
-- Own the gcj/%%{name} directory.
-- The 'examples.ui.pde' plugin is actually part of the SDK feature.
-
-* Thu Jul 17 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 3.3.0-3
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 3.3.0-2
-- Autorebuild for GCC 4.3
-
-* Mon Aug 27 2007 Andrew Overholt <overholt(a)redhat.com> 3.3.0-1
-- 3.3.
-
-* Thu Jun 14 2007 Andrew Overholt <overholt(a)redhat.com> 3.2.1-5
-- Add EPEL5 patches from Rob Myers.
-
-* Tue Jan 30 2007 Andrew Overholt <overholt(a)redhat.com> 3.2.1-4
-- Use copy-platform in %%{eclipse_base}.
-
-* Mon Nov 06 2006 Andrew Overholt <overholt(a)redhat.com> 3.2.1-3
-- Use copy-platform in %%{_libdir}.
-- Use binary launcher rather than startup.jar to guard against future
- osgi.sharedConfiguration.area changes.
-
-* Thu Oct 19 2006 Andrew Overholt <overholt(a)redhat.com> 3.2.1-2
-- Fix buildroot (don't know how the wrong one slipped in).
-
-* Thu Oct 19 2006 Andrew Overholt <overholt(a)redhat.com> 3.2.1-1
-- 3.2.1.
-
-* Tue Aug 29 2006 Andrew Overholt <overholt(a)redhat.com> 3.2.0-2
-- First release for Fedora.
-
-* Tue Aug 22 2006 Andrew Overholt <overholt(a)redhat.com> 3.2.0-1jpp_2rh
-- -devel -> -sdk to match upstream..
-
-* Tue Jul 25 2006 Andrew Overholt <overholt(a)redhat.com> 3.2.0-1jpp_1rh
-- 3.2.0.
-
-* Tue May 02 2006 Ben Konrath <bkonrath(a)redhat.com> 3.1.1-1jpp_2rh
-- Remove -debug from compile line.
-- Add expamples package.
-
-* Mon Apr 3 2006 Ben Konrath <bkonrath(a)redhat.com> 3.1.1-1jpp_1rh
-- Add devel package.
-- Update sources to 3.1.1.
-- Some general spec file cleanup.
-- Add patch to stop the gefbuilder plugin from setting bootclasspath.
-- Change copyright to license.
-- Add instructions for generating source drop.
-
-* Tue Sep 6 2005 Aaron Luchko <aluchko(a)redhat.com> 3.1.0-1
-- change to match eclipse-changelog.spec and fixed typos
-
-* Thu Aug 4 2005 Aaron Luchko <aluchko(a)redhat.com>
-- Updated to 3.1.0
-- added createTarball.sh, gefSource.sh, and build.xml.patch
-- added native build
-- changes to use eclipsebuilder
-- fixes from Matthias Saou
-
-* Mon Jun 27 2005 Aaron Luchko <aluchko(a)redhat.com> 3.0.1-8
-- Added x86_64
-
-* Mon May 2 2005 Ben Konrath <bkonrath(a)redhat.com> 3.0.1-7
-- Build against Eclipse 3.0.2.
-
-* Thu Mar 31 2005 Phil Muldoon <pmuldoon(a)redhat.com> 3.0.1-6
-- Migrate RHEL-3 sources to RHEL-4
-
-* Mon Nov 1 2004 Phil Muldoon <pmuldoon(a)redhat.com> 3.0.1-5
-- Stopped ant trying to replace about.mappings
-
-* Mon Nov 1 2004 Phil Muldoon <pmuldoon(a)redhat.com> 3.0.1-4
-- Changed tar name to new tar
-
-* Mon Nov 1 2004 Phil Muldoon <pmuldoon(a)redhat.com> 3.0.1-3
-- Touch build scripts to point to 3.0.1
-
-* Mon Nov 1 2004 Phil Muldoon <pmuldoon(a)redhat.com> 3.0.1-2
-- Explicitly set -DJAVADOC14_HOME=%%{java_home}/bin to build javadocs
-
-* Sun Oct 31 2004 Phil Muldoon <pmuldoon(a)redhat.com> 3.0.1-1
-- Initial Import
diff --git a/sources b/sources
deleted file mode 100644
index 82c8a98..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-fad02b7a5d400e5f3bd87a95a2f876f4 org.eclipse.gef-R4_0_0.tar.xz
2 years, 8 months
- 1
- 0
Architecture specific change in rpms/eclipse-emf.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-emf.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-emf.git/commit/?id=5263a9....
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 5263a9086f9a3f229e3df4eaa751d09e54ed5378
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Sep 8 12:18:46 2021 +0200
eclipse packages are no longer available on Fedora 35+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 67b1020..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/*.rpm
-/noarch
-/x86_64
-/.build-*.log
-/org.eclipse.emf-*.tar.xz
-/org.eclipse.emf-*/
-/org.eclipse.xsd-*.tar.xz
-/org.eclipse.xsd-*/
-/.project
diff --git a/0001-Remove-dependency-on-nebula.patch b/0001-Remove-dependency-on-nebula.patch
deleted file mode 100644
index 496731f..0000000
--- a/0001-Remove-dependency-on-nebula.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 079a94e149165b30af36d13cfc8f37b5f854881f Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Fri, 20 Mar 2020 13:53:25 +0000
-Subject: [PATCH 1/2] Remove dependency on nebula
-
----
- plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF b/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
-index d3d62b9..d288949 100644
---- a/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
-+++ b/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
-@@ -22,8 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
- org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
-- org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
-- org.eclipse.nebula.widgets.cdatetime;bundle-version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy
-+ org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)";resolution:=optional
- Eclipse-LazyStart: true
- Bundle-ActivationPolicy: lazy
- Automatic-Module-Name: org.eclipse.emf.edit.ui
---
-2.21.1
-
diff --git a/0002-Remove-test-that-requires-talking-to-the-internet.patch b/0002-Remove-test-that-requires-talking-to-the-internet.patch
deleted file mode 100644
index ccb96eb..0000000
--- a/0002-Remove-test-that-requires-talking-to-the-internet.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 25b039d588bc77b8f70d74ddacb6b7ad570c95e6 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Fri, 20 Mar 2020 13:53:59 +0000
-Subject: [PATCH 2/2] Remove test that requires talking to the internet
-
----
- .../org/eclipse/emf/test/core/ecore/URIConverterTest.java | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java b/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java
-index 400dfda..500bd93 100644
---- a/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java
-+++ b/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java
-@@ -77,11 +77,6 @@ public class URIConverterTest
- assertEquals(contentsFromUncompressedFile, contents);
- new File(URI.createURI(uri.authority().replaceAll("!", "")).toFileString()).delete();
-
-- // Reads the data.zip file from our git repository using https
-- //
-- uri = URI.createURI("archive:https://git.eclipse.org/c/emf/org.eclipse.emf.git/plain/tests/org...");
-- contents = readFile(uriConverter.createInputStream(uri));
-- assertEquals(contentsFromUncompressedFile, contents);
- }
-
- protected String readFile(InputStream inputStream) throws IOException
---
-2.21.1
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..61e6a64
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eclipse packages are no longer available on Fedora 35+
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
deleted file mode 100644
index 35a51e0..0000000
--- a/eclipse-emf.spec
+++ /dev/null
@@ -1,536 +0,0 @@
-%global _eclipsedir %{_prefix}/lib/eclipse
-
-%global emf_tag ddba8b9fe0208481dc3d73ccc692d5c346ea6bae
-%global xsd_tag 2853b57a053beff82e8160c5827d7d92c7aff3f8
-
-# Set this flag to avoid building everything except for the core bundles
-# Allows building into a brand new buildroot before Eclipse is even built
-%bcond_with bootstrap
-
-Epoch: 1
-Name: eclipse-emf
-Version: 2.25.0
-Release: 2%{?dist}
-Summary: EMF and XSD Eclipse plug-ins
-
-License: EPL-2.0
-URL: https://www.eclipse.org/modeling/emf/
-Source0: https://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.em...
-Source1: https://git.eclipse.org/c/xsd/org.eclipse.xsd.git/snapshot/org.eclipse.xs...
-
-# Avoid hard build-time dep on nebula (not in Fedora)
-Patch0: 0001-Remove-dependency-on-nebula.patch
-# Remove test that requires internet connection
-Patch1: 0002-Remove-test-that-requires-talking-to-the-internet.patch
-
-BuildRequires: tycho
-%if %{without bootstrap}
-BuildRequires: eclipse-pde
-%endif
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-%description
-The Eclipse Modeling Framework (EMF) and XML Schema Definition (XSD) plug-ins.
-
-%package core
-Summary: Eclipse EMF Core Bundles
-# Obsolete SDK packages since F33
-Obsoletes: %{name}-sdk < 1:2.23.0-3
-Obsoletes: eclipse-xsd-sdk < 1:2.23.0-3
-
-%description core
-Core EMF bundles required by the Eclipse platform.
-
-%if %{without bootstrap}
-%package runtime
-Summary: Eclipse Modeling Framework (EMF) Eclipse plug-in
-
-%description runtime
-The Eclipse Modeling Framework (EMF) allows developers to build tools and
-other applications based on a structured data model. From a model
-specification described in XMI, EMF provides tools and run-time support to
-produce a set of Java classes for the model, along with a set of adapter
-classes that enable viewing and command-based editing of the model, and a
-basic editor.
-
-%package xsd
-Summary: XML Schema Definition (XSD) Eclipse plug-in
-# Obsoletes added in F28
-Obsoletes: eclipse-xsd < %{version}-%{release}
-Provides: eclipse-xsd = %{version}-%{release}
-
-%description xsd
-The XML Schema Definition (XSD) plug-in is a library that provides an API for
-manipulating the components of an XML Schema as described by the W3C XML
-Schema specifications, as well as an API for manipulating the DOM-accessible
-representation of XML Schema as a series of XML documents.
-%endif
-
-%prep
-%setup -c -T -q -a 0 -a 1
-mv org.eclipse.emf-%{emf_tag}/ org.eclipse.emf/
-mv org.eclipse.xsd-%{xsd_tag}/ org.eclipse.xsd/
-
-%patch0 -p1
-%patch1 -p1
-
-pushd org.eclipse.emf
-
-%pom_remove_plugin ":maven-toolchains-plugin" releng/org.eclipse.emf.parent
-
-# TODO: ODA, GWT, Xtext and RAP components are not packaged, so don't build corresponding bundles
-sed -i -e '/org.eclipse.emf.gwt/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
-sed -i -e '/org.eclipse.emf.oda/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
-sed -i -e '/org.eclipse.emf.rap/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
-sed -i -e '/codegen.ecore.xtext/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
-sed -i -e '/ecore.xcore/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
-sed -i -e '/test.edit.ui.rap/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
-%pom_xpath_remove "plugin[@id='org.eclipse.emf.test.edit.ui.rap']" tests/org.eclipse.emf.tests-feature/feature.xml
-
-# Disable example bundles, we don't want to ship them
-%pom_disable_module "../../../examples/org.eclipse.emf.examples-feature" releng/org.eclipse.emf.parent/features
-%pom_disable_module "../../../../org.eclipse.xsd/features/org.eclipse.xsd.example-feature" releng/org.eclipse.emf.parent/features
-sed -i -e '/<module>.*examples/d' releng/org.eclipse.emf.parent/plugins/pom.xml
-%pom_xpath_remove "plugin[@id='org.eclipse.emf.test.examples']" tests/org.eclipse.emf.tests-feature/feature.xml
-
-# Disable modules unneeded for tycho build
-%pom_disable_module "tp" releng/org.eclipse.emf.parent
-%pom_disable_module "../org.eclipse.emf.site" releng/org.eclipse.emf.parent
-%pom_disable_module '../../../features/org.eclipse.emf.all-feature' releng/org.eclipse.emf.parent/features
-
-# Disable test modules
-sed -i -e '/\/tests\//d' releng/org.eclipse.emf.parent/{features,plugins}/pom.xml
-
-# Disable jgit/target platform stuff that we can't use in RPM builds
-%pom_remove_plugin :target-platform-configuration releng/org.eclipse.emf.parent
-%pom_remove_dep :tycho-sourceref-jgit releng/org.eclipse.emf.parent
-%pom_remove_dep :tycho-buildtimestamp-jgit releng/org.eclipse.emf.parent
-%pom_xpath_remove 'pom:configuration/pom:timestampProvider' releng/org.eclipse.emf.parent
-%pom_xpath_remove 'pom:configuration/pom:jgit.ignore' releng/org.eclipse.emf.parent
-%pom_xpath_remove 'pom:configuration/pom:jgit.dirtyWorkingTree' releng/org.eclipse.emf.parent
-%pom_xpath_remove 'pom:configuration/pom:sourceReferences' releng/org.eclipse.emf.parent
-
-%if %{with bootstrap}
-# Only build core modules when bootstrapping
-%pom_xpath_replace "pom:modules" "<modules>
-<module>../../../features/org.eclipse.emf.base-feature</module>
-<module>../../../features/org.eclipse.emf.license-feature</module>
-<module>../../../features/org.eclipse.emf.common-feature</module>
-<module>../../../features/org.eclipse.emf.ecore-feature</module>
-</modules>" releng/org.eclipse.emf.parent/features
-%pom_xpath_replace "pom:modules" "<modules>
-<module>../../../plugins/org.eclipse.emf.common</module>
-<module>../../../plugins/org.eclipse.emf.ecore.change</module>
-<module>../../../plugins/org.eclipse.emf.ecore.xmi</module>
-<module>../../../plugins/org.eclipse.emf.ecore</module>
-</modules>" releng/org.eclipse.emf.parent/plugins
-%endif
-
-popd
-
-# Don't install poms or license features
-%mvn_package "::pom::" __noinstall
-%mvn_package ":org.eclipse.{emf,xsd}.license" __noinstall
-%mvn_package ":org.eclipse.emf.base" __noinstall
-
-# Don't install SDK features
-%mvn_package ":::{sources,sources-feature}:" __noinstall
-%mvn_package ":org.eclipse.emf.{sdk,doc,cheatsheets,example.installer}" __noinstall
-%mvn_package ":org.eclipse.xsd.{sdk,doc,cheatsheets,example.installer}" __noinstall
-
-%mvn_package "org.eclipse.emf.features:org.eclipse.emf.{base,common,ecore}"
-%mvn_package "org.eclipse.emf:org.eclipse.emf.{common,ecore,ecore.change,ecore.xmi}"
-%mvn_package ":org.eclipse.xsd*" xsd
-%mvn_package ":org.eclipse.emf.mapping.xsd**" xsd
-%mvn_package ":" runtime
-
-%build
-# Qualifier generated from last modification time of source tarball
-QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
-%mvn_build -f -j -- -f org.eclipse.emf/pom.xml -DforceContextQualifier=$QUALIFIER \
- -Dtarget-platform=2021-03
-
-%install
-%mvn_install
-
-# Move to libdir due to being part of core platform
-install -d -m 755 %{buildroot}%{_eclipsedir}
-mv %{buildroot}%{_datadir}/eclipse/droplets/emf/{plugins,features} %{buildroot}%{_eclipsedir}
-rm -r %{buildroot}%{_datadir}/eclipse/droplets/emf
-
-# Fixup metadata
-sed -i -e 's|%{_datadir}/eclipse/droplets/emf|%{_eclipsedir}|' %{buildroot}%{_datadir}/maven-metadata/eclipse-emf.xml
-sed -i -e 's|%{_datadir}/eclipse/droplets/emf/features/|%{_eclipsedir}/features/|' \
- -e 's|%{_datadir}/eclipse/droplets/emf/plugins/|%{_eclipsedir}/plugins/|' .mfiles
-sed -i -e '/droplets/d' .mfiles
-
-# Remove any symlinks that might be created during bootstrapping due to missing platform bundles
-for del in $( (cd %{buildroot}%{_eclipsedir}/plugins && ls | grep -v -e '^org\.eclipse\.emf' ) ) ; do
-rm %{buildroot}%{_eclipsedir}/plugins/$del
-sed -i -e "/$del/d" .mfiles
-done
-
-%files core -f .mfiles
-%license org.eclipse.emf/features/org.eclipse.emf.license-feature/*.html
-
-%if %{without bootstrap}
-%files runtime -f .mfiles-runtime
-
-%files xsd -f .mfiles-xsd
-%endif
-
-%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.25.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Mar 10 2021 Mat Booth <mat.booth(a)redhat.com> - 1:2.25.0-1
-- Update to latest upstream release
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.24.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 13 2021 Mat Booth <mat.booth(a)redhat.com> - 1:2.24.0-1
-- Update to latest upstream release
-
-* Thu Nov 19 2020 Mat Booth <mat.booth(a)redhat.com> - 1:2.23.0-2
-- Obsolete SDK subpackages
-
-* Wed Oct 28 2020 Mat Booth - 1:2.23.0-1
-- Update to latest upstream release
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.22.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 18 2020 Mat Booth <mat.booth(a)redhat.com> - 1:2.22.0-1
-- Update to latest upstream release
-
-* Fri Mar 20 2020 Mat Booth <mat.booth(a)redhat.com> - 1:2.21.0-1
-- Update to latest upstream release
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.20.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 14 2020 Mat Booth <mat.booth(a)redhat.com> - 1:2.20.0-4
-- Use Epoch for all subpackages to avoid repo sanity check failures
-
-* Thu Dec 19 2019 Mat Booth <mat.booth(a)redhat.com> - 2.20.0-3
-- Full build
-
-* Wed Dec 18 2019 Mat Booth <mat.booth(a)redhat.com> - 2.20.0-2
-- Enable bootstrap mode
-
-* Wed Dec 18 2019 Mat Booth <mat.booth(a)redhat.com> - 2.20.0-1
-- Update to latest upstream release
-
-* Fri Sep 13 2019 Mat Booth <mat.booth(a)redhat.com> - 2.19.0-1
-- Update to latest upstream release
-- Don't ship base feature
-
-* Sat Jun 15 2019 Mat Booth <mat.booth(a)redhat.com> - 2.18.0-1
-- Update to latest upstream release
-
-* Wed May 08 2019 Mat Booth <mat.booth(a)redhat.com> - 2.16.0-3
-- Restrict to same architectures as Eclipse itself
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.16.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Dec 04 2018 Mat Booth <mat.booth(a)redhat.com> - 2.16.0-1
-- Update to 2018-12 release
-
-* Mon Aug 20 2018 Mat Booth <mat.booth(a)redhat.com> - 2.15.0-0.3.gitd1e5fdd
-- Non-bootstrap build
-
-* Sun Aug 19 2018 Mat Booth <mat.booth(a)redhat.com> - 2.15.0-0.2.gitd1e5fdd
-- Fix bootstrap build mode
-
-* Fri Aug 17 2018 Mat Booth <mat.booth(a)redhat.com> - 2.15.0-0.1.gitd1e5fdd
-- License correction and update to latest snapshot
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.14.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed May 09 2018 Mat Booth <mat.booth(a)redhat.com> - 2.14.0-1
-- Update to Photon release
-- Add XSD sub-package (in line with upstream's new combined tycho build)
-- Run tests during maven build, no longer any need to package them
-- Also drop examples sub-package
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.13.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.13.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jun 15 2017 Mat Booth <mat.booth(a)redhat.com> - 2.13.0-2
-- Allow conditionally building tests
-- Add a bootstrap mode for building in new buildroots
-
-* Thu Jun 15 2017 Mat Booth <mat.booth(a)redhat.com> - 2.13.0-1
-- Update to Oxygen release
-
-* Tue May 16 2017 Mat Booth <mat.booth(a)redhat.com> - 2.13.0-0.1.git72f1720
-- Update to latest Oxygen snapshot
-
-* Thu Apr 06 2017 Mat Booth <mat.booth(a)redhat.com> - 2.12.0-5
-- Make package noarch now that Eclipse is in the same location on all arches
-- Drop old obsoletes/provides
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Nov 07 2016 Mat Booth <mat.booth(a)redhat.com> - 2.12.0-3
-- Re-add XSD dep
-
-* Mon Nov 07 2016 Mat Booth <mat.booth(a)redhat.com> - 2.12.0-2
-- Set qualifiers to source-modification-time instead of build-time, to eliminate
- descrepancies between architectures
-- Temporarily remove dep on XSD
-
-* Mon Jun 13 2016 Mat Booth <mat.booth(a)redhat.com> - 2.12.0-1
-- Update to Neon release
-
-* Tue May 10 2016 Mat Booth <mat.booth(a)redhat.com> - 2.12.0-0.1.git2021583
-- Update to latest Neon snapshot
-
-* Sat Feb 27 2016 Mat Booth <mat.booth(a)redhat.com> - 2.11.2-1
-- Update to Mars.2 release
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.11.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Sep 28 2015 Mat Booth <mat.booth(a)redhat.com> - 2.11.1-1
-- Update to Mars.1 release
-- Build with maven/tycho
-- Add tests package
-
-* Mon Jun 29 2015 Mat Booth <mat.booth(a)redhat.com> - 2.11.0-4
-- Remove incomplete SCL macros
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.11.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Jun 02 2015 Mat Booth <mat.booth(a)redhat.com> - 2.11.0-2
-- Revert moving bundles into core package
-
-* Tue Jun 02 2015 Mat Booth <mat.booth(a)redhat.com> - 2.11.0-1
-- Update to 2.11.0 release
-- Move extra e4 tools deps into core package
-- Switch to xz tarball
-
-* Sat May 30 2015 Alexander Kurtakov <akurtako(a)redhat.com> 1:2.10.2-2
-- Move emf.edit to core as it's required by e4 now.
-
-* Wed Mar 04 2015 Mat Booth <mat.booth(a)redhat.com> - 2.10.2-1
-- Update to Luna SR2 release
-
-* Thu Nov 20 2014 Mat Booth <mat.booth(a)redhat.com> - 2.10.1-3
-- Qualifier must be same on all arches in archful builds
-
-* Wed Nov 19 2014 Mat Booth <mat.booth(a)redhat.com> - 2.10.1-2
-- Make core package archful so it can be installed into libdir
- where eclipse-platform expects it to be
-- Move eclipse-emf -> eclipse-emf-runtime, this is because we can have
- noarch sub-packages of an archful package, but cannot have archful
- sub-packages of a noarch package
-- Fix some minor rpmlint errors
-
-* Wed Oct 01 2014 Mat Booth <mat.booth(a)redhat.com> - 2.10.1-1
-- Update to Luna SR1 release
-- Drop ancient obsoletes on emf-sdo package
-
-* Wed Jun 25 2014 Mat Booth <mat.booth(a)redhat.com> - 2.10.0-1
-- Update to latest upstream release
-- Fix obsoletes on emf-core package, rhbz #1095431
-- Move edit plugin from core to main package
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.9.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Apr 17 2014 Mat Booth <mat.booth(a)redhat.com> - 2.9.2-2
-- Drop XSD packages, these are now packaged separately
-- Drop ancient obsolete of emf-standalone.
-
-* Wed Mar 12 2014 Mat Booth <fedora(a)matbooth.co.uk> - 2.9.2-1
-- Update to latest upstream, Kepler SR2
-- Drop requires on java, rhbz #1068039
-- Remove unused patch
-- Update project URL
-
-* Mon Sep 30 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.9.1-1
-- Update to latest upstream.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.9.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Jun 21 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.9.0-1
-- Update to Kepler release.
-
-* Fri Jun 21 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.9.0-0.2.git352e28
-- 974108: Remove versions and timestamps from EMF filenames.
-
-* Wed May 1 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.9.0-0.1.git352e28
-- Update to latest upstream.
-
-* Thu Mar 21 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.1-20
-- Initial SCLization.
-
-* Mon Jan 28 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.1-7
-- Really fix RHBZ#894154.
-
-* Thu Jan 17 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.1-6
-- Move emf.edit back to eclipse-emf-core and symlink it.
-
-* Thu Jan 17 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.1-5
-- Fix for RHBZ#894154
-
-* Mon Dec 17 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1:2.8.1-4
-- Remove unneeded things.
-
-* Mon Oct 8 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.1-3
-- Avoid generating automatic OSGi dependencies (yet another attempt).
-
-* Mon Oct 8 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.1-2
-- Avoid generating automatic OSGi dependencies. (fix)
-
-* Mon Oct 1 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.1-1
-- Update to upstream 2.8.1 release
-
-* Wed Sep 12 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.0-17
-- Avoid generating automatic OSGi dependencies.
-
-* Wed Aug 15 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.0-16
-- Removed obsolete.
-
-* Tue Aug 14 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.0-15
-- Moved Obs emf-core to emf-core package.
-- Removed dropins symlinks.
-
-* Tue Aug 14 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:2.8.0-14
-- Added Epoch to eclipse-emf-core.
-- Updated eclipse-pde dependency version to 4.2.0.
-
-* Mon Aug 13 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-13
-- Move emf.edit to eclipse-emf-core.
-
-* Fri Aug 10 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-12
-- Lower eclipse-platform version requirement (CBI Eclipse is not in yet).
-
-* Fri Aug 10 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-11
-- Get rid off conflicts clause.
-
-* Thu Aug 2 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-10
-- Moving core back to emf package (for CBI build).
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jul 10 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-1
-- Update to upstream Juno.
-
-* Mon May 7 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-0.7.e674bb28ad412fc9bc786f2f9b3c157eb2cbdae0
-- Update to M7.
-
-* Mon Apr 16 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-0.6.postM6
-- Bugs 812870, 812872 - fix building index for documentation.
-
-* Tue Apr 10 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-0.5.postM6
-- Remove %%clean section.
-- Remove duplicated plugins.
-
-* Mon Apr 2 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-0.4.postM6
-- Use %%{bindir}/eclipse-pdebuild.
-
-* Thu Mar 29 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-0.3.postM6
-- Back noarch.
-- Use the eclipse-emf-core from main eclipse-emf.
-
-* Thu Mar 29 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-0.2.postM6
-- Removed the noarch tag.
-
-* Thu Mar 29 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.8.0-0.1.postM6
-- Update to latest upstream version.
-- Package eclipse-emf-core created for the need of Eclipse 4.2.
-- Removed usage of Eclipse reconciler script.
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Nov 29 2011 Jeff Johnston <jjohnstn(a)redhat.com> 2.7.1-1
-- Update to 2.7.1.
-- Add rhel flags.
-
-* Wed Oct 5 2011 Sami Wagiaalla <swagiaal(a)redhat.com> 2.7.0-2
-- Use the reconciler to install/uninstall plugins during rpm
- post and postun respectively.
-
-* Thu Sep 15 2011 Roland Grunberg <rgrunber(a)redhat.com> 2.7.0-1
-- Update to 2.7.0.
-- Re-apply necessary patches, content-handler error fixed upstream.
-- licenses now exist in org.eclipse.{emf,xsd}.license-feature only.
-
-* Wed Sep 14 2011 Roland Grunberg <rgrunber(a)redhat.com> 2.6.1-2
-- Fix RHBZ #716165 using old patches.
-- Fix ContentHandler casting issue.
-
-* Fri Mar 18 2011 Mat Booth <fedora(a)matbooth.co.uk> 2.6.1-1
-- Update to 2.6.1.
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jul 19 2010 Charley Wang <chwang(a)redhat.com> - 2.6.0-1
-- Update to 2.6.0
-
-* Sat Sep 19 2009 Mat Booth <fedora(a)matbooth.co.uk> - 2.5.0-4
-- Re-enable jar repacking now that RHBZ #461854 has been resolved.
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jul 02 2009 Mat Booth <fedora(a)matbooth.co.uk> 2.5.0-2
-- SDK requires PDE for example plug-in projects.
-
-* Sun Jun 28 2009 Mat Booth <fedora(a)matbooth.co.uk> 2.5.0-1
-- Update to 2.5.0 final release (Galileo).
-- Build the features seperately to allow for a saner %%files section.
-
-* Fri May 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 2.5.0-0.2.RC1
-- Update to 2.5.0 RC1.
-- Use %%global instead of %%define.
-
-* Sat Apr 18 2009 Mat Booth <fedora(a)matbooth.co.uk> 2.5.0-0.1.M6
-- Update to Milestone 6 release of 2.5.0.
-- Require Eclipse 3.5.0.
-
-* Tue Apr 7 2009 Alexander Kurtakov <akurtako(a)redhat.com> 2.4.2-3
-- Fix directory ownership.
-
-* Mon Mar 23 2009 Alexander Kurtakov <akurtako(a)redhat.com> 2.4.2-2
-- Rebuild to not ship p2 context.xml.
-- Remove context.xml from %%files section.
-
-* Sat Feb 28 2009 Mat Booth <fedora(a)matbooth.co.uk> 2.4.2-1
-- Update for Ganymede SR2.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 03 2009 Mat Booth <fedora(a)matbooth.co.uk> 2.4.1-4
-- Make context qualifier the same as upstream.
-
-* Sat Jan 10 2009 Mat Booth <fedora(a)matbooth.co.uk> 2.4.1-3
-- Removed AOT bits and change package names to what they used to be.
-- Obsolete standalone package.
-
-* Tue Dec 23 2008 Mat Booth <fedora(a)matbooth.co.uk> 2.4.1-2
-- Build example installer plugins using the source from the tarball instead of
- trying to get the examples from source control a second time.
-
-* Fri Dec 12 2008 Mat Booth <fedora(a)matbooth.co.uk> 2.4.1-1
-- Initial release, based on eclipse-gef spec file, but with disabled AOT
- compiled bits because of RHBZ #477707.
diff --git a/sources b/sources
deleted file mode 100644
index 6965379..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA512 (org.eclipse.emf-ddba8b9fe0208481dc3d73ccc692d5c346ea6bae.tar.xz) = b83150c7d386ab8ab2d9289b074a6c45f6342aa58805a637ae7e50a0c631a661868922ede75a465441585be78e80efe6d16f92ba26cfa3261ab7210dc7d5e1b4
-SHA512 (org.eclipse.xsd-2853b57a053beff82e8160c5827d7d92c7aff3f8.tar.xz) = 46334ea03d580b2a4a0932dade373cfb3578ec6391c3eb3e6b15ba7b130c997959db3b16db6f93daa8cb0e09f8f2d67844ae670196a77013992de04cd9fe47dd
2 years, 8 months
- 1
- 0