diff --git a/eclipse-eclemma.spec b/eclipse-eclemma.spec index 5bcc007..7319920 100644 --- a/eclipse-eclemma.spec +++ b/eclipse-eclemma.spec @@ -1,16 +1,19 @@ Name: eclipse-eclemma -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Java code coverage tool plugin for Eclipse -License: EPL and ASL 2.0 +License: EPL-1.0 and ASL 2.0 URL: http://www.eclemma.org Source0: https://github.com/eclipse/eclemma/archive/v%{version}.tar.gz +# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=535040 +Patch0: photon-build.patch + BuildArch: noarch -BuildRequires: eclipse-pde >= 1:4.2.0 +BuildRequires: eclipse-pde BuildRequires: eclipse-swtbot BuildRequires: eclipse-license -BuildRequires: jacoco >= 0.7.6 +BuildRequires: jacoco >= 0.7.8 BuildRequires: maven-local BuildRequires: tycho BuildRequires: maven-plugin-build-helper @@ -24,6 +27,7 @@ editors. %prep %setup -q -n eclemma-%{version} +%patch0 -p1 find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; @@ -49,6 +53,9 @@ sed -i -e 's|0.7.9|0.7.8|g' org.eclipse.eclemma.{core,ui}/META-INF/MANIFEST.MF %doc org.eclipse.eclemma.feature/about.html %changelog +* Sun Jun 17 2018 Mat Booth - 3.0.1-1 +- Update to latest release + * Wed Feb 07 2018 Fedora Release Engineering - 3.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/photon-build.patch b/photon-build.patch new file mode 100644 index 0000000..cc66feb --- /dev/null +++ b/photon-build.patch @@ -0,0 +1,175 @@ +From 80e6e55bba6e0001f965273c7e699b5f45c63c36 Mon Sep 17 00:00:00 2001 +From: Evgeny Mandrikov +Date: Thu, 24 May 2018 05:48:32 +0200 +Subject: [PATCH] Fix compilation errors caused by changes in + org.eclipse.debug.core 3.12 + +Unfortunately for addition of agent we implement two interfaces marked +as "noimplement" - org.eclipse.debug.core.ILaunchConfiguration and +org.eclipse.debug.core.ILaunchConfigurationWorkingCopy , and they got +new methods - see bug 41353. + +Fortunately according to our investigations with Marc R. Hoffmann and +because current version works in Photon, seems that we can safely use +throw statement for their implementation. + +Bug: 535040 +--- + .../eclemma/internal/core/SessionManagerTest.java | 32 +++++++++++++++++++++ + .../launching/AdjustedLaunchConfiguration.java | 33 ++++++++++++++++++++++ + .../AdjustedLaunchConfigurationWorkingCopy.java | 16 +++++++++++ + org.eclipse.eclemma.target/eclemma-e4.8.target | 6 ++-- + 4 files changed, 84 insertions(+), 3 deletions(-) + +diff --git a/org.eclipse.eclemma.core.test/src/org/eclipse/eclemma/internal/core/SessionManagerTest.java b/org.eclipse.eclemma.core.test/src/org/eclipse/eclemma/internal/core/SessionManagerTest.java +index 4406518..639168e 100644 +--- a/org.eclipse.eclemma.core.test/src/org/eclipse/eclemma/internal/core/SessionManagerTest.java ++++ b/org.eclipse.eclemma.core.test/src/org/eclipse/eclemma/internal/core/SessionManagerTest.java +@@ -17,6 +17,7 @@ + + import java.util.ArrayList; + import java.util.Arrays; ++import java.util.Collection; + import java.util.Collections; + import java.util.List; + import java.util.Map; +@@ -486,6 +487,10 @@ public ILaunchConfigurationWorkingCopy copy(String name) + public void delete() throws CoreException { + } + ++ public void delete(int flag) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ + public boolean exists() { + return false; + } +@@ -613,6 +618,33 @@ public boolean isReadOnly() { + return false; + } + ++ public ILaunchConfiguration getPrototype() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isAttributeModified(String attribute) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isPrototype() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Collection getPrototypeChildren() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public int getKind() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Set getPrototypeVisibleAttributes() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setPrototypeAttributeVisibility(String attribute, boolean visible) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } + } + + private static class RecordingListener implements ISessionListener { +diff --git a/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfiguration.java b/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfiguration.java +index 081aaa7..7348472 100644 +--- a/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfiguration.java ++++ b/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfiguration.java +@@ -11,6 +11,7 @@ + ******************************************************************************/ + package org.eclipse.eclemma.internal.core.launching; + ++import java.util.Collection; + import java.util.HashMap; + import java.util.List; + import java.util.Map; +@@ -104,6 +105,10 @@ public void delete() throws CoreException { + delegate.delete(); + } + ++ public void delete(int flag) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ + public boolean exists() { + return delegate.exists(); + } +@@ -210,4 +215,32 @@ public boolean isReadOnly() { + return delegate.isReadOnly(); + } + ++ public ILaunchConfiguration getPrototype() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isAttributeModified(String attribute) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isPrototype() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Collection getPrototypeChildren() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public int getKind() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Set getPrototypeVisibleAttributes() throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setPrototypeAttributeVisibility(String attribute, boolean visible) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ + } +diff --git a/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfigurationWorkingCopy.java b/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfigurationWorkingCopy.java +index 3ea57b0..1caf4ec 100644 +--- a/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfigurationWorkingCopy.java ++++ b/org.eclipse.eclemma.core/src/org/eclipse/eclemma/internal/core/launching/AdjustedLaunchConfigurationWorkingCopy.java +@@ -64,6 +64,10 @@ public ILaunchConfiguration doSave() throws CoreException { + return delegate.doSave(); + } + ++ public ILaunchConfiguration doSave(int flag) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ + public void setAttribute(String attributeName, int value) { + delegate.setAttribute(attributeName, value); + } +@@ -86,6 +90,10 @@ public void setAttribute(String attributeName, boolean value) { + delegate.setAttribute(attributeName, value); + } + ++ public void setAttribute(String attributeName, Object value) { ++ throw new UnsupportedOperationException(); ++ } ++ + public void rename(String name) { + delegate.rename(name); + } +@@ -127,4 +135,12 @@ public ILaunchConfigurationWorkingCopy getParent() { + return delegate.getParent(); + } + ++ public void copyAttributes(ILaunchConfiguration prototype) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setPrototype(ILaunchConfiguration prototype, boolean copy) throws CoreException { ++ throw new UnsupportedOperationException(); ++ } ++ + } diff --git a/sources b/sources index 87d0906..ff0e3db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v3.0.0.tar.gz) = 684a6317037d9be5df9a533f7b64ac19de37cb097bc1ca5f5d4b391a4b6a5f5b9b6c3c5c12ac1815ea38a37a8a75a9effbec96f22d64ae183c2ea9e6f4aa80a9 +SHA512 (v3.0.1.tar.gz) = 158be49a284106fa82876195481be37fde8738ee404348caff17447c4e6195fa57b70cd56a6ca5b9044c3278fee562a4c78387a03ed54fea668bbb2a0efb800b