From f5f4e0d12d84591cb9b8250a4b131e545ede740c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 3 Nov 2016 09:20:03 +0000 Subject: [PATCH 01/20] Update to latest upstream release --- sources | 2 +- tycho-extras.spec | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sources b/sources index ba83cd7..8ed2025 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e294f3459b0e5b29dc6ff4478b0f8f9b org.eclipse.tycho.extras-tycho-extras-0.25.0.tar.xz +32ba4b4c6d4b47e11d95ed9fce007176 org.eclipse.tycho.extras-tycho-extras-0.26.0.tar.xz diff --git a/tycho-extras.spec b/tycho-extras.spec index 16977be..ebde537 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,8 +3,8 @@ %global snap %{nil} Name: tycho-extras -Version: 0.25.0 -Release: 4%{?dist} +Version: 0.26.0 +Release: 1%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -18,16 +18,27 @@ Patch3: fix-xmvn-pomless-builddep.patch BuildArch: noarch -BuildRequires: jgit BuildRequires: maven-local -BuildRequires: tycho >= %{version} BuildRequires: mvn(io.takari.polyglot:polyglot-common) BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.maven:maven-archiver) +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-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.eclipse.jgit:org.eclipse.jgit) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.eclipse.tycho:org.eclipse.tycho.core.shared) +BuildRequires: mvn(org.eclipse.tycho:org.eclipse.tycho.p2.resolver.shared) +BuildRequires: mvn(org.eclipse.tycho:sisu-equinox-launching) +BuildRequires: mvn(org.eclipse.tycho:tycho-core) +BuildRequires: mvn(org.eclipse.tycho:tycho-p2-facade) +BuildRequires: mvn(org.eclipse.tycho:tycho-packaging-plugin) +BuildRequires: mvn(org.fedoraproject.p2:org.fedoraproject.p2) Obsoletes: tycho-pomless < 0.0.1-0.4 @@ -77,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Wed Nov 02 2016 Mat Booth - 0.26.0-1 +- Update to latest upstream release + * Mon Jul 4 2016 Alexander Kurtakov 0.25.0-4 - Add patch to fix NPE in xmvn builddep. From d79c6c2cd58bfa0070d0c00530062af616ae8a87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:34:06 +0000 Subject: [PATCH 02/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- tycho-extras.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index ebde537..27f6ba8 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -4,7 +4,7 @@ Name: tycho-extras Version: 0.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.26.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Nov 02 2016 Mat Booth - 0.26.0-1 - Update to latest upstream release From 320a50a5f291e4e169d63ce2222d6296cd1682d0 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 26 Apr 2017 21:14:08 +0100 Subject: [PATCH 03/20] Update to 1.0.0 --- fix-xmvn-pomless-builddep.patch | 6 +++--- sources | 2 +- tycho-extras.spec | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fix-xmvn-pomless-builddep.patch b/fix-xmvn-pomless-builddep.patch index 8990569..8718af3 100644 --- a/fix-xmvn-pomless-builddep.patch +++ b/fix-xmvn-pomless-builddep.patch @@ -24,7 +24,7 @@ index 349c776..e8a4f92 100644 import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.building.ModelProcessor; -@@ -80,6 +82,7 @@ +@@ -81,6 +83,7 @@ String bundleVersion = getRequiredHeaderValue("Bundle-Version", headers, manifestFile); model.setVersion(getPomVersion(bundleVersion)); model.setPackaging(getPackagingType(bundleSymbolicName)); @@ -32,7 +32,7 @@ index 349c776..e8a4f92 100644 return model; } -@@ -108,6 +111,7 @@ +@@ -109,6 +112,7 @@ model.setVersion(getPomVersion(featureVersionNode.getValue())); model.setPackaging("eclipse-feature"); // groupId is inherited from parent pom @@ -40,7 +40,7 @@ index 349c776..e8a4f92 100644 return model; } -@@ -191,4 +195,11 @@ +@@ -192,4 +196,11 @@ parentReference.setVersion(version); return parentReference; } diff --git a/sources b/sources index 8ed2025..152e9df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -32ba4b4c6d4b47e11d95ed9fce007176 org.eclipse.tycho.extras-tycho-extras-0.26.0.tar.xz +SHA512 (org.eclipse.tycho.extras-tycho-extras-1.0.0.tar.xz) = a09620162b97ceaf0e3dbf4237e8a03886b4226884700970e9d410b2d81b60a5c91de11e2de235fa53efc56123e418cab25c30facfb56156c8c3e58b0b81f8fc diff --git a/tycho-extras.spec b/tycho-extras.spec index 27f6ba8..c42cf43 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,8 +3,8 @@ %global snap %{nil} Name: tycho-extras -Version: 0.26.0 -Release: 2%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Thu Apr 20 2017 Mat Booth - 1.0.0-1 +- Update to 1.0.0 + * Sat Feb 11 2017 Fedora Release Engineering - 0.26.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 329f68dbec2dcf9fb70150e14f6360e607dba22a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:49:50 +0000 Subject: [PATCH 04/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- tycho-extras.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index c42cf43..7949c2d 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -4,7 +4,7 @@ Name: tycho-extras Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Apr 20 2017 Mat Booth - 1.0.0-1 - Update to 1.0.0 From 056812a752cef9140a4715a1cd702ae9b092a2eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:48:10 +0000 Subject: [PATCH 05/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tycho-extras.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 7949c2d..f078d27 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -4,7 +4,7 @@ Name: tycho-extras Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bdaa70d280d3d8e878678e664cb8cb1c3e6b01cf Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 2 May 2018 22:45:41 +0100 Subject: [PATCH 06/20] Update to latest upstream release --- fix-xmvn-pomless-builddep.patch | 116 ++++++++++++------------- sources | 2 +- tycho-extras-fix-build.patch | 2 +- tycho-extras-use-custom-resolver.patch | 4 +- tycho-extras.spec | 7 +- 5 files changed, 67 insertions(+), 64 deletions(-) diff --git a/fix-xmvn-pomless-builddep.patch b/fix-xmvn-pomless-builddep.patch index 8718af3..582f6d6 100644 --- a/fix-xmvn-pomless-builddep.patch +++ b/fix-xmvn-pomless-builddep.patch @@ -15,16 +15,16 @@ diff --git a/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelRea index 349c776..e8a4f92 100644 --- a/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java +++ b/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java -@@ -24,6 +24,8 @@ +@@ -26,6 +26,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.apache.maven.model.InputLocation; +import org.apache.maven.model.InputSource; + import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; - import org.apache.maven.model.building.ModelProcessor; -@@ -81,6 +83,7 @@ +@@ -90,6 +92,7 @@ String bundleVersion = getRequiredHeaderValue("Bundle-Version", headers, manifestFile); model.setVersion(getPomVersion(bundleVersion)); model.setPackaging(getPackagingType(bundleSymbolicName)); @@ -32,15 +32,15 @@ index 349c776..e8a4f92 100644 return model; } -@@ -109,6 +112,7 @@ - model.setVersion(getPomVersion(featureVersionNode.getValue())); - model.setPackaging("eclipse-feature"); +@@ -150,6 +153,7 @@ + } + model.setVersion(getPomVersion(versionNode.getValue())); // groupId is inherited from parent pom -+ setLocation(model, featureXml); ++ setLocation(model, xmlFile); return model; } -@@ -192,4 +196,11 @@ +@@ -247,4 +251,11 @@ parentReference.setVersion(version); return parentReference; } @@ -57,53 +57,53 @@ index 05cf0c2..a40e738 100644 --- a/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java +++ b/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java @@ -19,6 +19,8 @@ - import java.util.HashMap; - import java.util.Map; - -+import org.apache.maven.model.InputLocation; -+import org.apache.maven.model.InputSource; - import org.apache.maven.model.Model; - import org.apache.maven.model.Parent; - import org.apache.maven.model.building.ModelProcessor; -@@ -43,6 +45,7 @@ - assertEquals("0.1.0-SNAPSHOT", model.getVersion()); - assertEquals("eclipse-plugin", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("bundle1/META-INF/MANIFEST.MF", model.getLocation("")); - } - - public void testReadTestBundle() throws Exception { -@@ -52,6 +55,7 @@ - assertEquals("1.0.1", model.getVersion()); - assertEquals("eclipse-test-plugin", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("bundle1.tests/META-INF/MANIFEST.MF", model.getLocation("")); - } - - public void testReadFeature() throws Exception { -@@ -61,6 +65,7 @@ - assertEquals("1.0.0-SNAPSHOT", model.getVersion()); - assertEquals("eclipse-feature", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("feature/feature.xml", model.getLocation("")); - } - - public void testMissingManifestOrFeature() throws Exception { -@@ -148,6 +153,17 @@ - assertEquals("0.0.1-SNAPSHOT", parent.getVersion()); - } - -+ private void assertLocation(String expectedLocation, InputLocation location) { -+ assertNotNull(location); -+ assertEquals(0, location.getLineNumber()); -+ assertEquals(0, location.getColumnNumber()); -+ InputSource source = location.getSource(); -+ assertNotNull(source); -+ assertEquals(new File(getPolyglotTestDir(), expectedLocation).toString(), source.getLocation()); -+ assertNotNull(source.getModelId()); -+ assertTrue(source.getModelId().matches("^testParent.groupId:.*:.*")); -+ } -+ - private Map createReaderOptions(File buildProperties) { - Map options = new HashMap<>(); - options.put(ModelProcessor.SOURCE, buildProperties.getAbsolutePath()); + import java.util.HashMap; + import java.util.Map; + ++import org.apache.maven.model.InputLocation; ++import org.apache.maven.model.InputSource; + import org.apache.maven.model.Model; + import org.apache.maven.model.Parent; + import org.apache.maven.model.building.ModelProcessor; +@@ -45,6 +47,7 @@ + assertEquals("0.1.0-SNAPSHOT", model.getVersion()); + assertEquals("eclipse-plugin", model.getPackaging()); + assertParent(model.getParent()); ++ assertLocation("bundle1/META-INF/MANIFEST.MF", model.getLocation("")); + } + + @Test +@@ -55,6 +58,7 @@ + assertEquals("1.0.1", model.getVersion()); + assertEquals("eclipse-test-plugin", model.getPackaging()); + assertParent(model.getParent()); ++ assertLocation("bundle1.tests/META-INF/MANIFEST.MF", model.getLocation("")); + } + + @Test +@@ -65,6 +69,7 @@ + assertEquals("1.0.0-SNAPSHOT", model.getVersion()); + assertEquals("eclipse-feature", model.getPackaging()); + assertParent(model.getParent()); ++ assertLocation("feature/feature.xml", model.getLocation("")); + } + + @Test +@@ -204,6 +209,17 @@ + assertEquals("0.0.1-SNAPSHOT", parent.getVersion()); + } + ++ private void assertLocation(String expectedLocation, InputLocation location) { ++ assertNotNull(location); ++ assertEquals(0, location.getLineNumber()); ++ assertEquals(0, location.getColumnNumber()); ++ InputSource source = location.getSource(); ++ assertNotNull(source); ++ assertEquals(new File(getPolyglotTestDir(), expectedLocation).toString(), source.getLocation()); ++ assertNotNull(source.getModelId()); ++ assertTrue(source.getModelId().matches("^testParent.groupId:.*:.*")); ++ } ++ + private Map createReaderOptions(File buildProperties) { + Map options = new HashMap<>(); + options.put(ModelProcessor.SOURCE, buildProperties.getAbsolutePath()); diff --git a/sources b/sources index 152e9df..3a68540 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.tycho.extras-tycho-extras-1.0.0.tar.xz) = a09620162b97ceaf0e3dbf4237e8a03886b4226884700970e9d410b2d81b60a5c91de11e2de235fa53efc56123e418cab25c30facfb56156c8c3e58b0b81f8fc +SHA512 (org.eclipse.tycho.extras-tycho-extras-1.1.0.tar.xz) = 814aa2f5f6f6c8c12068143f1692d48d0ebacf31bfaa3600f753a4a901ed4247a47397553e9c258c28286afbff68c50b311d558101bd0f2a0bff539db69c8367 diff --git a/tycho-extras-fix-build.patch b/tycho-extras-fix-build.patch index beb06c5..6ccfef3 100644 --- a/tycho-extras-fix-build.patch +++ b/tycho-extras-fix-build.patch @@ -2,7 +2,7 @@ diff --git a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/ index 05baf87..2c62fb0 100644 --- a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java +++ b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -@@ -515,15 +515,19 @@ public class SourceFeatureMojo extends AbstractMojo { +@@ -549,15 +549,19 @@ public class SourceFeatureMojo extends AbstractMojo { } private String getAttribute(PlexusConfiguration dom, String attrName) { diff --git a/tycho-extras-use-custom-resolver.patch b/tycho-extras-use-custom-resolver.patch index e5bc919..6637225 100644 --- a/tycho-extras-use-custom-resolver.patch +++ b/tycho-extras-use-custom-resolver.patch @@ -24,7 +24,7 @@ index 4c4baf0..18db847 100644 import java.util.ArrayList; import java.util.List; import java.util.Map; -@@ -51,6 +52,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver; +@@ -52,6 +53,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; @@ -32,7 +32,7 @@ index 4c4baf0..18db847 100644 /** * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is -@@ -187,6 +189,14 @@ public class EclipseRunMojo extends AbstractMojo { +@@ -225,6 +227,14 @@ public class EclipseRunMojo extends AbstractMojo { TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub(); // we want to resolve from remote repos only tpConfiguration.setForceIgnoreLocalArtifacts(true); diff --git a/tycho-extras.spec b/tycho-extras.spec index f078d27..324fb54 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,8 +3,8 @@ %global snap %{nil} Name: tycho-extras -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Wed May 02 2018 Mat Booth - 1.1.0-1 +- Update to latest upstream release + * Fri Feb 09 2018 Fedora Release Engineering - 1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e23a4939b7e8c8e3d7ff00ee8c0ad30fbb6b2187 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 5 Jun 2018 16:48:09 +0100 Subject: [PATCH 07/20] Update to latest release --- sources | 2 +- tycho-extras.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3a68540..af8bf67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.tycho.extras-tycho-extras-1.1.0.tar.xz) = 814aa2f5f6f6c8c12068143f1692d48d0ebacf31bfaa3600f753a4a901ed4247a47397553e9c258c28286afbff68c50b311d558101bd0f2a0bff539db69c8367 +SHA512 (org.eclipse.tycho.extras-tycho-extras-1.2.0.tar.xz) = f5616398f101e2550ed1fad71dbe75a9a86c7142e4200efedda68a0981f6f6cbae57c8f392ccb643126c1610a2ca591e70d964b864b89d3acfe2dc2adfbbe61a diff --git a/tycho-extras.spec b/tycho-extras.spec index 324fb54..7b65061 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,7 +3,7 @@ %global snap %{nil} Name: tycho-extras -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: Additional plugins for Tycho @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Tue Jun 05 2018 Mat Booth - 1.2.0-1 +- Update to latest release + * Wed May 02 2018 Mat Booth - 1.1.0-1 - Update to latest upstream release From 145f86fc11d3ed6c9eff0196a1de9c1da9bd1097 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:05:33 +0000 Subject: [PATCH 08/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tycho-extras.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 7b65061..cfb20de 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -4,7 +4,7 @@ Name: tycho-extras Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for Tycho License: EPL @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 05 2018 Mat Booth - 1.2.0-1 - Update to latest release From d5c09dd366c9b4b139ca2bcbac2dce84d370ef44 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 17 Aug 2018 15:02:14 +0100 Subject: [PATCH 09/20] License correction --- tycho-extras.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index cfb20de..2d64084 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -4,10 +4,10 @@ Name: tycho-extras Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Additional plugins for Tycho -License: EPL +License: EPL-1.0 URL: http://eclipse.org/tycho/ Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-%{version}.tar.xz Patch0: %{name}-fix-build.patch @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Fri Aug 17 2018 Mat Booth - 1.2.0-3 +- License correction + * Sat Jul 14 2018 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 76895b0c3368a53bafe0f6426488124e2605ab4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:35:39 +0000 Subject: [PATCH 10/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tycho-extras.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 2d64084..9bb1835 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -4,7 +4,7 @@ Name: tycho-extras Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -88,6 +88,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Aug 17 2018 Mat Booth - 1.2.0-3 - License correction From 11a292d42b452b0def9bfebf473c08cd9576d562 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 19 Feb 2019 18:14:40 +0000 Subject: [PATCH 11/20] Update to latest upstream release --- sources | 2 +- tycho-extras.spec | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sources b/sources index af8bf67..848a6ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.tycho.extras-tycho-extras-1.2.0.tar.xz) = f5616398f101e2550ed1fad71dbe75a9a86c7142e4200efedda68a0981f6f6cbae57c8f392ccb643126c1610a2ca591e70d964b864b89d3acfe2dc2adfbbe61a +SHA512 (org.eclipse.tycho.extras-tycho-extras-1.3.0.tar.xz) = efb0af6e8d4d7275b1f7b109edc129f8bc3958b915368554afb0356acd04e06e8a40bc5e1ee32389a30a8ad778a59f2280eeb9909ec39ff25128deeb102ff13b diff --git a/tycho-extras.spec b/tycho-extras.spec index 9bb1835..944095f 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,8 +3,8 @@ %global snap %{nil} Name: tycho-extras -Version: 1.2.0 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -12,9 +12,8 @@ URL: http://eclipse.org/tycho/ Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-%{version}.tar.xz Patch0: %{name}-fix-build.patch Patch1: %{name}-use-custom-resolver.patch -Patch2: tycho-maven-archiver-3.0.1.patch #https://git.eclipse.org/r/#/c/75453/ -Patch3: fix-xmvn-pomless-builddep.patch +Patch2: fix-xmvn-pomless-builddep.patch BuildArch: noarch @@ -40,8 +39,6 @@ BuildRequires: mvn(org.eclipse.tycho:tycho-p2-facade) BuildRequires: mvn(org.eclipse.tycho:tycho-packaging-plugin) BuildRequires: mvn(org.fedoraproject.p2:org.fedoraproject.p2) -Obsoletes: tycho-pomless < 0.0.1-0.4 - %description A small set of plugins that work with Tycho to provide additional functionality when building projects of an OSGi nature. @@ -57,8 +54,10 @@ This package contains the API documentation for %{name}. %setup -q -n org.eclipse.tycho.extras-tycho-extras-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p0 -%patch3 -p1 +%patch2 -p1 + +# Plugins not needed for RPM builds +%pom_remove_plugin :maven-site-plugin # maven-properties-plugin is only needed for tests %pom_remove_plugin org.eclipse.m2e:lifecycle-mapping @@ -88,6 +87,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmv %files javadoc -f .mfiles-javadoc %changelog +* Tue Feb 19 2019 Mat Booth - 1.3.0-1 +- Update to latest upstream release + * Sun Feb 03 2019 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0dda1b51f75eb4c3f67151095f4f580840d91fad Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 12 Mar 2019 13:48:51 +0000 Subject: [PATCH 12/20] Make installation more portable --- tycho-extras.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 944095f..d838827 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -1,10 +1,9 @@ -# When building version under development (non-release) -# %%global snap -SNAPSHOT -%global snap %{nil} +# 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) Name: tycho-extras Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -77,16 +76,19 @@ This package contains the API documentation for %{name}. %mvn_install # Install extension JAR with deps into XMvn ext directory -install -d -m 755 %{buildroot}%{_datadir}/xmvn/lib/ext/ -ln -s %{_javadir}/%{name}/tycho-pomless.jar %{buildroot}%{_datadir}/xmvn/lib/ext/ -ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{_datadir}/xmvn/lib/ext/ +install -d -m 755 %{buildroot}%{xmvn_libdir}/ext/ +ln -s %{_javadir}/%{name}/tycho-pomless.jar %{buildroot}%{xmvn_libdir}/ext/ +ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ext/ %files -f .mfiles -%{_datadir}/xmvn/lib/ext/* +%{xmvn_libdir}/ext/* %files javadoc -f .mfiles-javadoc %changelog +* Tue Mar 12 2019 Mat Booth - 1.3.0-2 +- Make installation more portable + * Tue Feb 19 2019 Mat Booth - 1.3.0-1 - Update to latest upstream release From 73c6aea2295806509d48264fa89e8251f95546e0 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 19 Mar 2019 21:07:10 +0000 Subject: [PATCH 13/20] Restrict to same architectures as Eclipse itself --- tycho-extras.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index d838827..2702d30 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,7 +3,7 @@ Name: tycho-extras Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -14,7 +14,10 @@ Patch1: %{name}-use-custom-resolver.patch #https://git.eclipse.org/r/#/c/75453/ Patch2: fix-xmvn-pomless-builddep.patch -BuildArch: noarch +BuildArch: noarch + +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} BuildRequires: maven-local BuildRequires: mvn(io.takari.polyglot:polyglot-common) @@ -86,6 +89,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ %files javadoc -f .mfiles-javadoc %changelog +* Tue Mar 19 2019 Mat Booth - 1.3.0-3 +- Restrict to same architectures as Eclipse itself + * Tue Mar 12 2019 Mat Booth - 1.3.0-2 - Make installation more portable From 716082d1ec899227888054cfda773d2c2a0054ec Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 23 May 2019 21:32:51 +0100 Subject: [PATCH 14/20] Don't build plug-ins we can't use during RPM builds --- tycho-extras.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 2702d30..4d367bd 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,7 +3,7 @@ Name: tycho-extras Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -31,11 +31,11 @@ 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.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.eclipse.jgit:org.eclipse.jgit) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.eclipse.tycho:org.eclipse.tycho.core.shared) BuildRequires: mvn(org.eclipse.tycho:org.eclipse.tycho.p2.resolver.shared) BuildRequires: mvn(org.eclipse.tycho:sisu-equinox-launching) +BuildRequires: mvn(org.eclipse.tycho:tycho-artifactcomparator) BuildRequires: mvn(org.eclipse.tycho:tycho-core) BuildRequires: mvn(org.eclipse.tycho:tycho-p2-facade) BuildRequires: mvn(org.eclipse.tycho:tycho-packaging-plugin) @@ -68,6 +68,10 @@ This package contains the API documentation for %{name}. %pom_remove_dep org.apache.maven:apache-maven tycho-p2-extras-plugin %pom_add_dep org.fedoraproject.p2:org.fedoraproject.p2 tycho-eclipserun-plugin/pom.xml +# Tycho plug-ins not needed for RPM builds of Eclipse plug-ins +%pom_disable_module tycho-buildtimestamp-jgit +%pom_disable_module tycho-sourceref-jgit + %mvn_alias :{*} org.eclipse.tycho:@1 %build @@ -89,6 +93,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ %files javadoc -f .mfiles-javadoc %changelog +* Thu May 23 2019 Mat Booth - 1.3.0-4 +- Don't build plug-ins we can't use during RPM builds + * Tue Mar 19 2019 Mat Booth - 1.3.0-3 - Restrict to same architectures as Eclipse itself From 0b3ba152efaf1d71fe6001fef9b15ec35e246769 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 30 May 2019 16:43:57 +0100 Subject: [PATCH 15/20] Update to latest upstream release --- sources | 2 +- tycho-extras-fix-build.patch | 2 +- tycho-extras.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 848a6ed..8d6fd45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.tycho.extras-tycho-extras-1.3.0.tar.xz) = efb0af6e8d4d7275b1f7b109edc129f8bc3958b915368554afb0356acd04e06e8a40bc5e1ee32389a30a8ad778a59f2280eeb9909ec39ff25128deeb102ff13b +SHA512 (org.eclipse.tycho.extras-tycho-extras-1.4.0.tar.xz) = e3d9d19e0b199449f22dcf9b357f51bf96c01d8396b4624f12b934057d4551a95de8abf0bbef7efc788961cde3c2123f7eae2eef602c7e6b632613004c29a932 diff --git a/tycho-extras-fix-build.patch b/tycho-extras-fix-build.patch index 6ccfef3..7b9a374 100644 --- a/tycho-extras-fix-build.patch +++ b/tycho-extras-fix-build.patch @@ -2,7 +2,7 @@ diff --git a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/ index 05baf87..2c62fb0 100644 --- a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java +++ b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -@@ -549,15 +549,19 @@ public class SourceFeatureMojo extends AbstractMojo { +@@ -551,15 +551,19 @@ public class SourceFeatureMojo extends AbstractMojo { } private String getAttribute(PlexusConfiguration dom, String attrName) { diff --git a/tycho-extras.spec b/tycho-extras.spec index 4d367bd..ecfdf75 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -2,8 +2,8 @@ %global xmvn_libdir %(realpath $(dirname $(readlink -f $(which xmvn)))/../lib) Name: tycho-extras -Version: 1.3.0 -Release: 4%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -93,6 +93,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ %files javadoc -f .mfiles-javadoc %changelog +* Thu May 30 2019 Mat Booth - 1.4.0-1 +- Update to latest upstream release + * Thu May 23 2019 Mat Booth - 1.3.0-4 - Don't build plug-ins we can't use during RPM builds From c0e7087959073236a1bf051f7f1b661a6d8c8e91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:14:24 +0000 Subject: [PATCH 16/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tycho-extras.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 2702d30..3d9c725 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,7 +3,7 @@ Name: tycho-extras Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -89,6 +89,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ %files javadoc -f .mfiles-javadoc %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Mar 19 2019 Mat Booth - 1.3.0-3 - Restrict to same architectures as Eclipse itself From 9aedcefb3065f4d6460f206b5eb3c8d39d7499ee Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 18 Dec 2019 11:31:20 +0000 Subject: [PATCH 17/20] Update to latest upstream release --- ...as-fix-build.patch => 0001-Fix-build.patch | 20 +- ...resolver-for-tycho-eclipserun-plugin.patch | 13 +- 0003-Fix-versions-for-release-1.5.1.patch | 263 ++++++++++++++++++ fix-xmvn-pomless-builddep.patch | 109 -------- sources | 2 +- tycho-extras.spec | 14 +- tycho-maven-archiver-3.0.1.patch | 22 -- 7 files changed, 294 insertions(+), 149 deletions(-) rename tycho-extras-fix-build.patch => 0001-Fix-build.patch (68%) rename tycho-extras-use-custom-resolver.patch => 0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch (85%) create mode 100644 0003-Fix-versions-for-release-1.5.1.patch delete mode 100644 fix-xmvn-pomless-builddep.patch delete mode 100644 tycho-maven-archiver-3.0.1.patch diff --git a/tycho-extras-fix-build.patch b/0001-Fix-build.patch similarity index 68% rename from tycho-extras-fix-build.patch rename to 0001-Fix-build.patch index 7b9a374..72f32de 100644 --- a/tycho-extras-fix-build.patch +++ b/0001-Fix-build.patch @@ -1,8 +1,17 @@ +From 2ada1e6b3b86dfd94143fb481bf22592d14fdec7 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Wed, 18 Dec 2019 11:21:19 +0000 +Subject: [PATCH 1/3] Fix build + +--- + .../sourcefeature/SourceFeatureMojo.java | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + diff --git a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -index 05baf87..2c62fb0 100644 +index 4525518..e6dc70e 100644 --- a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java +++ b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -@@ -551,15 +551,19 @@ public class SourceFeatureMojo extends AbstractMojo { +@@ -544,15 +544,19 @@ public class SourceFeatureMojo extends AbstractMojo { } private String getAttribute(PlexusConfiguration dom, String attrName) { @@ -11,14 +20,14 @@ index 05baf87..2c62fb0 100644 - return null; - } - attr = attr.trim(); -- if (attr.length() == 0) { +- if (attr.isEmpty()) { + try { + String attr = dom.getAttribute(attrName); + if (attr == null) { + return null; + } + attr = attr.trim(); -+ if (attr.length() == 0) { ++ if (attr.isEmpty()) { + return null; + } + return attr; @@ -29,3 +38,6 @@ index 05baf87..2c62fb0 100644 } } +-- +2.21.0 + diff --git a/tycho-extras-use-custom-resolver.patch b/0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch similarity index 85% rename from tycho-extras-use-custom-resolver.patch rename to 0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch index 6637225..1a02caf 100644 --- a/tycho-extras-use-custom-resolver.patch +++ b/0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch @@ -1,19 +1,18 @@ -From 1136a52447b28da1dfa29c46b8ba025435a798be Mon Sep 17 00:00:00 2001 +From 827a05ca276cdf123f83562a7d84d66212b61d0b Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Mon, 6 May 2013 14:20:58 -0400 -Subject: [PATCH] Use custom resolver for tycho-eclipserun-plugin. +Subject: [PATCH 2/3] 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-eclipserun-plugin/pom.xml | 5 +++++ - .../org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java | 10 ++++++++++ - 2 files changed, 15 insertions(+) + .../tycho/extras/eclipserun/EclipseRunMojo.java | 10 ++++++++++ + 1 file changed, 10 insertions(+) diff --git a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java -index 4c4baf0..18db847 100644 +index b93e651..4032d10 100644 --- a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java +++ b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java @@ -13,6 +13,7 @@ package org.eclipse.tycho.extras.eclipserun; @@ -48,5 +47,5 @@ index 4c4baf0..18db847 100644 tpConfiguration.addP2Repository(new MavenRepositoryLocation(repository.getId(), repository.getLocation())); } -- -1.9.3 +2.21.0 diff --git a/0003-Fix-versions-for-release-1.5.1.patch b/0003-Fix-versions-for-release-1.5.1.patch new file mode 100644 index 0000000..2efc505 --- /dev/null +++ b/0003-Fix-versions-for-release-1.5.1.patch @@ -0,0 +1,263 @@ +From c50886ff52dba1dc742d68d0eb468d96f43bcb79 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Wed, 18 Dec 2019 11:28:42 +0000 +Subject: [PATCH 3/3] Fix versions for release 1.5.1 + +--- + pack200/pom.xml | 2 +- + pack200/tycho-pack200-impl/pom.xml | 2 +- + pack200/tycho-pack200-its/pom.xml | 2 +- + pack200/tycho-pack200a-plugin/pom.xml | 2 +- + pack200/tycho-pack200b-plugin/pom.xml | 2 +- + pom.xml | 2 +- + target-platform-validation-plugin/pom.xml | 2 +- + tycho-buildtimestamp-jgit/pom.xml | 2 +- + tycho-custom-bundle-plugin/pom.xml | 2 +- + tycho-dependency-tools-plugin/pom.xml | 2 +- + tycho-document-bundle-plugin/pom.xml | 2 +- + tycho-eclipserun-plugin/pom.xml | 2 +- + tycho-extras-its/pom.xml | 2 +- + tycho-p2-extras-plugin/pom.xml | 2 +- + tycho-pomless/pom.xml | 2 +- + tycho-source-feature-plugin/pom.xml | 2 +- + tycho-sourceref-jgit/pom.xml | 2 +- + tycho-version-bump-plugin/pom.xml | 2 +- + 18 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/pack200/pom.xml b/pack200/pom.xml +index c28451e..a2b825c 100644 +--- a/pack200/pom.xml ++++ b/pack200/pom.xml +@@ -16,7 +16,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-pack200 +diff --git a/pack200/tycho-pack200-impl/pom.xml b/pack200/tycho-pack200-impl/pom.xml +index 69f0125..bfc547b 100644 +--- a/pack200/tycho-pack200-impl/pom.xml ++++ b/pack200/tycho-pack200-impl/pom.xml +@@ -15,7 +15,7 @@ + + tycho-pack200 + org.eclipse.tycho.extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + tycho-pack200-impl + +diff --git a/pack200/tycho-pack200-its/pom.xml b/pack200/tycho-pack200-its/pom.xml +index e6baa7c..6f4dbbf 100644 +--- a/pack200/tycho-pack200-its/pom.xml ++++ b/pack200/tycho-pack200-its/pom.xml +@@ -16,7 +16,7 @@ + + org.eclipse.tycho.extras + tycho-pack200 +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-pack200-its +diff --git a/pack200/tycho-pack200a-plugin/pom.xml b/pack200/tycho-pack200a-plugin/pom.xml +index 20ce569..b92cb05 100644 +--- a/pack200/tycho-pack200a-plugin/pom.xml ++++ b/pack200/tycho-pack200a-plugin/pom.xml +@@ -16,7 +16,7 @@ + + org.eclipse.tycho.extras + tycho-pack200 +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-pack200a-plugin +diff --git a/pack200/tycho-pack200b-plugin/pom.xml b/pack200/tycho-pack200b-plugin/pom.xml +index 85161b2..bfc3879 100644 +--- a/pack200/tycho-pack200b-plugin/pom.xml ++++ b/pack200/tycho-pack200b-plugin/pom.xml +@@ -16,7 +16,7 @@ + + tycho-pack200 + org.eclipse.tycho.extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-pack200b-plugin +diff --git a/pom.xml b/pom.xml +index ef94c6b..9e3d7d1 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -16,7 +16,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + pom + + 2010 +diff --git a/target-platform-validation-plugin/pom.xml b/target-platform-validation-plugin/pom.xml +index 80bc37a..89ed7f2 100644 +--- a/target-platform-validation-plugin/pom.xml ++++ b/target-platform-validation-plugin/pom.xml +@@ -16,7 +16,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + target-platform-validation-plugin +diff --git a/tycho-buildtimestamp-jgit/pom.xml b/tycho-buildtimestamp-jgit/pom.xml +index 7a4ff75..121cd11 100644 +--- a/tycho-buildtimestamp-jgit/pom.xml ++++ b/tycho-buildtimestamp-jgit/pom.xml +@@ -15,7 +15,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + tycho-buildtimestamp-jgit + +diff --git a/tycho-custom-bundle-plugin/pom.xml b/tycho-custom-bundle-plugin/pom.xml +index 67dac1c..5f5ac8f 100644 +--- a/tycho-custom-bundle-plugin/pom.xml ++++ b/tycho-custom-bundle-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-custom-bundle-plugin +diff --git a/tycho-dependency-tools-plugin/pom.xml b/tycho-dependency-tools-plugin/pom.xml +index 6766b7a..f03edbb 100644 +--- a/tycho-dependency-tools-plugin/pom.xml ++++ b/tycho-dependency-tools-plugin/pom.xml +@@ -14,7 +14,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-dependency-tools-plugin +diff --git a/tycho-document-bundle-plugin/pom.xml b/tycho-document-bundle-plugin/pom.xml +index 55d3cfa..bd610a7 100644 +--- a/tycho-document-bundle-plugin/pom.xml ++++ b/tycho-document-bundle-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-document-bundle-plugin +diff --git a/tycho-eclipserun-plugin/pom.xml b/tycho-eclipserun-plugin/pom.xml +index cba7373..a76264a 100644 +--- a/tycho-eclipserun-plugin/pom.xml ++++ b/tycho-eclipserun-plugin/pom.xml +@@ -15,7 +15,7 @@ + + tycho-extras + org.eclipse.tycho.extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-eclipserun-plugin +diff --git a/tycho-extras-its/pom.xml b/tycho-extras-its/pom.xml +index 06ca20d..c36fa70 100644 +--- a/tycho-extras-its/pom.xml ++++ b/tycho-extras-its/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-extras-its +diff --git a/tycho-p2-extras-plugin/pom.xml b/tycho-p2-extras-plugin/pom.xml +index 50bf289..06f2a89 100644 +--- a/tycho-p2-extras-plugin/pom.xml ++++ b/tycho-p2-extras-plugin/pom.xml +@@ -16,7 +16,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-p2-extras-plugin +diff --git a/tycho-pomless/pom.xml b/tycho-pomless/pom.xml +index b0e4620..58cdcd7 100644 +--- a/tycho-pomless/pom.xml ++++ b/tycho-pomless/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-pomless +diff --git a/tycho-source-feature-plugin/pom.xml b/tycho-source-feature-plugin/pom.xml +index 6f652fc..4096d5c 100644 +--- a/tycho-source-feature-plugin/pom.xml ++++ b/tycho-source-feature-plugin/pom.xml +@@ -4,7 +4,7 @@ + + tycho-extras + org.eclipse.tycho.extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-source-feature-plugin +diff --git a/tycho-sourceref-jgit/pom.xml b/tycho-sourceref-jgit/pom.xml +index 1f20868..807b3b1 100644 +--- a/tycho-sourceref-jgit/pom.xml ++++ b/tycho-sourceref-jgit/pom.xml +@@ -16,7 +16,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + tycho-sourceref-jgit + +diff --git a/tycho-version-bump-plugin/pom.xml b/tycho-version-bump-plugin/pom.xml +index daed908..d5ccc5a 100644 +--- a/tycho-version-bump-plugin/pom.xml ++++ b/tycho-version-bump-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho.extras + tycho-extras +- 1.5.1-SNAPSHOT ++ 1.5.1 + + + tycho-version-bump-plugin +-- +2.21.0 + diff --git a/fix-xmvn-pomless-builddep.patch b/fix-xmvn-pomless-builddep.patch deleted file mode 100644 index 582f6d6..0000000 --- a/fix-xmvn-pomless-builddep.patch +++ /dev/null @@ -1,109 +0,0 @@ -From d33893c3e3ea8f4be7636439a8f9011bb179a8e9 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 13 Jun 2016 13:14:03 +0200 -Subject: [PATCH] Set location for pomless models - -Core Maven model reader sets location and some tools depend on these -values. These tools won't work with tycho-pomless unless it also sets -the location. - -Signed-off-by: Mikolaj Izdebski -Change-Id: I4da47c995c1333db0bb0ddb31f7309b08bf5ff39 ---- - -diff --git a/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java b/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java -index 349c776..e8a4f92 100644 ---- a/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java -+++ b/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoModelReader.java -@@ -26,6 +26,8 @@ - import javax.xml.parsers.DocumentBuilderFactory; - import javax.xml.parsers.ParserConfigurationException; - -+import org.apache.maven.model.InputLocation; -+import org.apache.maven.model.InputSource; - import org.apache.maven.model.Build; - import org.apache.maven.model.Model; - import org.apache.maven.model.Parent; -@@ -90,6 +92,7 @@ - String bundleVersion = getRequiredHeaderValue("Bundle-Version", headers, manifestFile); - model.setVersion(getPomVersion(bundleVersion)); - model.setPackaging(getPackagingType(bundleSymbolicName)); -+ setLocation(model, manifestFile); - return model; - } - -@@ -150,6 +153,7 @@ - } - model.setVersion(getPomVersion(versionNode.getValue())); - // groupId is inherited from parent pom -+ setLocation(model, xmlFile); - return model; - } - -@@ -247,4 +251,11 @@ - parentReference.setVersion(version); - return parentReference; - } -+ -+ private void setLocation(Model model, File modelSource) { -+ InputSource inputSource = new InputSource(); -+ inputSource.setLocation(modelSource.toString()); -+ inputSource.setModelId(model.getParent().getGroupId() + ":" + model.getArtifactId() + ":" + model.getVersion()); -+ model.setLocation("", new InputLocation(0, 0, inputSource)); -+ } - } -diff --git a/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java b/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java -index 05cf0c2..a40e738 100644 ---- a/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java -+++ b/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java -@@ -19,6 +19,8 @@ - import java.util.HashMap; - import java.util.Map; - -+import org.apache.maven.model.InputLocation; -+import org.apache.maven.model.InputSource; - import org.apache.maven.model.Model; - import org.apache.maven.model.Parent; - import org.apache.maven.model.building.ModelProcessor; -@@ -45,6 +47,7 @@ - assertEquals("0.1.0-SNAPSHOT", model.getVersion()); - assertEquals("eclipse-plugin", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("bundle1/META-INF/MANIFEST.MF", model.getLocation("")); - } - - @Test -@@ -55,6 +58,7 @@ - assertEquals("1.0.1", model.getVersion()); - assertEquals("eclipse-test-plugin", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("bundle1.tests/META-INF/MANIFEST.MF", model.getLocation("")); - } - - @Test -@@ -65,6 +69,7 @@ - assertEquals("1.0.0-SNAPSHOT", model.getVersion()); - assertEquals("eclipse-feature", model.getPackaging()); - assertParent(model.getParent()); -+ assertLocation("feature/feature.xml", model.getLocation("")); - } - - @Test -@@ -204,6 +209,17 @@ - assertEquals("0.0.1-SNAPSHOT", parent.getVersion()); - } - -+ private void assertLocation(String expectedLocation, InputLocation location) { -+ assertNotNull(location); -+ assertEquals(0, location.getLineNumber()); -+ assertEquals(0, location.getColumnNumber()); -+ InputSource source = location.getSource(); -+ assertNotNull(source); -+ assertEquals(new File(getPolyglotTestDir(), expectedLocation).toString(), source.getLocation()); -+ assertNotNull(source.getModelId()); -+ assertTrue(source.getModelId().matches("^testParent.groupId:.*:.*")); -+ } -+ - private Map createReaderOptions(File buildProperties) { - Map options = new HashMap<>(); - options.put(ModelProcessor.SOURCE, buildProperties.getAbsolutePath()); diff --git a/sources b/sources index 8d6fd45..8b31efb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.tycho.extras-tycho-extras-1.4.0.tar.xz) = e3d9d19e0b199449f22dcf9b357f51bf96c01d8396b4624f12b934057d4551a95de8abf0bbef7efc788961cde3c2123f7eae2eef602c7e6b632613004c29a932 +SHA512 (org.eclipse.tycho.extras-tycho-extras-1.5.1.tar.xz) = 3a340a821a5a2224b0bfd25cd04cda0fcfc1a1459ad84019e713a7ae9d19980c8e518ba18cf1f7a9665a57eeeb3f7beef25c24af40164ce9d671955055a65928 diff --git a/tycho-extras.spec b/tycho-extras.spec index ecfdf75..1cc11a4 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -2,17 +2,16 @@ %global xmvn_libdir %(realpath $(dirname $(readlink -f $(which xmvn)))/../lib) Name: tycho-extras -Version: 1.4.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 URL: http://eclipse.org/tycho/ Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-%{version}.tar.xz -Patch0: %{name}-fix-build.patch -Patch1: %{name}-use-custom-resolver.patch -#https://git.eclipse.org/r/#/c/75453/ -Patch2: fix-xmvn-pomless-builddep.patch +Patch0: 0001-Fix-build.patch +Patch1: 0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch +Patch2: 0003-Fix-versions-for-release-1.5.1.patch BuildArch: noarch @@ -47,7 +46,7 @@ when building projects of an OSGi nature. %package javadoc -Summary: Java docs for %{name} +Summary: Javadocs for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -93,6 +92,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ %files javadoc -f .mfiles-javadoc %changelog +* Wed Dec 18 2019 Mat Booth - 1.5.1-1 +- Update to latest upstream release + * Thu May 30 2019 Mat Booth - 1.4.0-1 - Update to latest upstream release diff --git a/tycho-maven-archiver-3.0.1.patch b/tycho-maven-archiver-3.0.1.patch deleted file mode 100644 index e2a2820..0000000 --- a/tycho-maven-archiver-3.0.1.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java.orig 2016-04-14 17:47:08.696823870 +0100 -+++ tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java 2016-04-14 17:47:44.587408737 +0100 -@@ -108,7 +108,7 @@ - archiver.getArchiver().addFileSet(fileSet); - } - -- archiver.createArchive(project, archive); -+ archiver.createArchive(null, project, archive); - - projectHelper.attachArtifact(project, outputJarFile, classifier); - } catch (Exception e) { ---- tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java.orig 2016-04-14 17:55:04.755317466 +0100 -+++ tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java 2016-04-14 17:55:34.339975270 +0100 -@@ -221,7 +221,7 @@ - archiver.getArchiver() - .addArchivedFileSet(licenseFeatureHelper.getLicenseFeatureFileSet(licenseFeature)); - } -- archiver.createArchive(project, archive); -+ archiver.createArchive(null, project, archive); - - projectHelper.attachArtifact(project, outputJarFile, SOURCES_FEATURE_CLASSIFIER); - } catch (MojoExecutionException e) { From 99586fc700a213d5455c38ee23f8a91a28873c80 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 20 Dec 2019 17:12:01 +0000 Subject: [PATCH 18/20] Fix broken symlink for takari-polyglot --- tycho-extras.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 1cc11a4..0fe800f 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,7 +3,7 @@ Name: tycho-extras Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -84,7 +84,7 @@ This package contains the API documentation for %{name}. # Install extension JAR with deps into XMvn ext directory install -d -m 755 %{buildroot}%{xmvn_libdir}/ext/ ln -s %{_javadir}/%{name}/tycho-pomless.jar %{buildroot}%{xmvn_libdir}/ext/ -ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ext/ +ln -s %{_javadir}/takari-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ext/ %files -f .mfiles %{xmvn_libdir}/ext/* @@ -92,6 +92,9 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ %files javadoc -f .mfiles-javadoc %changelog +* Fri Dec 20 2019 Mat Booth - 1.5.1-2 +- Fix broken symlink for takari-polyglot + * Wed Dec 18 2019 Mat Booth - 1.5.1-1 - Update to latest upstream release From 209379374279164e245f2cb6edcc31dd16092025 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:21:42 +0000 Subject: [PATCH 19/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tycho-extras.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tycho-extras.spec b/tycho-extras.spec index 0fe800f..cfe77f3 100644 --- a/tycho-extras.spec +++ b/tycho-extras.spec @@ -3,7 +3,7 @@ Name: tycho-extras Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Additional plugins for Tycho License: EPL-1.0 @@ -92,6 +92,9 @@ ln -s %{_javadir}/takari-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir} %files javadoc -f .mfiles-javadoc %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Dec 20 2019 Mat Booth - 1.5.1-2 - Fix broken symlink for takari-polyglot From 42b22679732e4ce09eeb95dfc88d1976b7acd031 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 20 Mar 2020 13:07:40 +0000 Subject: [PATCH 20/20] This project was merged upstream with the main tycho repo. The tycho-extras RPM was subsumed by the tycho RPM --- .gitignore | 1 - 0001-Fix-build.patch | 43 --- ...resolver-for-tycho-eclipserun-plugin.patch | 51 ---- 0003-Fix-versions-for-release-1.5.1.patch | 263 ------------------ dead.package | 1 + sources | 1 - tycho-extras.spec | 249 ----------------- 7 files changed, 1 insertion(+), 608 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Fix-build.patch delete mode 100644 0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch delete mode 100644 0003-Fix-versions-for-release-1.5.1.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 tycho-extras.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2ef69b3..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org.eclipse.tycho.extras-tycho-extras-*.tar.xz diff --git a/0001-Fix-build.patch b/0001-Fix-build.patch deleted file mode 100644 index 72f32de..0000000 --- a/0001-Fix-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2ada1e6b3b86dfd94143fb481bf22592d14fdec7 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Wed, 18 Dec 2019 11:21:19 +0000 -Subject: [PATCH 1/3] Fix build - ---- - .../sourcefeature/SourceFeatureMojo.java | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -index 4525518..e6dc70e 100644 ---- a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -+++ b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java -@@ -544,15 +544,19 @@ public class SourceFeatureMojo extends AbstractMojo { - } - - private String getAttribute(PlexusConfiguration dom, String attrName) { -- String attr = dom.getAttribute(attrName); -- if (attr == null) { -- return null; -- } -- attr = attr.trim(); -- if (attr.isEmpty()) { -+ try { -+ String attr = dom.getAttribute(attrName); -+ if (attr == null) { -+ return null; -+ } -+ attr = attr.trim(); -+ if (attr.isEmpty()) { -+ return null; -+ } -+ return attr; -+ } catch (Exception e) { - return null; - } -- return attr; - } - - } --- -2.21.0 - diff --git a/0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch b/0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch deleted file mode 100644 index 1a02caf..0000000 --- a/0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 827a05ca276cdf123f83562a7d84d66212b61d0b Mon Sep 17 00:00:00 2001 -From: Roland Grunberg -Date: Mon, 6 May 2013 14:20:58 -0400 -Subject: [PATCH 2/3] 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-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java -index b93e651..4032d10 100644 ---- a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java -+++ b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java -@@ -13,6 +13,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; -@@ -52,6 +53,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 -@@ -225,6 +227,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.21.0 - diff --git a/0003-Fix-versions-for-release-1.5.1.patch b/0003-Fix-versions-for-release-1.5.1.patch deleted file mode 100644 index 2efc505..0000000 --- a/0003-Fix-versions-for-release-1.5.1.patch +++ /dev/null @@ -1,263 +0,0 @@ -From c50886ff52dba1dc742d68d0eb468d96f43bcb79 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Wed, 18 Dec 2019 11:28:42 +0000 -Subject: [PATCH 3/3] Fix versions for release 1.5.1 - ---- - pack200/pom.xml | 2 +- - pack200/tycho-pack200-impl/pom.xml | 2 +- - pack200/tycho-pack200-its/pom.xml | 2 +- - pack200/tycho-pack200a-plugin/pom.xml | 2 +- - pack200/tycho-pack200b-plugin/pom.xml | 2 +- - pom.xml | 2 +- - target-platform-validation-plugin/pom.xml | 2 +- - tycho-buildtimestamp-jgit/pom.xml | 2 +- - tycho-custom-bundle-plugin/pom.xml | 2 +- - tycho-dependency-tools-plugin/pom.xml | 2 +- - tycho-document-bundle-plugin/pom.xml | 2 +- - tycho-eclipserun-plugin/pom.xml | 2 +- - tycho-extras-its/pom.xml | 2 +- - tycho-p2-extras-plugin/pom.xml | 2 +- - tycho-pomless/pom.xml | 2 +- - tycho-source-feature-plugin/pom.xml | 2 +- - tycho-sourceref-jgit/pom.xml | 2 +- - tycho-version-bump-plugin/pom.xml | 2 +- - 18 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/pack200/pom.xml b/pack200/pom.xml -index c28451e..a2b825c 100644 ---- a/pack200/pom.xml -+++ b/pack200/pom.xml -@@ -16,7 +16,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-pack200 -diff --git a/pack200/tycho-pack200-impl/pom.xml b/pack200/tycho-pack200-impl/pom.xml -index 69f0125..bfc547b 100644 ---- a/pack200/tycho-pack200-impl/pom.xml -+++ b/pack200/tycho-pack200-impl/pom.xml -@@ -15,7 +15,7 @@ - - tycho-pack200 - org.eclipse.tycho.extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - tycho-pack200-impl - -diff --git a/pack200/tycho-pack200-its/pom.xml b/pack200/tycho-pack200-its/pom.xml -index e6baa7c..6f4dbbf 100644 ---- a/pack200/tycho-pack200-its/pom.xml -+++ b/pack200/tycho-pack200-its/pom.xml -@@ -16,7 +16,7 @@ - - org.eclipse.tycho.extras - tycho-pack200 -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-pack200-its -diff --git a/pack200/tycho-pack200a-plugin/pom.xml b/pack200/tycho-pack200a-plugin/pom.xml -index 20ce569..b92cb05 100644 ---- a/pack200/tycho-pack200a-plugin/pom.xml -+++ b/pack200/tycho-pack200a-plugin/pom.xml -@@ -16,7 +16,7 @@ - - org.eclipse.tycho.extras - tycho-pack200 -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-pack200a-plugin -diff --git a/pack200/tycho-pack200b-plugin/pom.xml b/pack200/tycho-pack200b-plugin/pom.xml -index 85161b2..bfc3879 100644 ---- a/pack200/tycho-pack200b-plugin/pom.xml -+++ b/pack200/tycho-pack200b-plugin/pom.xml -@@ -16,7 +16,7 @@ - - tycho-pack200 - org.eclipse.tycho.extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-pack200b-plugin -diff --git a/pom.xml b/pom.xml -index ef94c6b..9e3d7d1 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -16,7 +16,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - pom - - 2010 -diff --git a/target-platform-validation-plugin/pom.xml b/target-platform-validation-plugin/pom.xml -index 80bc37a..89ed7f2 100644 ---- a/target-platform-validation-plugin/pom.xml -+++ b/target-platform-validation-plugin/pom.xml -@@ -16,7 +16,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - target-platform-validation-plugin -diff --git a/tycho-buildtimestamp-jgit/pom.xml b/tycho-buildtimestamp-jgit/pom.xml -index 7a4ff75..121cd11 100644 ---- a/tycho-buildtimestamp-jgit/pom.xml -+++ b/tycho-buildtimestamp-jgit/pom.xml -@@ -15,7 +15,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - tycho-buildtimestamp-jgit - -diff --git a/tycho-custom-bundle-plugin/pom.xml b/tycho-custom-bundle-plugin/pom.xml -index 67dac1c..5f5ac8f 100644 ---- a/tycho-custom-bundle-plugin/pom.xml -+++ b/tycho-custom-bundle-plugin/pom.xml -@@ -17,7 +17,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-custom-bundle-plugin -diff --git a/tycho-dependency-tools-plugin/pom.xml b/tycho-dependency-tools-plugin/pom.xml -index 6766b7a..f03edbb 100644 ---- a/tycho-dependency-tools-plugin/pom.xml -+++ b/tycho-dependency-tools-plugin/pom.xml -@@ -14,7 +14,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-dependency-tools-plugin -diff --git a/tycho-document-bundle-plugin/pom.xml b/tycho-document-bundle-plugin/pom.xml -index 55d3cfa..bd610a7 100644 ---- a/tycho-document-bundle-plugin/pom.xml -+++ b/tycho-document-bundle-plugin/pom.xml -@@ -17,7 +17,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-document-bundle-plugin -diff --git a/tycho-eclipserun-plugin/pom.xml b/tycho-eclipserun-plugin/pom.xml -index cba7373..a76264a 100644 ---- a/tycho-eclipserun-plugin/pom.xml -+++ b/tycho-eclipserun-plugin/pom.xml -@@ -15,7 +15,7 @@ - - tycho-extras - org.eclipse.tycho.extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-eclipserun-plugin -diff --git a/tycho-extras-its/pom.xml b/tycho-extras-its/pom.xml -index 06ca20d..c36fa70 100644 ---- a/tycho-extras-its/pom.xml -+++ b/tycho-extras-its/pom.xml -@@ -17,7 +17,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-extras-its -diff --git a/tycho-p2-extras-plugin/pom.xml b/tycho-p2-extras-plugin/pom.xml -index 50bf289..06f2a89 100644 ---- a/tycho-p2-extras-plugin/pom.xml -+++ b/tycho-p2-extras-plugin/pom.xml -@@ -16,7 +16,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-p2-extras-plugin -diff --git a/tycho-pomless/pom.xml b/tycho-pomless/pom.xml -index b0e4620..58cdcd7 100644 ---- a/tycho-pomless/pom.xml -+++ b/tycho-pomless/pom.xml -@@ -17,7 +17,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-pomless -diff --git a/tycho-source-feature-plugin/pom.xml b/tycho-source-feature-plugin/pom.xml -index 6f652fc..4096d5c 100644 ---- a/tycho-source-feature-plugin/pom.xml -+++ b/tycho-source-feature-plugin/pom.xml -@@ -4,7 +4,7 @@ - - tycho-extras - org.eclipse.tycho.extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-source-feature-plugin -diff --git a/tycho-sourceref-jgit/pom.xml b/tycho-sourceref-jgit/pom.xml -index 1f20868..807b3b1 100644 ---- a/tycho-sourceref-jgit/pom.xml -+++ b/tycho-sourceref-jgit/pom.xml -@@ -16,7 +16,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - tycho-sourceref-jgit - -diff --git a/tycho-version-bump-plugin/pom.xml b/tycho-version-bump-plugin/pom.xml -index daed908..d5ccc5a 100644 ---- a/tycho-version-bump-plugin/pom.xml -+++ b/tycho-version-bump-plugin/pom.xml -@@ -17,7 +17,7 @@ - - org.eclipse.tycho.extras - tycho-extras -- 1.5.1-SNAPSHOT -+ 1.5.1 - - - tycho-version-bump-plugin --- -2.21.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3245441 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This project was merged upstream with the main tycho repo. The tycho-extras RPM was subsumed by the tycho RPM diff --git a/sources b/sources deleted file mode 100644 index 8b31efb..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (org.eclipse.tycho.extras-tycho-extras-1.5.1.tar.xz) = 3a340a821a5a2224b0bfd25cd04cda0fcfc1a1459ad84019e713a7ae9d19980c8e518ba18cf1f7a9665a57eeeb3f7beef25c24af40164ce9d671955055a65928 diff --git a/tycho-extras.spec b/tycho-extras.spec deleted file mode 100644 index cfe77f3..0000000 --- a/tycho-extras.spec +++ /dev/null @@ -1,249 +0,0 @@ -# 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) - -Name: tycho-extras -Version: 1.5.1 -Release: 3%{?dist} -Summary: Additional plugins for Tycho - -License: EPL-1.0 -URL: http://eclipse.org/tycho/ -Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-%{version}.tar.xz -Patch0: 0001-Fix-build.patch -Patch1: 0002-Use-custom-resolver-for-tycho-eclipserun-plugin.patch -Patch2: 0003-Fix-versions-for-release-1.5.1.patch - -BuildArch: noarch - -# Upstream Eclipse no longer supports non-64bit arches -ExcludeArch: s390 %{arm} %{ix86} - -BuildRequires: maven-local -BuildRequires: mvn(io.takari.polyglot:polyglot-common) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven:maven-archiver) -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-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) -BuildRequires: mvn(org.eclipse.tycho:org.eclipse.tycho.core.shared) -BuildRequires: mvn(org.eclipse.tycho:org.eclipse.tycho.p2.resolver.shared) -BuildRequires: mvn(org.eclipse.tycho:sisu-equinox-launching) -BuildRequires: mvn(org.eclipse.tycho:tycho-artifactcomparator) -BuildRequires: mvn(org.eclipse.tycho:tycho-core) -BuildRequires: mvn(org.eclipse.tycho:tycho-p2-facade) -BuildRequires: mvn(org.eclipse.tycho:tycho-packaging-plugin) -BuildRequires: mvn(org.fedoraproject.p2:org.fedoraproject.p2) - -%description -A small set of plugins that work with Tycho to provide additional functionality -when building projects of an OSGi nature. - - -%package javadoc -Summary: Javadocs for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -n org.eclipse.tycho.extras-tycho-extras-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -# Plugins not needed for RPM builds -%pom_remove_plugin :maven-site-plugin - -# maven-properties-plugin is only needed for tests -%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping -%pom_remove_plugin org.sonatype.plugins:maven-properties-plugin tycho-p2-extras-plugin -# remove org.apache.maven:apache-maven zip -%pom_remove_dep org.apache.maven:apache-maven tycho-p2-extras-plugin -%pom_add_dep org.fedoraproject.p2:org.fedoraproject.p2 tycho-eclipserun-plugin/pom.xml - -# Tycho plug-ins not needed for RPM builds of Eclipse plug-ins -%pom_disable_module tycho-buildtimestamp-jgit -%pom_disable_module tycho-sourceref-jgit - -%mvn_alias :{*} org.eclipse.tycho:@1 - -%build -# To run tests, we need : -# maven-properties-plugin (unclear licensing) -%mvn_build -f - -%install -%mvn_install - -# Install extension JAR with deps into XMvn ext directory -install -d -m 755 %{buildroot}%{xmvn_libdir}/ext/ -ln -s %{_javadir}/%{name}/tycho-pomless.jar %{buildroot}%{xmvn_libdir}/ext/ -ln -s %{_javadir}/takari-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/ext/ - -%files -f .mfiles -%{xmvn_libdir}/ext/* - -%files javadoc -f .mfiles-javadoc - -%changelog -* Fri Jan 31 2020 Fedora Release Engineering - 1.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 20 2019 Mat Booth - 1.5.1-2 -- Fix broken symlink for takari-polyglot - -* Wed Dec 18 2019 Mat Booth - 1.5.1-1 -- Update to latest upstream release - -* Thu May 30 2019 Mat Booth - 1.4.0-1 -- Update to latest upstream release - -* Thu May 23 2019 Mat Booth - 1.3.0-4 -- Don't build plug-ins we can't use during RPM builds - -* Tue Mar 19 2019 Mat Booth - 1.3.0-3 -- Restrict to same architectures as Eclipse itself - -* Tue Mar 12 2019 Mat Booth - 1.3.0-2 -- Make installation more portable - -* Tue Feb 19 2019 Mat Booth - 1.3.0-1 -- Update to latest upstream release - -* Sun Feb 03 2019 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 17 2018 Mat Booth - 1.2.0-3 -- License correction - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 05 2018 Mat Booth - 1.2.0-1 -- Update to latest release - -* Wed May 02 2018 Mat Booth - 1.1.0-1 -- Update to latest upstream release - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Apr 20 2017 Mat Booth - 1.0.0-1 -- Update to 1.0.0 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.26.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Nov 02 2016 Mat Booth - 0.26.0-1 -- Update to latest upstream release - -* Mon Jul 4 2016 Alexander Kurtakov 0.25.0-4 -- Add patch to fix NPE in xmvn builddep. - -* Wed Jun 15 2016 Mikolaj Izdebski - 0.25.0-3 -- Add missing build-requires - -* Thu Apr 28 2016 Mikolaj Izdebski - 0.25.0-2 -- Obsolete tycho-pomless - -* Thu Apr 21 2016 Mat Booth - 0.25.0-1 -- Update to latest upstream release - -* Thu Apr 14 2016 Mat Booth - 0.23.0-4 -- Fix build against new maven-archiver, which removed some deprecated methods - that tycho was using - -* Fri Feb 05 2016 Fedora Release Engineering - 0.23.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.23.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jun 9 2015 Alexander Kurtakov 0.23.0-1 -- Update to upstream 0.23. - -* Fri Dec 5 2014 Mikolaj Izdebski - 0.22.0-2 -- Port to latest fedoraproject-p2 - -* Mon Dec 01 2014 Mat Booth - 0.22.0-1 -- Update to tagged release -- Fix directory ownership problem - -* Tue Nov 25 2014 Roland Grunberg - 0.22.0-0.1.gitef068a -- Update to 0.22.0 pre-release. - -* Wed Sep 03 2014 Roland Grunberg - 0.21.0-3 -- Use fedoraproject-p2 to do OSGi bundle discovery. - -* Thu Aug 21 2014 Roland Grunberg - 0.21.0-2 -- Integrate fedoraproject-p2 functionality. - -* Fri Jul 25 2014 Roland Grunberg - 0.21.0-1 -- Update to 0.21.0 Release. - -* Sun Jun 08 2014 Fedora Release Engineering - 0.20.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 25 2014 Roland Grunberg - 0.20.0-1 -- Update to 0.20.0 Release. - -* Tue Mar 11 2014 Michael Simacek - 0.19.0-3 -- Use mvn_build and mvn_install. -- Drop manual requires. - -* Thu Feb 27 2014 Roland Grunberg - 0.19.0-2 -- Change R:java to R:java-headless (Bug 1068575). - -* Fri Oct 25 2013 Roland Grunberg - 0.19.0-1 -- Update to 0.19.0 Release. - -* Mon Jul 29 2013 Roland Grunberg 0.18.1-1 -- Update to 0.18.1 Release. - -* Thu May 30 2013 Roland Grunberg 0.18.0-1 -- Update to 0.18.0 Release. - -* Tue May 7 2013 Roland Grunberg 0.17.0-2 -- tycho-eclipserun-plugin should use the system local p2 repo. - -* Tue Apr 2 2013 Roland Grunberg 0.17.0-1 -- Update to 0.17.0 Release. - -* Mon Feb 25 2013 Roland Grunberg 0.17.0-0.1.git0a9370 -- Update to latest 0.17.0-SNAPSHOT. - -* Thu Feb 21 2013 Roland Grunberg - 0.16.0-5 -- Fix PlexusConfiguration class issues identically across branches. - -* Wed Feb 20 2013 Roland Grunberg - 0.16.0-4 -- Fix build issues relating to PlexusConfiguration. - -* Fri Feb 15 2013 Fedora Release Engineering - 0.16.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Dec 13 2012 Roland Grunberg 0.16.0-3 -- Fix upstream Bug 393686. - -* Fri Oct 19 2012 Roland Grunberg 0.16.0-2 -- Update to 0.16.0 Release. - -* Mon Jul 30 2012 Roland Grunberg 0.16.0-1.e58861 -- Update to 0.16.0 SNAPSHOT. - -* Fri Jul 27 2012 Roland Grunberg 0.15.0-1 -- Update to 0.15.0. - -* Sun Jul 22 2012 Fedora Release Engineering - 0.14.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 16 2012 Roland Grunberg - 0.14.0-1 -- Initial packaging of tycho extras.