From bb6e17f36a339c7e019b982e165f9557b6bd99d3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Mar 31 2014 18:49:31 +0000 Subject: Update to upstream 3.11.0 release. --- diff --git a/.gitignore b/.gitignore index 3e66331..779ec83 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2 /eclipse-mylyn-e93a849274d90e71a08afedc1d65c63053aaeb6c-incubator-fetched-src.tar.xz /eclipse-mylyn-R_3_10_0-fetched-src.tar.xz /org.eclipse.core.runtime.compatibility.auth.tar.xz +/eclipse-mylyn-R_3_11_0-fetched-src.tar.xz +/eclipse-mylyn-c94b24d5c1bfda43bf5782ce142ecf3e890beda8-incubator-fetched-src.tar.xz diff --git a/eclipse-mylyn-build-compat.patch b/eclipse-mylyn-build-compat.patch deleted file mode 100644 index f7a9ef1..0000000 --- a/eclipse-mylyn-build-compat.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- org.eclipse.mylyn.commons/pom.xml.orig 2013-11-13 09:33:33.510443166 +0200 -+++ org.eclipse.mylyn.commons/pom.xml 2013-11-13 09:34:32.841463275 +0200 -@@ -72,6 +72,7 @@ - - - -+ org.eclipse.core.runtime.compatibility.auth - org.eclipse.mylyn.commons-feature - org.eclipse.mylyn.commons-site - org.eclipse.mylyn.commons-target diff --git a/eclipse-mylyn-compatibility-pom.xml b/eclipse-mylyn-compatibility-pom.xml deleted file mode 100644 index e0d0875..0000000 --- a/eclipse-mylyn-compatibility-pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - 4.0.0 - - org.eclipse.mylyn.commons-parent - org.eclipse.mylyn.commons - 3.10.0-SNAPSHOT - - org.eclipse.core.runtime.compatibility.auth - 3.2.200-SNAPSHOT - eclipse-plugin - - - - org.eclipse.tycho - tycho-source-plugin - - - - diff --git a/eclipse-mylyn-disable-online-tests.patch b/eclipse-mylyn-disable-online-tests.patch index 5d9c2bd..f97a776 100644 --- a/eclipse-mylyn-disable-online-tests.patch +++ b/eclipse-mylyn-disable-online-tests.patch @@ -26,8 +26,8 @@ org.eclipse.tycho tycho-surefire-plugin ${tycho-version} ---- org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml.bak 2012-07-02 09:22:29.000000000 +0200 -+++ org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml 2012-07-05 14:53:54.647273864 +0200 +--- org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml.sav 2014-03-28 12:13:02.000000000 +0200 ++++ org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml 2014-03-31 13:42:16.364084906 +0300 @@ -47,13 +47,6 @@ unpack="false"/> @@ -42,18 +42,46 @@ id="org.eclipse.mylyn.wikitext.confluence.core.source" download-size="0" install-size="0" ---- org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml.bak 2012-07-05 14:55:38.000000000 +0200 -+++ org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml 2012-07-05 15:03:22.909602628 +0200 -@@ -88,12 +88,6 @@ +@@ -101,13 +94,7 @@ + install-size="0" version="0.0.0" unpack="false"/> - - +- ++ + +- +- +- +- +- +- - - -- -+ - - - -@@ -103,21 +103,21 @@ - - - -- -+ - - - - - - -- -+ - - - --- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks-site/site.xml.bak 2012-07-02 09:23:09.000000000 +0200 +++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks-site/site.xml 2012-07-03 16:29:28.145494286 +0200 @@ -31,9 +31,9 @@ @@ -52,18 +12,21 @@ Tools. ---- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-site/site.xml.bak 2012-07-02 09:22:09.000000000 +0200 -+++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-site/site.xml 2012-07-04 14:09:12.021730766 +0200 -@@ -16,7 +16,7 @@ +--- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-site/site.xml.sav 2014-03-28 12:13:02.000000000 +0200 ++++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-site/site.xml 2014-03-31 18:24:57.249388626 +0300 +@@ -16,10 +16,7 @@ - +- +- +- + - -@@ -46,9 +46,9 @@ + +@@ -46,9 +43,9 @@ @@ -75,15 +38,59 @@ 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 @@ - +--- org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml.sav 2014-03-28 12:13:02.000000000 +0200 ++++ org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml 2014-03-31 18:32:29.166866675 +0300 +@@ -36,12 +36,12 @@ + + + +- ++ + + + +@@ -76,10 +76,10 @@ + + + +- ++ +- + -+ -+ + + +@@ -109,21 +109,21 @@ + + + +- ++ + + + + + + +- ++ + diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch index ac2aec6..8bde803 100644 --- a/eclipse-mylyn-merge-incubator.patch +++ b/eclipse-mylyn-merge-incubator.patch @@ -3,7 +3,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.web.tasks_feature" label="%featureName" - version="3.10.0.qualifier" + version="3.11.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> @@ -15,7 +15,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.trac.wiki_feature" label="%featureName" - version="3.10.0.qualifier" + version="3.11.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> @@ -37,9 +37,9 @@ ---- org.eclipse.mylyn.tasks/pom.xml.orig 2013-11-12 20:56:51.795977562 +0200 -+++ org.eclipse.mylyn.tasks/pom.xml 2013-11-12 20:58:11.312036786 +0200 -@@ -121,5 +121,9 @@ +--- org.eclipse.mylyn.tasks/pom.xml.sav 2014-03-28 13:51:55.785265013 +0200 ++++ org.eclipse.mylyn.tasks/pom.xml 2014-03-28 13:53:43.239554573 +0200 +@@ -119,6 +119,10 @@ org.eclipse.mylyn.trac.tests org.eclipse.mylyn.trac.ui org.eclipse.mylyn.trac.ui.tests @@ -47,5 +47,6 @@ + org.eclipse.mylyn.trac.wiki-feature + org.eclipse.mylyn.web.tasks + org.eclipse.mylyn.web.tasks-feature + connector-bugzilla-rest diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index ad4b809..4655a90 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -2,25 +2,22 @@ %{!?scl:%global pkg_name %{name}} %global install_loc %{_datadir}/eclipse/dropins -%global tag R_3_10_0 -%global incubator_tag e93a849274d90e71a08afedc1d65c63053aaeb6c +%global tag R_3_11_0 +%global incubator_tag c94b24d5c1bfda43bf5782ce142ecf3e890beda8 %{!?scl:%global _non_scl_javadir %{_javadir}} %{?scl:%global _non_scl_javadir /usr/share/java} Name: %{?scl_prefix}eclipse-mylyn Summary: Eclipse Mylyn main feature. -Version: 3.10.0 -Release: 4%{?dist} +Version: 3.11.0 +Release: 1%{?dist} License: EPL URL: http://www.eclipse.org/mylyn # bash fetch-eclipse-mylyn.sh Source0: %{pkg_name}-%{tag}-fetched-src.tar.xz Source1: fetch-eclipse-mylyn.sh -Source2: org.eclipse.core.runtime.compatibility.auth.tar.xz -Source3: fetch-compatibility.sh -Source4: eclipse-mylyn-compatibility-pom.xml Source6: redhat-bugzilla-custom-transitions.txt Source7: eclipse-mylyn-%{incubator_tag}-incubator-fetched-src.tar.xz @@ -34,14 +31,12 @@ Patch3: %{pkg_name}-disable-online-tests.patch Patch4: %{pkg_name}-merge-incubator.patch Patch5: %{pkg_name}-remove-javax-activation.patch Patch6: %{pkg_name}-bug-419133.patch -Patch7: %{pkg_name}-build-compat.patch -Patch8: lucene4.patch +Patch7: lucene4.patch BuildArch: noarch BuildRequires: eclipse-platform >= 1:4.2.0 -BuildRequires: eclipse-pde >= 1:4.2.0-0.6 -BuildRequires: eclipse-rcp >= 1:4.2.0-0.6 +BuildRequires: eclipse-pde >= 1:4.2.0 BuildRequires: eclipse-cdt BuildRequires: eclipse-egit BuildRequires: eclipse-jgit @@ -49,7 +44,8 @@ BuildRequires: eclipse-subclipse BuildRequires: tycho >= 0.14.1-5 BuildRequires: eclipse-egit BuildRequires: jacoco -BuildRequires: lucene >= 4.7.0-4 +BuildRequires: lucene +BuildRequires: lucene-queryparser BuildRequires: maven-local BuildRequires: axis >= 1.4 @@ -59,13 +55,11 @@ BuildRequires: apache-commons-io >= 2.3 BuildRequires: ws-commons-util >= 1.0.1-21 BuildRequires: xmlrpc-client >= 3.1.3 BuildRequires: xmlrpc-common >= 3.1.3 -BuildRequires: jdom >= 1.1.2-3 BuildRequires: rome >= 0.9-9 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: google-gson >= 2.0.0 BuildRequires: javamail >= 1.4.3-11 BuildRequires: guava @@ -79,14 +73,12 @@ 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 Requires: apache-commons-lang >= 2.6-6 Requires: apache-commons-logging Requires: apache-commons-io >= 2.3 Requires: ws-commons-util >= 1.0.1-21 Requires: xmlrpc-client >= 3.1.3 Requires: xmlrpc-common >= 3.1.3 -Requires: jpackage-utils Requires: rome >= 0.9-9 Requires: xml-commons-apis Requires: httpcomponents-client >= 4.1.3-2 @@ -235,7 +227,6 @@ Provides: %{name}-webtasks = %{version}-%{release} Provides Task List integration for web-based issue trackers and templates for example projects. - %package versions Summary: Eclipse Mylyn Versions Requires: %{name} = %{version}-%{release} @@ -244,7 +235,6 @@ Group: Development/Tools %description versions Provides a framework for accessing team providers for Eclipse Mylyn. - %package versions-git Summary: Mylyn Versions Connector: Git Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 @@ -288,7 +278,6 @@ build providers using Eclipse Mylyn. %package builds-hudson Summary: Mylyn Builds Connector: Hudson/Jenkins -Requires: java-headless >= 1:1.7.0 Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0-0.6 Requires: %{name} = %{version}-%{release} Requires: google-gson >= 1.6.0 @@ -328,23 +317,19 @@ Group: Development/Tools %description sdk Sources for all Mylyn bundles - %prep %setup -q -n eclipse-mylyn-%{tag}-fetched-src -tar xaf %{SOURCE2} -C org.eclipse.mylyn.commons -cp %{SOURCE4} org.eclipse.mylyn.commons/org.eclipse.core.runtime.compatibility.auth/pom.xml tar xaf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1 %patch0 %patch1 -%patch2 -%patch3 -%patch4 +%patch2 -b .sav +%patch3 -b .sav +%patch4 -b .sav %patch5 %patch6 -%patch7 pushd org.eclipse.mylyn.tasks -%patch8 -p1 +%patch7 -b .sav popd #Disable plugins we can live without and for some reason are redundant (unpackaged or causing build failures). @@ -357,11 +342,14 @@ grep -l -r --include="pom.xml" maven-pmd-plugin . | ( while read pom_path; do %p %pom_disable_module org.eclipse.mylyn.reviews . %pom_disable_module org.eclipse.mylyn.commons.tck-feature org.eclipse.mylyn.commons +%pom_disable_module org.eclipse.mylyn.commons.compatibility-feature org.eclipse.mylyn.commons %pom_disable_module org.eclipse.mylyn.tests org.eclipse.mylyn %pom_disable_module org.eclipse.mylyn.test-feature org.eclipse.mylyn.tasks +%pom_disable_module org.eclipse.mylyn.wikitext-standalone org.eclipse.mylyn.docs + #Disable all tests (except one that was easier to build than patch dependent bundles. # grep -v org.eclipse.mylyn.doc grep -l -r --include="pom.xml" "tests" . | ( while read pom_path; do echo `%pom_xpath_remove "*[local-name() = 'module' and contains(text(),'tests') and not(contains(text(),'tests.'))]" $pom_path` ; done ) ; @@ -375,10 +363,10 @@ grep -l -r --include="pom.xml" "tests" . | ( while read pom_path; do echo `%pom_ %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 -%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.10.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml -%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.10.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml -%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.10.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml -%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.10.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml +%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.11.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml +%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.11.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml +%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.11.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml +%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.11.0-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java @@ -490,12 +478,9 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.bugs_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.help.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.oslc.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.oslc.ui_*.jar %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons_* %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.soap_feature_* %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.activity_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.compatibility_* %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.identity_* %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.notifications_* %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.repositories_* @@ -522,7 +507,6 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.soap_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.xmlrpc_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.net_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_*.jar %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.context_feature_* %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.core_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.ui_*.jar @@ -610,15 +594,20 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust %files docs-wikitext %{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.wikitext_feature_* %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.core_*.jar +%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.core.ant_*.jar +%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.core.osgi_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.textile.core_*.jar +%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.html.core_*.jar +%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.mediawiki.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.mediawiki.core_*.jar +%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.markdown.core_*.jar +%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.markdown.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.confluence.core_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tracwiki.core_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.twiki.core_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.help.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.textile.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.mediawiki.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.confluence.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tracwiki.ui_*.jar %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.twiki.ui_*.jar @@ -707,6 +696,9 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust %doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/license.html %changelog +* Mon Mar 31 2014 Alexander Kurtakov 3.11.0-1 +- Update to upstream 3.11.0 release. + * Tue Mar 11 2014 Alexander Kurtakov 3.10.0-4 - Bump release for rebuild. - Make the lucene range include 4.x. diff --git a/fetch-compatibility.sh b/fetch-compatibility.sh deleted file mode 100755 index 742a52e..0000000 --- a/fetch-compatibility.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -TAG=20110110 - -rm -rf eclipse.platform.runtime-${TAG}.tar.bz2 -rm -rf eclipse.platform.runtime-${TAG} - -wget -O eclipse.platform.runtime-${TAG}.tar.bz2 http://git.eclipse.org/c/platform/eclipse.platform.runtime.git/snapshot/eclipse.platform.runtime-${TAG}.tar.bz2 - -tar xjf eclipse.platform.runtime-${TAG}.tar.bz2 - -pushd eclipse.platform.runtime-${TAG} - cd bundles/ - tar caf org.eclipse.core.runtime.compatibility.auth.tar.xz org.eclipse.core.runtime.compatibility.auth - mv org.eclipse.core.runtime.compatibility.auth.tar.xz ../../ -popd - -rm -rf eclipse.platform.runtime-${TAG}.tar.xz -rm -rf eclipse.platform.runtime-${TAG} \ No newline at end of file diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh index ad1dd2c..c355408 100755 --- a/fetch-eclipse-mylyn-incubator.sh +++ b/fetch-eclipse-mylyn-incubator.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="e93a849274d90e71a08afedc1d65c63053aaeb6c" +RELEASE_TAG="c94b24d5c1bfda43bf5782ce142ecf3e890beda8" FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-incubator-fetched-src" #clean up old runs diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh index 01032ee..b0bee97 100755 --- a/fetch-eclipse-mylyn.sh +++ b/fetch-eclipse-mylyn.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="R_3_10_0" +RELEASE_TAG="R_3_11_0" FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src" #clean up old runs diff --git a/lucene4.patch b/lucene4.patch index cd94e8b..faa4f40 100644 --- a/lucene4.patch +++ b/lucene4.patch @@ -1,7 +1,7 @@ diff --git a/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF index 44080b1..962ff79 100644 ---- a/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF -+++ b/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF +--- org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF ++++ org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF @@ -7,7 +7,9 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylyn.tasks.core;bundle-version="3.8.0", @@ -15,8 +15,8 @@ index 44080b1..962ff79 100644 Export-Package: org.eclipse.mylyn.internal.tasks.index.core;x-internal:=true diff --git a/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java b/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java index b1b88c1..1cbf72c 100644 ---- a/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java -+++ b/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java +--- org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java ++++ org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java @@ -11,8 +11,12 @@ *******************************************************************************/ package org.eclipse.mylyn.internal.tasks.index.core; @@ -49,11 +49,9 @@ index b1b88c1..1cbf72c 100644 return wrapper; } } -diff --git a/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java b/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java -index 153c5df..c29f5e3 100644 ---- a/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java -+++ b/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java -@@ -38,12 +38,16 @@ import org.apache.lucene.document.DateTools.Resolution; +--- org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java.sav 2014-03-28 12:12:59.000000000 +0200 ++++ org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java 2014-03-31 14:52:27.320005081 +0300 +@@ -38,12 +38,16 @@ import org.apache.lucene.document.DateTo import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Store; @@ -72,7 +70,7 @@ index 153c5df..c29f5e3 100644 import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; -@@ -590,12 +594,6 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -591,12 +595,6 @@ public class TaskListIndex implements IT } catch (IOException e) { StatusHandler.log(new Status(IStatus.ERROR, TasksIndexCore.ID_PLUGIN, "Unexpected failure within task list index", e)); //$NON-NLS-1$ @@ -85,7 +83,7 @@ index 153c5df..c29f5e3 100644 } } else { -@@ -673,12 +671,6 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -674,12 +672,6 @@ public class TaskListIndex implements IT } catch (IOException e) { StatusHandler.log(new Status(IStatus.ERROR, TasksIndexCore.ID_PLUGIN, "Unexpected failure within task list index", e)); //$NON-NLS-1$ @@ -98,7 +96,7 @@ index 153c5df..c29f5e3 100644 } } } finally { -@@ -768,7 +760,7 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -769,7 +761,7 @@ public class TaskListIndex implements IT try { synchronized (this) { if (indexReader == null) { @@ -107,7 +105,7 @@ index 153c5df..c29f5e3 100644 lastResults = null; } return indexReader; -@@ -982,7 +974,7 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -983,7 +975,7 @@ public class TaskListIndex implements IT if (value == null) { return; } @@ -116,7 +114,7 @@ index 153c5df..c29f5e3 100644 if (field == null) { field = new Field(indexField.getIndexKey(), value, Store.YES, org.apache.lucene.document.Field.Index.ANALYZED); -@@ -990,7 +982,7 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -991,7 +983,7 @@ public class TaskListIndex implements IT } else { String existingValue = field.stringValue(); if (!indexField.equals(FIELD_PERSON) || !existingValue.contains(value)) { @@ -125,7 +123,7 @@ index 153c5df..c29f5e3 100644 } } } -@@ -1003,13 +995,13 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -1004,13 +996,13 @@ public class TaskListIndex implements IT // move the date by the GMT offset if there is any String value = DateTools.dateToString(date, Resolution.HOUR); @@ -141,7 +139,7 @@ index 153c5df..c29f5e3 100644 } } -@@ -1068,7 +1060,7 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -1069,7 +1061,7 @@ public class TaskListIndex implements IT try { if (!rebuildIndex) { try { @@ -150,25 +148,21 @@ index 153c5df..c29f5e3 100644 reader.close(); } catch (CorruptIndexException e) { rebuildIndex = true; -@@ -1148,8 +1140,8 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL - } - - if (writer == null) { -- writer = new IndexWriter(directory, TaskAnalyzer.instance(), false, -- IndexWriter.MaxFieldLength.UNLIMITED); -+ writer = new IndexWriter(directory, new IndexWriterConfig(Version.LUCENE_CURRENT, -+ TaskAnalyzer.instance())); - } - - monitor.setWorkRemaining(workingQueue.size()); -@@ -1202,8 +1194,8 @@ public class TaskListIndex implements ITaskDataManagerListener, ITaskListChangeL +@@ -1216,7 +1208,7 @@ public class TaskListIndex implements IT + writer = createIndexWriter(true); + } catch (CorruptIndexException e) { + if (directory instanceof FSDirectory) { +- cleanDirectory(((FSDirectory) directory).getFile()); ++ cleanDirectory(((FSDirectory) directory).getDirectory()); + writer = createIndexWriter(true); + } else { + throw e; +@@ -1264,7 +1256,7 @@ public class TaskListIndex implements IT - monitor.beginTask(Messages.TaskListIndex_task_rebuilding_index, taskListState.indexableTasks.size()); - try { -- final IndexWriter writer = new IndexWriter(directory, TaskAnalyzer.instance(), true, -- IndexWriter.MaxFieldLength.UNLIMITED); -+ final IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(Version.LUCENE_CURRENT, -+ TaskAnalyzer.instance())); - try { + protected IndexWriter createIndexWriter(boolean create) throws CorruptIndexException, LockObtainFailedException, + IOException { +- return new IndexWriter(directory, TaskAnalyzer.instance(), create, IndexWriter.MaxFieldLength.UNLIMITED); ++ return new IndexWriter(directory, new IndexWriterConfig(Version.LUCENE_CURRENT, TaskAnalyzer.instance())); + } - for (ITask task : taskListState.indexableTasks) { + /** diff --git a/sources b/sources index e69a063..70ecc5c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -4bcafc5c0a7273a1b1593fd0b05b54bb eclipse-mylyn-e93a849274d90e71a08afedc1d65c63053aaeb6c-incubator-fetched-src.tar.xz -4218cf1884ad565b79ef209b6678730f eclipse-mylyn-R_3_10_0-fetched-src.tar.xz -19cadf9bb8912c60a72901b4e2b4dbcc org.eclipse.core.runtime.compatibility.auth.tar.xz +4aa842fe94cb2dcc11fed554f578f228 eclipse-mylyn-R_3_11_0-fetched-src.tar.xz +fd95b871f59ba559bc90f4cd0f47fc45 eclipse-mylyn-c94b24d5c1bfda43bf5782ce142ecf3e890beda8-incubator-fetched-src.tar.xz