[eclipse-mylyn] update to latest upstream.
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri May 3 08:38:04 UTC 2013
commit 5edfca163603d89261df344733af44b1f42d5a95
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri May 3 10:37:55 2013 +0200
update to latest upstream.
.gitignore | 3 +
eclipse-mylyn-add-apache-xmlrpc.patch | 2 +-
eclipse-mylyn-adjust-lucene-version.patch | 11 --
...se-mylyn-ensure-sites-build-after-changes.patch | 11 --
eclipse-mylyn-hudson-core-to-java6.patch | 69 --------
...hudson-feature-remove-unnecessary-imports.patch | 48 -----
eclipse-mylyn-merge-incubator.patch | 18 +-
eclipse-mylyn-remove-hudson-discovery.patch | 68 +-------
eclipse-mylyn-remove-javax-activation.patch | 17 +-
eclipse-mylyn-tasks-remove-javax.patch | 28 ---
eclipse-mylyn.spec | 185 ++++++++++----------
fetch-eclipse-mylyn-incubator.sh | 2 +-
fetch-eclipse-mylyn.sh | 2 +-
sources | 4 +-
14 files changed, 121 insertions(+), 347 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a8fb3a3..a0094f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,6 @@ eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2
/eclipse-mylyn-77b5432b77c14b1317751eac67156805d00053bc-incubator-fetched-src.tar.bz2
/eclipse-mylyn-f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e-fetched-src.tar.bz2
/eclipse-mylyn-f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e-fetched-src
+/eclipse-mylyn-8b09643ca21d8707ff8d646387015ebf3e4b0eaa-fetched-src.tar.bz2
+/eclipse-mylyn-f327e85766e4919d6a822dd516a7b9cb77e88b4a-incubator-fetched-src.tar.bz2
+/eclipse-mylyn-8b09643ca21d8707ff8d646387015ebf3e4b0eaa-fetched-src
diff --git a/eclipse-mylyn-add-apache-xmlrpc.patch b/eclipse-mylyn-add-apache-xmlrpc.patch
index 9f1a0d6..7907017 100644
--- a/eclipse-mylyn-add-apache-xmlrpc.patch
+++ b/eclipse-mylyn-add-apache-xmlrpc.patch
@@ -19,7 +19,7 @@
+ org.apache.xmlrpc.common
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF.bak 2012-07-03 14:20:13.726607170 +0200
+++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF 2012-07-03 14:20:25.813672358 +0200
@@ -10,7 +10,8 @@
diff --git a/eclipse-mylyn-ensure-sites-build-after-changes.patch b/eclipse-mylyn-ensure-sites-build-after-changes.patch
index 70540d6..9b67775 100644
--- a/eclipse-mylyn-ensure-sites-build-after-changes.patch
+++ b/eclipse-mylyn-ensure-sites-build-after-changes.patch
@@ -75,14 +75,3 @@
<feature url="features/org.eclipse.mylyn.commons.notifications_0.0.0.jar" id="org.eclipse.mylyn.commons.notifications" version="0.0.0">
<category name="SDK"/>
</feature>
---- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml.bak 2012-07-04 15:29:09.000000000 +0200
-+++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml 2012-07-04 15:29:27.390420639 +0200
-@@ -29,7 +29,7 @@
- </license>
-
- <plugin
-- id="org.eclipse.mylyn.commons.identity"
-+ id="org.eclipse.mylyn.commons.identity.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch
index 09514a4..fb357ec 100644
--- a/eclipse-mylyn-merge-incubator.patch
+++ b/eclipse-mylyn-merge-incubator.patch
@@ -1,15 +1,15 @@
--- org.eclipse.mylyn.tasks/pom.xml.bak 2012-07-09 15:23:33.000000000 +0200
+++ org.eclipse.mylyn.tasks/pom.xml 2012-07-09 15:27:48.377104943 +0200
@@ -86,5 +86,9 @@
- <module>org.eclipse.mylyn.trac.core</module>
- <module>org.eclipse.mylyn.trac.tests</module>
- <module>org.eclipse.mylyn.trac.ui</module>
-+ <module>org.eclipse.mylyn.trac.wiki</module>
-+ <module>org.eclipse.mylyn.trac.wiki-feature</module>
-+ <module>org.eclipse.mylyn.web.tasks</module>
-+ <module>org.eclipse.mylyn.web.tasks-feature</module>
- </modules>
- </project>
+ <module>org.eclipse.mylyn.trac.tests</module>
+ <module>org.eclipse.mylyn.trac.ui</module>
+ <module>org.eclipse.mylyn.trac.ui.tests</module>
++ <module>org.eclipse.mylyn.trac.wiki</module>
++ <module>org.eclipse.mylyn.trac.wiki-feature</module>
++ <module>org.eclipse.mylyn.web.tasks</module>
++ <module>org.eclipse.mylyn.web.tasks-feature</module>
+ </modules>
+ </project>
--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml.orig.bak 2012-07-09 15:23:30.000000000 +0200
+++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml 2012-07-09 15:31:00.397426765 +0200
@@ -3,8 +3,8 @@
diff --git a/eclipse-mylyn-remove-hudson-discovery.patch b/eclipse-mylyn-remove-hudson-discovery.patch
index c041e36..de1ab5e 100644
--- a/eclipse-mylyn-remove-hudson-discovery.patch
+++ b/eclipse-mylyn-remove-hudson-discovery.patch
@@ -257,74 +257,8 @@
+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF 2012-04-13 11:31:55.411145074 +0200
@@ -20,5 +20,4 @@
Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
-Export-Package: org.eclipse.mylyn.internal.hudson.ui;x-internal:=true
-Bundle-Activator: org.eclipse.mylyn.internal.hudson.ui.HudsonUiPlugin
+
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java 2012-08-20 12:50:17.000000000 +0200
-+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java 2012-08-20 12:50:17.000000000 +0200
-@@ -1,63 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2012 Tasktop Technologies 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
-- * http://www.eclipse.org/legal/epl-v10.html
-- *
-- * Contributors:
-- * Tasktop Technologies - initial API and implementation
-- *******************************************************************************/
--
--package org.eclipse.mylyn.internal.hudson.ui;
--
--import org.eclipse.core.runtime.IStatus;
--import org.eclipse.core.runtime.Status;
--import org.eclipse.mylyn.builds.ui.BuildsUiStartup;
--import org.eclipse.mylyn.commons.core.StatusHandler;
--
--/**
-- * @author Steffen Pingel
-- */
--public class HudsonStartup extends BuildsUiStartup {
--
-- private static HudsonStartup instance;
--
-- public static HudsonStartup getInstance() {
-- return instance;
-- }
--
-- public HudsonStartup() {
-- instance = this;
-- }
--
-- private HudsonDiscovery discovery;
--
-- @Override
-- public void lazyStartup() {
-- if (discovery != null) {
-- throw new IllegalStateException("Already started"); //$NON-NLS-1$
-- }
-- try {
-- discovery = new HudsonDiscovery();
-- discovery.start();
-- } catch (LinkageError e) {
-- // occurs when the optional ECF depedency is not satisfied
-- StatusHandler.log(new Status(IStatus.WARNING, HudsonUiPlugin.ID_PLUGIN,
-- "ECF integration failed to load. Hudson server auto discovery is not available.", e));
-- discovery = null;
-- }
-- }
--
-- public void stop() {
-- if (discovery != null) {
-- try {
-- discovery.stop();
-- } catch (NullPointerException e) {
-- // ignore, see bug 383316
-- }
-- discovery = null;
-- }
-- }
--
--}
diff --git a/eclipse-mylyn-remove-javax-activation.patch b/eclipse-mylyn-remove-javax-activation.patch
index adeaa6b..48e19e7 100644
--- a/eclipse-mylyn-remove-javax-activation.patch
+++ b/eclipse-mylyn-remove-javax-activation.patch
@@ -1,15 +1,16 @@
---- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/feature.xml.bak 2012-07-02 09:22:09.000000000 +0200
-+++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/feature.xml 2012-07-02 16:48:56.369660487 +0200
-@@ -297,12 +297,6 @@
- version="0.0.0"
- unpack="false"/>
+--- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap-feature/feature.xml.bak 2013-05-02 15:52:52.000000000 +0200
++++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap-feature/feature.xml 2013-05-02 16:37:08.799851336 +0200
+@@ -59,13 +55,6 @@
+ version="0.0.0"/>
-- <plugin
+ <plugin
- id="javax.activation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
+-
+- <plugin
id="javax.mail"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index bdb40ae..02c4272 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -2,8 +2,8 @@
%{!?scl:%global pkg_name %{name}}
%global install_loc %{_datadir}/eclipse/dropins
-%global tag f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e
-%global incubator_tag 77b5432b77c14b1317751eac67156805d00053bc
+%global tag 8b09643ca21d8707ff8d646387015ebf3e4b0eaa
+%global incubator_tag f327e85766e4919d6a822dd516a7b9cb77e88b4a
%define __jar_repack 0
%{!?scl:%global _non_scl_javadir %{_javadir}}
@@ -12,7 +12,7 @@
Name: %{?scl_prefix}eclipse-mylyn
Summary: Eclipse Mylyn main feature.
Version: 3.9.0
-Release: 0.2.gitf9e1cd%{?dist}
+Release: 0.3.git8b0964%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
@@ -29,20 +29,14 @@ Source6: redhat-bugzilla-custom-transitions.txt
Source7: eclipse-mylyn-%{incubator_tag}-incubator-fetched-src.tar.bz2
Source8: fetch-eclipse-mylyn-incubator.sh
-Patch1: %{pkg_name}-hudson-feature-remove-unnecessary-imports.patch
-Patch2: %{pkg_name}-hudson-core-to-java6.patch
-Patch3: %{pkg_name}-remove-hudson-discovery.patch
+Patch1: %{pkg_name}-remove-hudson-discovery.patch
+Patch2: %{pkg_name}-add-apache-xmlrpc.patch
+Patch3: %{pkg_name}-ensure-sites-build-after-changes.patch
+Patch4: %{pkg_name}-disable-online-tests.patch
-Patch4: %{pkg_name}-remove-javax-activation.patch
-Patch5: %{pkg_name}-tasks-remove-javax.patch
-Patch6: %{pkg_name}-add-apache-xmlrpc.patch
-
-Patch7: %{pkg_name}-ensure-sites-build-after-changes.patch
-Patch8: %{pkg_name}-disable-online-tests.patch
-
-Patch9: %{pkg_name}-build-compat.patch
-Patch10: %{pkg_name}-adjust-lucene-version.patch
-Patch11: %{pkg_name}-merge-incubator.patch
+Patch5: %{pkg_name}-build-compat.patch
+Patch7: %{pkg_name}-merge-incubator.patch
+Patch8: %{pkg_name}-remove-javax-activation.patch
BuildArch: noarch
@@ -68,7 +62,6 @@ 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: ws-jaxme >= 0.5.1-2.4
BuildRequires: jdom >= 1.1.2-3
BuildRequires: rome >= 0.9-9
BuildRequires: jakarta-commons-httpclient
@@ -79,6 +72,7 @@ BuildRequires: jacoco-maven-plugin
BuildRequires: google-gson >= 2.0.0
BuildRequires: javamail >= 1.4.3-11
BuildRequires: guava
+BuildRequires: xalan-j2
Requires: eclipse-platform >= 1:4.2.0
Requires: eclipse-rcp >= 1:4.2.0-0.6
@@ -88,7 +82,6 @@ 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: ws-jaxme >= 0.5.1-2.4
Requires: jpackage-utils
Requires: rome >= 0.9-9
Requires: xml-commons-apis
@@ -294,7 +287,6 @@ Summary: Mylyn Builds Connector: Hudson/Jenkins
Requires: java >= 1:1.7.0
Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0-0.6
Requires: %{name} = %{version}-%{release}
-Requires: ws-jaxme >= 0.5
Requires: google-gson >= 1.6.0
Requires: %{name}-builds = %{version}-%{release}
Group: Development/Tools
@@ -322,6 +314,7 @@ Requires: %{name}-versions-subclipse = %{version}-%{release}
Requires: %{name}-builds = %{version}-%{release}
Requires: %{name}-builds-hudson = %{version}-%{release}
Requires: guava
+Requires: xalan-j2
Group: Development/Tools
%description sdk
@@ -339,12 +332,9 @@ tar xjf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1
%patch3
%patch4
%patch5
-%patch6
%patch7
%patch8
-%patch9
-%patch10
-%patch11
+
#Disable plugins we can live without and for some reason are redundant (unpackaged or causing build failures).
#There must be empty line after each %%pom_* macro invocation.
@@ -371,10 +361,12 @@ grep -l -r --include="pom.xml" "tests" . | ( while read pom_path; do echo `%pom_
or child::*[local-name() = 'ws' and not(text() = 'gtk')]
or child::*[local-name() = 'arch' and not(text() = '%{_arch}')]) ]" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml
-#Prepare dependencies
+%pom_remove_plugin :tycho-packaging-plugin org.eclipse.mylyn/org.eclipse.mylyn-parent
+rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java
-mkdir -p orbitDeps/plugins
-pushd orbitDeps/plugins
+#Prepare dependencies
+mkdir -p .m2/p2/repo-sdk/plugins
+pushd .m2/p2/repo-sdk/plugins
ln -s %{_non_scl_javadir}/javamail/mail.jar
ln -s %{_non_scl_javadir}/jsoup.jar
ln -s %{_non_scl_javadir}/jdom.jar
@@ -388,7 +380,6 @@ ln -s %{_non_scl_javadir}/apache-commons-discovery.jar
ln -s %{_non_scl_javadir}/xmlrpc-client.jar
ln -s %{_non_scl_javadir}/xmlrpc-common.jar
ln -s %{_non_scl_javadir}/ws-commons-util.jar
-ln -s %{_non_scl_javadir}/jaxme/jaxmeapi.jar
ln -s %{_non_scl_javadir}/jaxp.jar
ln -s %{_non_scl_javadir}/google-gson.jar
ln -s %{_non_scl_javadir}/axis/axis.jar
@@ -397,25 +388,9 @@ ln -s %{_non_scl_javadir}/guava.jar
ln -s %{_non_scl_javadir}/commons-httpclient.jar
popd
-eclipse -debug -consolelog -nosplash -verbose \
--application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
--metadataRepository file:$PWD/.m2/p2/repo-sdk \
--artifactRepository file:$PWD/.m2/p2/repo-sdk \
--source $PWD/orbitDeps \
--compress -append -publishArtifacts
-
-
-# Kind of hackish. Incubator does not have 3.8.1 build and refers to 3.8.0 parents.
-# We need to update them.
-sed -i -e '0,/3.8.0/s/3.8.0/3.8.2/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml
-sed -i -e '0,/3.8.0/s/3.8.0/3.8.2/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml
-sed -i -e '0,/3.8.0/s/3.8.0/3.8.2/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml
-sed -i -e '0,/3.8.0/s/3.8.0/3.8.2/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml
-
%build
%{?scl:%scl_maven_opts}
-mvn-rpmbuild clean install -Dmaven.test.skip=true -DskipTychoVersionCheck
-#-DforceContextQualifier=v20120612-0600
+mvn-rpmbuild clean install -Dmaven.test.skip=true -DskipTychoVersionCheck -DforceContextQualifier=v20130502-1616
%install
install -d %{buildroot}%{install_loc}/mylyn
@@ -426,48 +401,73 @@ install -d %{buildroot}%{install_loc}/mylyn/eclipse/features
cp org.eclipse.mylyn/org.eclipse.mylyn-site/target/site/plugins/*.jar %{buildroot}%{install_loc}/mylyn/eclipse/plugins/
pushd %{buildroot}%{install_loc}/mylyn/eclipse/plugins/
-rm com.google.gson_*.jar
-rm com.sun.syndication_*.jar
-rm javax.mail_*.jar
-rm javax.wsdl_*.jar
-rm javax.xml.bind_*.jar
-rm javax.xml.rpc_*.jar
-rm javax.xml.soap_*.jar
-rm org.apache.axis_*.jar
-rm org.apache.commons.codec_*.jar
-rm org.apache.commons.discovery_*.jar
-rm org.apache.commons.io_*.jar
-rm org.apache.commons.lang_*.jar
-rm org.apache.commons.logging_*.jar
-rm org.apache.httpcomponents.httpclient_*.jar
-rm org.apache.httpcomponents.httpcore_*.jar
-rm org.apache.commons.httpclient_*.jar
-rm org.apache.lucene.core_*.jar
-rm org.apache.ws.commons.util_*.jar
-rm org.apache.xmlrpc_*.jar
-rm org.jdom_*.jar
-rm org.jsoup_*.jar
-rm com.google.guava_*.jar
-ln -s %{_non_scl_javadir}/jsoup.jar
-ln -s %{_non_scl_javadir}/jdom.jar
-ln -s %{_non_scl_javadir}/rome*.jar
-ln -s %{_non_scl_javadir}/apache-commons-lang.jar
-ln -s %{_non_scl_javadir}/apache-commons-io.jar
-ln -s %{_non_scl_javadir}/apache-commons-logging-api.jar
-ln -s %{_non_scl_javadir}/apache-commons-discovery.jar
-ln -s %{_non_scl_javadir}/xmlrpc-client.jar
-ln -s %{_non_scl_javadir}/xmlrpc-common.jar
-ln -s %{_non_scl_javadir}/ws-commons-util.jar
-ln -s %{_non_scl_javadir}/jaxme/jaxmeapi.jar
-ln -s %{_non_scl_javadir}/jaxp.jar
-ln -s %{_non_scl_javadir}/google-gson.jar
-ln -s %{_non_scl_javadir}/axis/axis.jar
-ln -s %{_non_scl_javadir}/axis/jaxrpc.jar
-ln -s %{_non_scl_javadir}/axis/saaj.jar
-ln -s %{_non_scl_javadir}/javamail/mail.jar
-ln -s %{_non_scl_javadir}/guava.jar
-ln -s %{_non_scl_javadir}/commons-httpclient.jar
+ rm com.google.gson_*.jar
+ ln -s %{_non_scl_javadir}/google-gson.jar
+
+ rm com.sun.syndication_*.jar
+ ln -s %{_non_scl_javadir}/rome*.jar
+
+ rm 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
+
+ rm org.apache.commons.lang_*.jar
+ ln -s %{_non_scl_javadir}/apache-commons-lang.jar
+
+ rm org.apache.commons.httpclient_*.jar
+ ln -s %{_non_scl_javadir}/commons-httpclient.jar
+
+ rm org.apache.ws.commons.util_*.jar
+ ln -s %{_non_scl_javadir}/ws-commons-util.jar
+
+ rm org.apache.xmlrpc_*.jar
+ ln -s %{_non_scl_javadir}/xmlrpc-client.jar
+ ln -s %{_non_scl_javadir}/xmlrpc-common.jar
+
+ rm org.jdom_*.jar
+ ln -s %{_non_scl_javadir}/jdom.jar
+
+ rm org.jsoup_*.jar
+ ln -s %{_non_scl_javadir}/jsoup.jar
+
+ rm com.google.guava_*.jar
+ ln -s %{_non_scl_javadir}/guava.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
+ rm org.apache.commons.logging_*.jar #bundled by platform
+ rm org.apache.commons.codec_*.jar #bundled by platform
popd
mkdir -p %{buildroot}%{install_loc}/mylyn/eclipse/features
@@ -494,6 +494,7 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{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_*
@@ -505,18 +506,14 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.activity.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.core_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.identity.core_*.jar
-%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.identity.ui_*.jar
-%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.notifications_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.notifications.core_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.notifications.feed_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.notifications.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.repositories.core_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.repositories.http.core_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.repositories.ui_*.jar
-%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.repositories_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.screenshots_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.ui_*.jar
-%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.team_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.workbench_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.discovery.core_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.discovery.ui*.jar
@@ -533,7 +530,6 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.resources.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.tasks.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/apache-commons-lang.jar
-%{install_loc}/mylyn/eclipse/plugins/apache-commons-logging-api.jar
%{install_loc}/mylyn/eclipse/plugins/apache-commons-io.jar
%{install_loc}/mylyn/eclipse/plugins/jdom.jar
%{install_loc}/mylyn/eclipse/plugins/rome*.jar
@@ -542,7 +538,6 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{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/jaxmeapi.jar
%{install_loc}/mylyn/eclipse/plugins/jaxp.jar
%{install_loc}/mylyn/eclipse/plugins/google-gson.jar
%{install_loc}/mylyn/eclipse/plugins/axis.jar
@@ -550,6 +545,7 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{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
@@ -628,6 +624,7 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tracwiki.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.twiki.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tasks.ui_*.jar
+%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.context.ui_*.jar
%{install_loc}/mylyn/eclipse/plugins/jsoup.jar
%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/epl-v10.html
%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/license.html
@@ -704,10 +701,16 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.*.source_*.jar
%{install_loc}/mylyn/eclipse/plugins/org.eclipse.cdt.mylyn.ui.source_*.jar
%{install_loc}/mylyn/eclipse/plugins/guava.jar
+%{install_loc}/mylyn/eclipse/plugins/xerces-j2.jar
+%{install_loc}/mylyn/eclipse/plugins/xalan-j2-serializer.jar
+%{install_loc}/mylyn/eclipse/plugins/xml-commons-resolver.jar
%doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/epl-v10.html
%doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/license.html
%changelog
+* Thu May 2 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.9.0-0.3.git8b0964
+- Update to latest upstream.
+
* Fri Mar 15 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.9.0-0.2.gitf9e1cd
- Make noarch always.
diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh
index a39fa44..06bdaf2 100755
--- a/fetch-eclipse-mylyn-incubator.sh
+++ b/fetch-eclipse-mylyn-incubator.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="77b5432b77c14b1317751eac67156805d00053bc"
+RELEASE_TAG="f327e85766e4919d6a822dd516a7b9cb77e88b4a"
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 bb5c847..6fab94a 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e"
+RELEASE_TAG="8b09643ca21d8707ff8d646387015ebf3e4b0eaa"
FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
#clean up old runs
diff --git a/sources b/sources
index 575a4c4..af47cd0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-adc7bdaa9764db70896b2d207d8c8cb3 eclipse-mylyn-77b5432b77c14b1317751eac67156805d00053bc-incubator-fetched-src.tar.bz2
-8cb62069b84cae4c0ba5c9cc1464aacb eclipse-mylyn-f9e1cd2b2977e5ad9a0615b3b0f7740a5ac3eb1e-fetched-src.tar.bz2
+78d299491f3c9846487850553ac23b29 eclipse-mylyn-8b09643ca21d8707ff8d646387015ebf3e4b0eaa-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