[eclipse-mylyn] Don't require jacoco for build. Update latest to latest upstream.
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Jun 3 08:31:24 UTC 2013
commit 3ac684cfe7e68baf225d56b1ba30bc17884a14e5
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Jun 3 10:31:04 2013 +0200
Don't require jacoco for build.
Update latest to latest upstream.
.gitignore | 2 +
...se-mylyn-ensure-sites-build-after-changes.patch | 12 ++++++
eclipse-mylyn.spec | 37 +++++++++++++++++--
fetch-eclipse-mylyn.sh | 2 +-
sources | 2 +-
5 files changed, 49 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a0094f7..003b04c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2
/eclipse-mylyn-8b09643ca21d8707ff8d646387015ebf3e4b0eaa-fetched-src.tar.bz2
/eclipse-mylyn-f327e85766e4919d6a822dd516a7b9cb77e88b4a-incubator-fetched-src.tar.bz2
/eclipse-mylyn-8b09643ca21d8707ff8d646387015ebf3e4b0eaa-fetched-src
+/eclipse-mylyn-a6b7cd3ef76434fc22bf9ea295b4fc6aa7dd5281-fetched-src.tar.bz2
+/eclipse-mylyn-a6b7cd3ef76434fc22bf9ea295b4fc6aa7dd5281-fetched-src
diff --git a/eclipse-mylyn-ensure-sites-build-after-changes.patch b/eclipse-mylyn-ensure-sites-build-after-changes.patch
index 9b67775..e0f7dbf 100644
--- a/eclipse-mylyn-ensure-sites-build-after-changes.patch
+++ b/eclipse-mylyn-ensure-sites-build-after-changes.patch
@@ -63,6 +63,18 @@
<category name="Integration"/>
</feature>
<feature url="features/org.eclipse.mylyn.commons.compatibility_0.0.0.jar" id="org.eclipse.mylyn.commons.compatibility" version="0.0.0">
+@@ -46,9 +46,9 @@
+ <feature url="features/org.eclipse.mylyn.commons.soap_feature_0.0.0.jar" id="org.eclipse.mylyn.commons.soap_feature" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
+- <feature url="features/org.eclipse.mylyn.commons.tck_0.0.0.jar" id="org.eclipse.mylyn.commons.tck" version="0.0.0">
++ <!--feature url="features/org.eclipse.mylyn.commons.tck_0.0.0.jar" id="org.eclipse.mylyn.commons.tck" version="0.0.0">
+ <category name="SDK"/>
+- </feature>
++ </feature-->
+ <category-def name="Features" label="Mylyn Commons Features">
+ <description>
+ Tools.
--- org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml.bak 2012-07-04 14:34:56.000000000 +0200
+++ org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml 2012-07-04 14:39:47.223369321 +0200
@@ -79,6 +79,9 @@
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index c048da5..0e541f2 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -2,7 +2,7 @@
%{!?scl:%global pkg_name %{name}}
%global install_loc %{_datadir}/eclipse/dropins
-%global tag 8b09643ca21d8707ff8d646387015ebf3e4b0eaa
+%global tag a6b7cd3ef76434fc22bf9ea295b4fc6aa7dd5281
%global incubator_tag f327e85766e4919d6a822dd516a7b9cb77e88b4a
%define __jar_repack 0
@@ -12,7 +12,7 @@
Name: %{?scl_prefix}eclipse-mylyn
Summary: Eclipse Mylyn main feature.
Version: 3.9.0
-Release: 0.4.git8b0964%{?dist}
+Release: 0.5.gita6b7cd%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
@@ -68,11 +68,18 @@ BuildRequires: jakarta-commons-httpclient
BuildRequires: httpcomponents-client >= 4.1.3-2
BuildRequires: httpcomponents-core >= 4.1.4
BuildRequires: apache-commons-discovery >= 0.5-2
-BuildRequires: jacoco-maven-plugin
+#BuildRequires: jacoco-maven-plugin
BuildRequires: google-gson >= 2.0.0
BuildRequires: javamail >= 1.4.3-11
BuildRequires: guava
BuildRequires: xalan-j2
+BuildRequires: junit
+BuildRequires: hamcrest
+BuildRequires: objenesis
+BuildRequires: mockito
+BuildRequires: maven-install-plugin
+BuildRequires: maven-deploy-plugin
+BuildRequires: maven-plugin-build-helper
Requires: eclipse-platform >= 1:4.2.0
Requires: eclipse-rcp >= 1:4.2.0-0.6
@@ -315,6 +322,10 @@ Requires: %{name}-builds = %{version}-%{release}
Requires: %{name}-builds-hudson = %{version}-%{release}
Requires: guava
Requires: xalan-j2
+Requires: hamcrest
+Requires: objenesis
+Requires: junit
+Requires: mockito
Group: Development/Tools
%description sdk
@@ -345,7 +356,7 @@ grep -l -r --include="pom.xml" maven-pmd-plugin . | ( while read pom_path; do %p
#Disable modules we can't build yet
%pom_disable_module org.eclipse.mylyn.reviews .
-#%pom_disable_module stubs org.eclipse.mylyn.commons .
+%pom_disable_module org.eclipse.mylyn.commons.tck-feature org.eclipse.mylyn.commons
%pom_disable_module org.eclipse.mylyn.tests org.eclipse.mylyn .
@@ -362,8 +373,20 @@ grep -l -r --include="pom.xml" "tests" . | ( while read pom_path; do echo `%pom_
or child::*[local-name() = 'arch' and not(text() = '%{_arch}')]) ]" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml
%pom_remove_plugin :tycho-packaging-plugin org.eclipse.mylyn/org.eclipse.mylyn-parent
+%pom_remove_plugin :jacoco-maven-plugin org.eclipse.mylyn/org.eclipse.mylyn.maven-parent/pom.xml
+%pom_remove_plugin :jacoco-maven-plugin org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml
+
rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java
+#Be more tolerant for guava
+sed -i -e "s/10.0.0/13.0.0/g" org.eclipse.mylyn.versions/org.eclipse.mylyn.versions.sdk-feature/feature.xml
+
+
+#sed -i -e "s/4.8.2/0.0.0/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.tck-feature/feature.xml
+#sed -i -e "s/1.1.0/0.0.0/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.tck-feature/feature.xml
+#http://code.google.com/p/mockito/issues/detail?id=435&thanks=435&ts=1370002024
+#sed -i -e "s/org.mockito/org.mockito.mockito-core/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.tck-feature/feature.xml
+#sed -i -e "s/org.hamcrest\"/org.hamcrest.core\"/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.tck-feature/feature.xml
#Prepare dependencies
mkdir -p .m2/p2/repo-sdk/plugins
pushd .m2/p2/repo-sdk/plugins
@@ -386,6 +409,8 @@ ln -s %{_non_scl_javadir}/axis/axis.jar
ln -s %{_non_scl_javadir}/axis/jaxrpc.jar
ln -s %{_non_scl_javadir}/guava.jar
ln -s %{_non_scl_javadir}/commons-httpclient.jar
+ln -s %{_non_scl_javadir}/hamcrest.jar
+ln -s %{_non_scl_javadir}/mockito.jar
popd
%build
@@ -708,6 +733,10 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/license.html
%changelog
+* Fri May 31 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.9.0-0.5.gita6b7cd
+- Don't require jacoco for build.
+- Update latest to latest upstream.
+
* Tue May 14 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.9.0-0.4.git8b0964
- Rebuild to pick up recent dependencies.
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index 6fab94a..b18e030 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="8b09643ca21d8707ff8d646387015ebf3e4b0eaa"
+RELEASE_TAG="a6b7cd3ef76434fc22bf9ea295b4fc6aa7dd5281"
FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
#clean up old runs
diff --git a/sources b/sources
index af47cd0..986cbf0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-78d299491f3c9846487850553ac23b29 eclipse-mylyn-8b09643ca21d8707ff8d646387015ebf3e4b0eaa-fetched-src.tar.bz2
+eace3d22a6ebba5df3e36375d9f56abd eclipse-mylyn-a6b7cd3ef76434fc22bf9ea295b4fc6aa7dd5281-fetched-src.tar.bz2
5dd64469e07b96f0182ed96358fdba5b eclipse-mylyn-f327e85766e4919d6a822dd516a7b9cb77e88b4a-incubator-fetched-src.tar.bz2
cf614787f054377d9cb9a18722b0c408 org.eclipse.core.runtime.compatibility.auth.tar.bz2
More information about the scm-commits
mailing list