[eclipse-mylyn] First 3.12.0 pre-release.
Alexander Kurtakov
akurtakov at fedoraproject.org
Sat May 10 11:43:02 UTC 2014
commit ed0169259425f5380160caae710afa16b14ccfed
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Sat May 10 14:43:24 2014 +0300
First 3.12.0 pre-release.
.gitignore | 2 +
eclipse-mylyn-add-apache-xmlrpc.patch | 10 ---
...se-mylyn-ensure-sites-build-after-changes.patch | 50 +++++++--------
eclipse-mylyn-merge-incubator.patch | 4 +-
eclipse-mylyn-remove-javax-activation.patch | 16 -----
eclipse-mylyn.spec | 66 +++++++------------
fetch-eclipse-mylyn-incubator.sh | 2 +-
fetch-eclipse-mylyn.sh | 2 +-
sources | 4 +-
9 files changed, 56 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 779ec83..e6a5ae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2
/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
+/eclipse-mylyn-8c077e351de3d0857512e7c4e48ad0f0a56e96ca-fetched-src.tar.xz
+/eclipse-mylyn-a1a4646ea6d027e89f828a9c45bd8fa79721a90c-incubator-fetched-src.tar.xz
diff --git a/eclipse-mylyn-add-apache-xmlrpc.patch b/eclipse-mylyn-add-apache-xmlrpc.patch
index 7907017..3b3afe2 100644
--- a/eclipse-mylyn-add-apache-xmlrpc.patch
+++ b/eclipse-mylyn-add-apache-xmlrpc.patch
@@ -1,13 +1,3 @@
---- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF.bak 2012-07-03 13:46:42.000000000 +0200
-+++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF 2012-07-03 13:53:20.179806103 +0200
-@@ -9,6 +9,7 @@
- javax.xml.soap;bundle-version="1.2.0",
- org.apache.axis;bundle-version="1.4.0",
- org.apache.commons.httpclient;bundle-version="[3.1.0,4.0.0)",
-+ org.apache.xmlrpc,
- org.eclipse.core.runtime,
- org.eclipse.core.net,
- org.eclipse.mylyn.commons.net;bundle-version="3.8.0"
--- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF.bak 2012-07-03 14:14:58.949909557 +0200
+++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF 2012-07-03 14:10:59.000000000 +0200
@@ -7,7 +7,8 @@
diff --git a/eclipse-mylyn-ensure-sites-build-after-changes.patch b/eclipse-mylyn-ensure-sites-build-after-changes.patch
index b7a569b..cda2f5b 100644
--- a/eclipse-mylyn-ensure-sites-build-after-changes.patch
+++ b/eclipse-mylyn-ensure-sites-build-after-changes.patch
@@ -12,32 +12,6 @@
<category-def name="Features" label="Mylyn Tasks Features">
<description>
Tools.
---- 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 @@
- <feature url="features/org.eclipse.mylyn.commons_0.0.0.jar" id="org.eclipse.mylyn.commons" version="0.0.0">
- <category name="Features"/>
- </feature>
-- <feature url="features/org.eclipse.mylyn.commons.activity_0.0.0.jar" id="org.eclipse.mylyn.commons.identity" version="0.0.0">
-- <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">
-+ <feature url="features/org.eclipse.mylyn.commons.activity_0.0.0.jar" id="org.eclipse.mylyn.commons.activity" version="0.0.0">
- <category name="Integration"/>
- </feature>
- <feature url="features/org.eclipse.mylyn.commons.identity_0.0.0.jar" id="org.eclipse.mylyn.commons.identity" version="0.0.0">
-@@ -46,9 +43,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.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 @@
@@ -94,3 +68,27 @@
<feature url="features/org.eclipse.mylyn.versions_0.0.0.jar" id="org.eclipse.mylyn.versions" version="0.0.0">
<category name="SDK"/>
</feature>
+--- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-site/site.xml.sav 2014-05-09 23:03:55.000000000 +0300
++++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-site/site.xml 2014-05-10 01:35:50.981785288 +0300
+@@ -16,10 +16,7 @@
+ <feature url="features/org.eclipse.mylyn.commons_0.0.0.jar" id="org.eclipse.mylyn.commons" version="0.0.0">
+ <category name="Features"/>
+ </feature>
+- <feature url="features/org.eclipse.mylyn.commons.activity_0.0.0.jar" id="org.eclipse.mylyn.commons.identity" version="0.0.0">
+- <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">
++ <feature url="features/org.eclipse.mylyn.commons.activity_0.0.0.jar" id="org.eclipse.mylyn.commons.activity" version="0.0.0">
+ <category name="Integration"/>
+ </feature>
+ <feature url="features/org.eclipse.mylyn.commons.identity_0.0.0.jar" id="org.eclipse.mylyn.commons.identity" version="0.0.0">
+@@ -43,9 +40,6 @@
+ <feature url="features/org.eclipse.mylyn.commons.sdk_0.0.0.jar" id="org.eclipse.mylyn.commons.sdk" 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">
+- <category name="SDK"/>
+- </feature>
+ <category-def name="Features" label="Mylyn Commons Features">
+ <description>
+ Tools.
diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch
index 8bde803..0eed96d 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.11.0.qualifier"
+ version="3.12.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.11.0.qualifier"
+ version="3.12.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.mylyn.sandbox.ui">
+ provider-name="%providerName">
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 4655a90..011d32a 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -2,16 +2,16 @@
%{!?scl:%global pkg_name %{name}}
%global install_loc %{_datadir}/eclipse/dropins
-%global tag R_3_11_0
-%global incubator_tag c94b24d5c1bfda43bf5782ce142ecf3e890beda8
+%global tag 8c077e351de3d0857512e7c4e48ad0f0a56e96ca
+%global incubator_tag a1a4646ea6d027e89f828a9c45bd8fa79721a90c
%{!?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.11.0
-Release: 1%{?dist}
+Version: 3.12.0
+Release: 0.1.git20140509%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
@@ -29,9 +29,8 @@ Patch2: %{pkg_name}-ensure-sites-build-after-changes.patch
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: lucene4.patch
+Patch5: %{pkg_name}-bug-419133.patch
+Patch6: lucene4.patch
BuildArch: noarch
@@ -48,7 +47,6 @@ BuildRequires: lucene
BuildRequires: lucene-queryparser
BuildRequires: maven-local
-BuildRequires: axis >= 1.4
BuildRequires: apache-commons-lang >= 2.6-6
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-io >= 2.3
@@ -59,7 +57,6 @@ 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: google-gson >= 2.0.0
BuildRequires: javamail >= 1.4.3-11
BuildRequires: guava
@@ -71,6 +68,8 @@ BuildRequires: mockito
BuildRequires: maven-install-plugin
BuildRequires: maven-deploy-plugin
BuildRequires: maven-plugin-build-helper
+BuildRequires: tika
+BuildRequires: tika-parsers
Requires: eclipse-platform >= 1:4.2.0
Requires: apache-commons-lang >= 2.6-6
@@ -86,7 +85,6 @@ Requires: httpcomponents-core >= 4.1.4
Requires: jakarta-commons-httpclient
Requires: apache-commons-discovery >= 0.5-2
Requires: jdom >= 1.1.2-3
-Requires: javamail >= 1.4.3-11
Requires: lucene
%{?scl:Requires: %scl_runtime}
@@ -327,9 +325,8 @@ tar xaf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1
%patch3 -b .sav
%patch4 -b .sav
%patch5
-%patch6
pushd org.eclipse.mylyn.tasks
-%patch7 -b .sav
+%patch6 -b .sav
popd
#Disable plugins we can live without and for some reason are redundant (unpackaged or causing build failures).
@@ -363,10 +360,11 @@ 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.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
+%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml
+%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-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:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml
+%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml
+sed -i -e "s|3.11.0-SNAPSHOT|3.12.0-SNAPSHOT|g" org.eclipse.mylyn.docs/pom.xml
rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java
@@ -395,36 +393,18 @@ pushd %{buildroot}%{install_loc}/mylyn/eclipse/plugins/
rm com.sun.syndication_*.jar
ln -s %{_non_scl_javadir}/rome*.jar
- rm com.sun.mail.javax.mail_*.jar
- ln -s %{_non_scl_javadir}/javamail/mail.jar
-
- rm javax.wsdl_*.jar
- ln -s %{_non_scl_javadir}/wsdl4j.jar
-
rm javax.xml_*.jar
ln -s %{_non_scl_javadir}/jaxp.jar
- rm javax.xml.rpc_*.jar
- ln -s %{_non_scl_javadir}/axis/jaxrpc.jar
-
- rm javax.xml.soap_*.jar
- ln -s %{_non_scl_javadir}/axis/saaj.jar
-
rm org.apache.xerces_*.jar
ln -s %{_non_scl_javadir}/xerces-j2.jar
- rm org.apache.axis_*.jar
- ln -s %{_non_scl_javadir}/axis/axis.jar
-
rm org.apache.xml.resolver_*.jar
ln -s %{_non_scl_javadir}/xml-commons-resolver.jar
rm org.apache.xml.serializer*.jar
ln -s %{_non_scl_javadir}/xalan-j2-serializer.jar
- rm org.apache.commons.discovery_*.jar
- ln -s %{_non_scl_javadir}/apache-commons-discovery.jar
-
rm org.apache.commons.io_*.jar
ln -s %{_non_scl_javadir}/apache-commons-io.jar
@@ -450,6 +430,12 @@ pushd %{buildroot}%{install_loc}/mylyn/eclipse/plugins/
rm com.google.guava_*.jar
ln -s %{_non_scl_javadir}/guava.jar
+ rm org.apache.tika.core_*.jar
+ ln -s %{_non_scl_javadir}/tika/tika-core.jar
+
+ rm org.apache.tika.parsers_*.jar
+ ln -s %{_non_scl_javadir}/tika/tika-parsers.jar
+
rm org.apache.lucene.core_*.jar #bundled by platform
rm org.apache.httpcomponents.httpclient_*.jar #bundled by platform
rm org.apache.httpcomponents.httpcore_*.jar #bundled by platform
@@ -479,7 +465,6 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{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/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.identity_*
%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.notifications_*
@@ -504,7 +489,6 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.monitor.core_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.monitor.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.sdk.util_*.jar
-%{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/features/org.eclipse.mylyn.context_feature_*
@@ -519,16 +503,10 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{install_loc}/mylyn/eclipse/plugins/xmlrpc-client.jar
%{install_loc}/mylyn/eclipse/plugins/xmlrpc-common.jar
%{install_loc}/mylyn/eclipse/plugins/commons-httpclient.jar
-%{install_loc}/mylyn/eclipse/plugins/apache-commons-discovery.jar
%{install_loc}/mylyn/eclipse/plugins/ws-commons-util.jar
%{install_loc}/mylyn/eclipse/plugins/jaxp.jar
%{install_loc}/mylyn/eclipse/plugins/google-gson.jar
-%{install_loc}/mylyn/eclipse/plugins/axis.jar
-%{install_loc}/mylyn/eclipse/plugins/jaxrpc.jar
-%{install_loc}/mylyn/eclipse/plugins/saaj.jar
-%{install_loc}/mylyn/eclipse/plugins/mail.jar
%{install_loc}/mylyn/eclipse/plugins/guava.jar
-%{install_loc}/mylyn/eclipse/plugins/wsdl4j.jar
%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/epl-v10.html
%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/license.html
@@ -629,6 +607,7 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.help_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.ant.core_*.jar
+%{install_loc}/mylyn/eclipse/plugins/tika*.jar
%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub-feature/epl-v10.html
%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub-feature/license.html
@@ -696,6 +675,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
+* Sat May 10 2014 Alexander Kurtakov <akurtako at redhat.com> 3.12.0-0.1.git20140509
+- First 3.12.0 pre-release
+
* Mon Mar 31 2014 Alexander Kurtakov <akurtako at redhat.com> 3.11.0-1
- Update to upstream 3.11.0 release.
diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh
index c355408..92fe395 100755
--- a/fetch-eclipse-mylyn-incubator.sh
+++ b/fetch-eclipse-mylyn-incubator.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="c94b24d5c1bfda43bf5782ce142ecf3e890beda8"
+RELEASE_TAG="a1a4646ea6d027e89f828a9c45bd8fa79721a90c"
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 b0bee97..ba49cf0 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="R_3_11_0"
+RELEASE_TAG="8c077e351de3d0857512e7c4e48ad0f0a56e96ca"
FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
#clean up old runs
diff --git a/sources b/sources
index 70ecc5c..a241edb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4aa842fe94cb2dcc11fed554f578f228 eclipse-mylyn-R_3_11_0-fetched-src.tar.xz
-fd95b871f59ba559bc90f4cd0f47fc45 eclipse-mylyn-c94b24d5c1bfda43bf5782ce142ecf3e890beda8-incubator-fetched-src.tar.xz
+f175e3f92b4092b3954088e681c21366 eclipse-mylyn-8c077e351de3d0857512e7c4e48ad0f0a56e96ca-fetched-src.tar.xz
+a06ec876be77aec8b4f9037acb77bf96 eclipse-mylyn-a1a4646ea6d027e89f828a9c45bd8fa79721a90c-incubator-fetched-src.tar.xz
More information about the scm-commits
mailing list