diff --git a/0001-Port-to-latest-versio-of-Mockito.patch b/0001-Port-to-latest-versio-of-Mockito.patch deleted file mode 100644 index bf1e610..0000000 --- a/0001-Port-to-latest-versio-of-Mockito.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 0789e7cc9320f25a5e7ffa5dd3f378333fb69462 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Tue, 19 Feb 2019 11:11:10 +0000 -Subject: [PATCH] Port to latest versio of Mockito - -Change-Id: Ie0f6189cc66a8f13d952fa6e9d5c7bf1d39535b5 ---- - pom.xml | 2 +- - .../RepositoryArtifactProviderTest.java | 4 ++-- - tycho-bundles/pom.xml | 6 ------ - .../tycho-bundles-target.target | 21 +++++++------------ - 4 files changed, 11 insertions(+), 22 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 3e096edb..14484785 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -244,7 +244,7 @@ - - org.mockito - mockito-core -- 1.8.4 -+ 2.23.0 - test - - -diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java -index bd897e22..fc5231ba 100644 ---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java -+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java -@@ -26,8 +26,8 @@ import static org.hamcrest.CoreMatchers.containsString; - import static org.hamcrest.CoreMatchers.hasItem; - import static org.hamcrest.CoreMatchers.is; - import static org.junit.Assert.assertThat; --import static org.mockito.Matchers.any; --import static org.mockito.Matchers.argThat; -+import static org.mockito.ArgumentMatchers.any; -+import static org.mockito.hamcrest.MockitoHamcrest.argThat; - import static org.mockito.Mockito.mock; - import static org.mockito.Mockito.when; - -diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml -index 52c34471..d6dbc14b 100644 ---- a/tycho-bundles/pom.xml -+++ b/tycho-bundles/pom.xml -@@ -81,12 +81,6 @@ - org.eclipse.osgi.compatibility.state - 0.0.0 - -- -- -- eclipse-plugin -- org.hamcrest -- 0.0.0 -- - - - -diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -index b3e58eaf..33956d88 100644 ---- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -@@ -1,5 +1,5 @@ - -- -+ - - - -@@ -19,19 +19,14 @@ - - - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -+ - - - --- -2.20.1 - diff --git a/0005-Bug-543850-Update-artifactcomparator-asm-dep-to-7.0.patch b/0005-Bug-543850-Update-artifactcomparator-asm-dep-to-7.0.patch deleted file mode 100644 index 98ab8e8..0000000 --- a/0005-Bug-543850-Update-artifactcomparator-asm-dep-to-7.0.patch +++ /dev/null @@ -1,85 +0,0 @@ -From fa0bff4ef49b117959beb96186d639954a3c0181 Mon Sep 17 00:00:00 2001 -From: Alexander Kurtakov -Date: Fri, 25 Jan 2019 21:32:55 +0200 -Subject: [PATCH 5/6] Bug 543850 - Update artifactcomparator asm dep to 7.0 - -Update the asm version to 7.0 and switch to using Opcodes.ASM7 API in -ClassReader. - -Change-Id: I957f79413e49424a9f82de99d541d75b3f2f99be -Signed-off-by: Alexander Kurtakov ---- - tycho-artifactcomparator/pom.xml | 12 ++++++++++-- - .../zipcomparator/internal/ClassfileComparator.java | 12 +++--------- - 2 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index f2c3c43..4831be1 100644 ---- a/tycho-artifactcomparator/pom.xml -+++ b/tycho-artifactcomparator/pom.xml -@@ -19,13 +19,21 @@ - 1.3.0 - - tycho-artifactcomparator -+ -+ 7.0 -+ - - - - - org.ow2.asm -- asm-debug-all -- 5.0.3 -+ asm-tree -+ ${asm-version} -+ -+ -+ org.ow2.asm -+ asm-util -+ ${asm-version} - - - org.codehaus.plexus -diff --git a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java -index c69bd2c..52ba2dc 100644 ---- a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java -+++ b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java -@@ -1,5 +1,5 @@ - /******************************************************************************* -- * Copyright (c) 2012 Sonatype Inc. and others. -+ * Copyright (c) 2012, 2019 Sonatype Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at -@@ -17,7 +17,6 @@ import java.io.StringWriter; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.Collections; --import java.util.Comparator; - import java.util.List; - - import org.apache.maven.plugin.MojoExecution; -@@ -63,17 +62,12 @@ public class ClassfileComparator implements ContentsComparator { - private String disassemble(byte[] bytes) { - ClassReader reader = new ClassReader(bytes); - ClassNode clazz = new ClassNode(); -- reader.accept(clazz, Opcodes.ASM5 | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES); -+ reader.accept(clazz, Opcodes.ASM6 | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES); - - // inner class list gets reordered during pack200 normalization - if (clazz.innerClasses != null) { - List sorted = new ArrayList<>(clazz.innerClasses); -- Collections.sort(sorted, new Comparator() { -- @Override -- public int compare(InnerClassNode o1, InnerClassNode o2) { -- return o1.name.compareTo(o2.name); -- } -- }); -+ Collections.sort(sorted, (o1, o2) -> o1.name.compareTo(o2.name)); - clazz.innerClasses = sorted; - } - --- -2.20.1 - diff --git a/0006-Port-to-latest-versio-of-Mockito.patch b/0006-Port-to-latest-versio-of-Mockito.patch deleted file mode 100644 index 26060e9..0000000 --- a/0006-Port-to-latest-versio-of-Mockito.patch +++ /dev/null @@ -1,99 +0,0 @@ -From c130487d9900e198564b0559da28937616c06208 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Tue, 19 Feb 2019 11:11:10 +0000 -Subject: [PATCH 6/6] Port to latest versio of Mockito - -Change-Id: Ie0f6189cc66a8f13d952fa6e9d5c7bf1d39535b5 ---- - pom.xml | 2 +- - .../RepositoryArtifactProviderTest.java | 4 ++-- - tycho-bundles/pom.xml | 6 ------ - .../tycho-bundles-target.target | 21 +++++++------------ - 4 files changed, 11 insertions(+), 22 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 2b34d93..5ddc9eb 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -244,7 +244,7 @@ - - org.mockito - mockito-core -- 1.8.4 -+ 2.23.0 - test - - -diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java -index bd897e2..fc5231b 100644 ---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java -+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/p2base/artifact/repository/RepositoryArtifactProviderTest.java -@@ -26,8 +26,8 @@ import static org.hamcrest.CoreMatchers.containsString; - import static org.hamcrest.CoreMatchers.hasItem; - import static org.hamcrest.CoreMatchers.is; - import static org.junit.Assert.assertThat; --import static org.mockito.Matchers.any; --import static org.mockito.Matchers.argThat; -+import static org.mockito.ArgumentMatchers.any; -+import static org.mockito.hamcrest.MockitoHamcrest.argThat; - import static org.mockito.Mockito.mock; - import static org.mockito.Mockito.when; - -diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml -index abc0795..5c45e60 100644 ---- a/tycho-bundles/pom.xml -+++ b/tycho-bundles/pom.xml -@@ -81,12 +81,6 @@ - org.eclipse.osgi.compatibility.state - 0.0.0 - -- -- -- eclipse-plugin -- org.hamcrest -- 0.0.0 -- - - - -diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -index b3e58ea..33956d8 100644 ---- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -@@ -1,5 +1,5 @@ - -- -+ - - - -@@ -19,19 +19,14 @@ - - - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -+ - - - --- -2.20.1 - diff --git a/sources b/sources index 62e6620..8c506de 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (fedoraproject-p2-290f67a4c717599b2f5166ea89aa5365571314b1.tar.gz) = 5ddfa3e7c1dc3d64335d836d74d7325904f294e0ab1782de41a8815b09ddf42f0c47a263c3a6217626aaf293a17788d01174c327e17b192a0f451d07d5655c49 -SHA512 (org.eclipse.tycho-tycho-1.3.0.tar.xz) = 8f4f9ed89b87f5a486285e64c6a6e8906c7a01a82666d8483ba0a136ec6fc49fcb85a7748ed425bf8d7cfad722b25472dd02b770122575268e2addba5b80e7f2 +SHA512 (org.eclipse.tycho-tycho-1.4.0.tar.xz) = 8d9f9fea4ab743248e7bb6e0e526ea36677c4da98363019316d684cea026d67fb688d51ebcf29e171e04245873580c1a47d8fe75c727984338a65d49f7fa4672 SHA512 (eclipse-bootstrap-photon.tar.xz) = f696947d2deedcc85739a91ca0d5b3312756d8575226aab6e8021ea1983630f951fff1f9ae5de953d14ac57a285cca3183469960466977301cda4cc3fe722e49 diff --git a/tycho.spec b/tycho.spec index dccffd5..0b88be0 100644 --- a/tycho.spec +++ b/tycho.spec @@ -27,8 +27,8 @@ %define __requires_exclude osgi* Name: tycho -Version: 1.3.0 -Release: 5%{?dist} +Version: 1.4.0 +Release: 1%{?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 @@ -63,10 +63,6 @@ Patch1: 0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch Patch2: 0003-Tycho-should-always-delegate-artifact-resolution-to-.patch # Submitted upstream: https://bugs.eclipse.org/bugs/show_bug.cgi?id=537963 Patch3: 0004-Bug-537963-Make-the-default-EE-Java-1.8.patch -# Merged upstream: https://git.eclipse.org/c/tycho/org.eclipse.tycho.git/commit/?id=a437fb8870761d733199392f25a8c0e4f34caae9 -Patch4: 0005-Bug-543850-Update-artifactcomparator-asm-dep-to-7.0.patch -# Port to latest version of Mockito 2.x -Patch5: 0006-Port-to-latest-versio-of-Mockito.patch # Upstream Eclipse no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -109,6 +105,7 @@ 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.hamcrest:hamcrest-core) +BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.ow2.asm:asm-tree) BuildRequires: mvn(org.ow2.asm:asm-util) BuildRequires: mvn(org.slf4j:slf4j-api) @@ -187,8 +184,6 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 # Unneeded for RPM builds %pom_remove_plugin :maven-site-plugin @@ -209,20 +204,23 @@ pushd tycho-maven-plugin/src/main/java/org/fedoraproject cp %{SOURCE2} . popd -# These units cannot be found during a regular build -sed -i '/^org.eclipse.platformorg.eclipse.tychoorg.eclipse.tychoorg.eclipse.platform${project.version}' tycho-surefire/tycho-surefire-plugin/pom.xml @@ -231,6 +229,7 @@ for b in core.shared.tests p2.resolver.impl.test p2.resolver.shared.tests p2.mav %pom_disable_module org.eclipse.tycho.$b tycho-bundles done %pom_disable_module org.fedoraproject.p2.tests fedoraproject-p2 +%pom_xpath_remove "pom:requirement[pom:id='org.hamcrest']" tycho-bundles %pom_remove_dep -r :::test # Bootstrap Build @@ -279,6 +278,9 @@ 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.compatibility.state']" boot/tycho-metadata.xml sed -i ' s|>/[^<]*/\([^/]*\.pom\)|>'$PWD'/boot/\1| s|>'$sysVer'|>%{version}-SNAPSHOT%{version}-SNAPSHOT| @@ -337,7 +339,6 @@ for b in org.eclipse.osgi \ osgiJarPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.jar") osgiPomPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.pom") %mvn_artifact $osgiPomPath $osgiJarPath - %mvn_alias "org.eclipse.tycho:$b" "org.eclipse.osgi:$b" done %endif @@ -399,6 +400,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst %files javadoc -f .mfiles-javadoc %changelog +* Fri May 24 2019 Mat Booth - 1.4.0-1 +- Update to latest upstream release + * Tue May 07 2019 Mat Booth - 1.3.0-5 - Don't build tests, they are not being run anyway