[eclipse-mylyn-builds] - Update to upstream's 3.6.0 release.
jerboaa
jerboaa at fedoraproject.org
Thu Jul 14 17:53:26 UTC 2011
commit 414b2cc90a02c56fbceb07f2d7e6cb52a2e6ce7b
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Thu Jul 14 13:52:32 2011 -0400
- Update to upstream's 3.6.0 release.
.gitignore | 1 +
eclipse-mylyn-builds.spec | 68 +++--
fetch-eclipse-mylyn-builds.sh | 18 --
fix_hudson.core_plugin_java_6.patch | 77 +++++
fix_hudson_feature.patch | 24 ++
...on.ui-remove-glassfish-specific-impl-jaxb.patch | 291 --------------------
remove_hudson_discovery.patch | 152 ++++++++++
sources | 2 +-
8 files changed, 298 insertions(+), 335 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e738b3..a2c0a7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
eclipse-mylyn-builds-R_3_5_1-fetched-src.tar.bz2
+R_3_6_0.tar.bz2
diff --git a/eclipse-mylyn-builds.spec b/eclipse-mylyn-builds.spec
index f34c421..a828dbb 100644
--- a/eclipse-mylyn-builds.spec
+++ b/eclipse-mylyn-builds.spec
@@ -1,36 +1,38 @@
%global eclipse_base %{_libdir}/eclipse
%global install_loc %{_datadir}/eclipse/dropins
# Taken from update site so we match upstream
-# http://download.eclipse.org/mylyn/archive/3.5.1/v20110422-0200/
-%global qualifier v20110422-0200
+# http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/
+%global qualifier v20110608-1400
Name: eclipse-mylyn-builds
Summary: Eclipse Mylyn Builds
-Version: 3.5.1
-Release: 2%{?dist}
+Version: 3.6.0
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn/builds/
-# bash fetch-eclipse-mylyn-builds.sh
-Source0: eclipse-mylyn-builds-R_3_5_1-fetched-src.tar.bz2
-Source1: fetch-eclipse-mylyn-builds.sh
+Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.builds.git/snapshot/R_3_6_0.tar.bz2
-# This patches hudson related plug-ins so as to
-# - use non-glassfish specific JAXBContextBuilder class
-# - use java 6 exec environment
+# This patches hudson.core so as to
# - remove ecf-based auto-discovery
-# See also, Eclipse Bz: 325176.
-Patch0: remove-auto-discovery-o.e.m.hudson.ui-remove-glassfish-specific-impl-jaxb.patch
+Patch0: remove_hudson_discovery.patch
+# This patches hudson.core so as to
+# - use java 6 exec environment
+# See Eclipse Bz: 325176.
+Patch1: fix_hudson.core_plugin_java_6.patch
+# Need to build google-gson feature so that we
+# can symlink to system libraries
+Patch2: fix_hudson_feature.patch
BuildArch: noarch
BuildRequires: java-devel >= 1.6.0
-BuildRequires: eclipse-platform >= 1:3.4.0
-BuildRequires: eclipse-pde >= 1:3.4.0
-BuildRequires: eclipse-mylyn-commons >= 3.5.0
-BuildRequires: eclipse-mylyn >= 3.5.0
-BuildRequires: eclipse-mylyn-context-team >= 3.5.0
-BuildRequires: eclipse-mylyn-versions >= 3.5.0
+BuildRequires: eclipse-platform >= 1:3.5.0
+BuildRequires: eclipse-pde >= 1:3.5.0
+BuildRequires: eclipse-mylyn-commons >= 3.6.0
+BuildRequires: eclipse-mylyn >= 3.6.0
+BuildRequires: eclipse-mylyn-context-team >= 3.6.0
+BuildRequires: eclipse-mylyn-versions >= 3.6.0
BuildRequires: eclipse-emf
# Required for RestfulHudsonClient.java. However, this will only
# work with java 1.6 and up, but that's better than not working at all.
@@ -38,11 +40,12 @@ BuildRequires: ws-jaxme
# The following is required for javax.xml.stream (apparently openjdk ships it too)
# not sure what's best here.
BuildRequires: xml-commons-apis
+BuildRequires: google-gson >= 1.6.0
Requires: eclipse-mylyn >= 3.5.0
-Requires: eclipse-mylyn-commons >= 3.5.0
-Requires: eclipse-mylyn-context-team >= 3.5.0
+Requires: eclipse-mylyn-commons >= 3.6.0
+Requires: eclipse-mylyn-context-team >= 3.6.0
Requires: eclipse-emf
-Requires: eclipse-mylyn-versions >= 3.5.0
+Requires: eclipse-mylyn-versions >= 3.6.0
Requires: xml-commons-apis
@@ -56,9 +59,10 @@ build providers using Eclipse Mylyn.
%package hudson
Summary: Mylyn Builds Connector: Hudson/Jenkins
Requires: java >= 1:1.6.0
-Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-mylyn-commons >= 3.5.0
+Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-mylyn-commons >= 3.6.0
Requires: ws-jaxme
+Requires: google-gson >= 1.6.0
Requires: %{name} = %{version}-%{release}
Group: Development/Tools
@@ -67,8 +71,15 @@ Support for the open source Hudson and Jenkins continuous integration servers.
%prep
-%setup -q -n org.eclipse.mylyn.builds
+%setup -q -n R_3_6_0
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+rm -rf orbitDeps
+mkdir orbitDeps
+pushd orbitDeps
+ln -s %{_javadir}/google-gson.jar
+popd
%build
@@ -79,7 +90,7 @@ Support for the open source Hudson and Jenkins continuous integration servers.
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.hudson \
-a "-DjavacSource=1.6 -DjavacTarget=1.6 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJavaSE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \
- -d "mylyn-commons"
+ -d "mylyn-commons" -o `pwd`/orbitDeps
%install
@@ -92,6 +103,10 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-builds \
unzip -q -o -d %{buildroot}%{install_loc}/mylyn-builds-hudson \
build/rpmBuild/org.eclipse.mylyn.hudson.zip
+pushd %{buildroot}%{install_loc}/mylyn-builds-hudson/eclipse/plugins
+rm com.google.gson*.jar
+ln -s %{_javadir}/google-gson.jar
+popd
# eclipse-mylyn-builds
@@ -112,6 +127,9 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-builds-hudson \
%changelog
+* Thu Jul 14 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.6.0-1
+- Update to upstream's 3.6.0 release.
+
* Thu Apr 28 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.1-2
- Fixed typo.
diff --git a/fix_hudson.core_plugin_java_6.patch b/fix_hudson.core_plugin_java_6.patch
new file mode 100644
index 0000000..eff9298
--- /dev/null
+++ b/fix_hudson.core_plugin_java_6.patch
@@ -0,0 +1,77 @@
+diff --git a/org.eclipse.mylyn.hudson.core/.classpath b/org.eclipse.mylyn.hudson.core/.classpath
+index 7e8449de039d0d70f369179c7ddaa5854d8f2304..5d0495ecf1b234e343c974c430841995ba846964 100644
+--- a/org.eclipse.mylyn.hudson.core/.classpath
++++ b/org.eclipse.mylyn.hudson.core/.classpath
+@@ -2,7 +2,7 @@
+ <classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
+- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
++ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+ </classpath>
+diff --git a/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs
+index bbaca6d644cf4d480abb32e3f0ad937f6ed500dd..1bca883a2e53bc15c73e557bef134a9bb6a7a99f 100644
+--- a/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs
++++ b/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs
+@@ -1,4 +1,4 @@
+-#Wed Mar 02 16:00:06 PST 2011
++#Thu Jul 14 11:41:29 EDT 2011
+ eclipse.preferences.version=1
+ org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+ org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+@@ -9,9 +9,9 @@ org.eclipse.jdt.core.codeComplete.localSuffixes=
+ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+ org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+-org.eclipse.jdt.core.compiler.compliance=1.5
++org.eclipse.jdt.core.compiler.compliance=1.6
+ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+ org.eclipse.jdt.core.compiler.debug.localVariable=generate
+ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+@@ -75,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
+ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+-org.eclipse.jdt.core.compiler.source=1.5
++org.eclipse.jdt.core.compiler.source=1.6
+ org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+ org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
+ org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
+@@ -160,10 +160,8 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+ org.eclipse.jdt.core.formatter.indentation.size=4
+-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+diff --git a/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+index d2178f668e2d8e2537739df129bb4fb791f52ef3..99afff131517b989d26c76febbd0c02c0be71b53 100644
+--- a/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
++++ b/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+@@ -10,14 +10,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.mylyn.commons.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.mylyn.commons.repositories,
+- javax.xml.bind;bundle-version="2.1.0",
++ javax.xml.bind,
+ com.sun.xml.bind;bundle-version="2.2.0";resolution:=optional
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Localization: plugin
+ Export-Package: org.eclipse.mylyn.internal.hudson.core;x-internal:=true,
+ org.eclipse.mylyn.internal.hudson.core.client;x-internal:=true,
+ org.eclipse.mylyn.internal.hudson.model;x-internal:=true
+ Bundle-Activator: org.eclipse.mylyn.internal.hudson.core.HudsonCorePlugin
+ Import-Package: com.google.gson;version="1.6.0",
+- javax.xml.stream;version="1.0.1"
++ javax.xml.stream
diff --git a/fix_hudson_feature.patch b/fix_hudson_feature.patch
new file mode 100644
index 0000000..3c0d3c6
--- /dev/null
+++ b/fix_hudson_feature.patch
@@ -0,0 +1,24 @@
+diff --git a/org.eclipse.mylyn.hudson-feature/feature.xml b/org.eclipse.mylyn.hudson-feature/feature.xml
+index f5403faf9409afdd01999a340838f87755be79c5..a253e287fccda3cbc62288a45193273c97079c02 100644
+--- a/org.eclipse.mylyn.hudson-feature/feature.xml
++++ b/org.eclipse.mylyn.hudson-feature/feature.xml
+@@ -32,7 +32,6 @@
+ <import plugin="org.eclipse.mylyn.commons.net" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.mylyn.commons.repositories" version="0.8.0" match="compatible"/>
+ <import plugin="org.eclipse.mylyn.commons.ui" version="3.4.0" match="compatible"/>
+- <import plugin="com.google.gson" version="1.6.0" match="compatible"/>
+ <import plugin="com.sun.xml.bind" version="2.2.0" match="compatible"/>
+ <import plugin="javax.xml" version="1.3.4" match="compatible"/>
+ <import plugin="javax.xml.bind" version="2.1.0" match="compatible"/>
+@@ -54,4 +53,11 @@
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="com.google.gson"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
+ </feature>
diff --git a/remove_hudson_discovery.patch b/remove_hudson_discovery.patch
new file mode 100644
index 0000000..2df906e
--- /dev/null
+++ b/remove_hudson_discovery.patch
@@ -0,0 +1,152 @@
+diff --git a/org.eclipse.mylyn.hudson.ui/plugin.xml b/org.eclipse.mylyn.hudson.ui/plugin.xml
+index 6612ca72a99699db3ccc98a98e7003d2003dd5e6..b6f298555692dc5de5d32591ab7351bd18f8dd62 100644
+--- a/org.eclipse.mylyn.hudson.ui/plugin.xml
++++ b/org.eclipse.mylyn.hudson.ui/plugin.xml
+@@ -34,11 +34,4 @@
+ </description>
+ </wizard>
+ </extension>
+- <extension
+- point="org.eclipse.mylyn.builds.ui.startup">
+- <startup
+- class="org.eclipse.mylyn.internal.hudson.ui.HudsonDiscovery">
+- </startup>
+- </extension>
+-
+ </plugin>
+diff --git a/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java b/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
+deleted file mode 100644
+index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..0000000000000000000000000000000000000000
+--- a/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
++++ /dev/null
+@@ -1,130 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2010 Itema AS 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:
+- * Itema AS - initial API and implementation
+- *******************************************************************************/
+-
+-package org.eclipse.mylyn.internal.hudson.ui;
+-
+-import java.net.MalformedURLException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.util.List;
+-import java.util.UUID;
+-
+-import org.eclipse.core.runtime.IStatus;
+-import org.eclipse.core.runtime.Status;
+-import org.eclipse.ecf.core.ContainerConnectException;
+-import org.eclipse.ecf.core.ContainerCreateException;
+-import org.eclipse.ecf.core.ContainerFactory;
+-import org.eclipse.ecf.core.IContainer;
+-import org.eclipse.ecf.discovery.IDiscoveryLocator;
+-import org.eclipse.ecf.discovery.IServiceEvent;
+-import org.eclipse.ecf.discovery.IServiceInfo;
+-import org.eclipse.ecf.discovery.IServiceListener;
+-import org.eclipse.ecf.discovery.IServiceProperties;
+-import org.eclipse.ecf.discovery.identity.IServiceID;
+-import org.eclipse.ecf.discovery.identity.IServiceTypeID;
+-import org.eclipse.mylyn.builds.core.IBuildServer;
+-import org.eclipse.mylyn.builds.ui.BuildsUi;
+-import org.eclipse.mylyn.builds.ui.BuildsUiStartup;
+-import org.eclipse.mylyn.commons.core.StatusHandler;
+-import org.eclipse.osgi.util.NLS;
+-
+-/**
+- * This class implements a mechanism for discovering Hudson servers through the use of Multicast DNS (MDNS).
+- *
+- * @author Torkild U. Resheim
+- * @since 3.5
+- */
+-public class HudsonDiscovery extends BuildsUiStartup {
+-
+- private static final String ECF_DISCOVERY_JMDNS = "ecf.discovery.jmdns"; //$NON-NLS-1$
+-
+- private static final String ECF_SINGLETON_DISCOVERY = "ecf.singleton.discovery"; //$NON-NLS-1$
+-
+- private static final String HUDSON_MDNS_ID = "_hudson._tcp.local._iana"; //$NON-NLS-1$
+-
+- private static final String HUDSON_URL_PROPERTY_ID = "url"; //$NON-NLS-1$
+-
+- protected IContainer getContainer() throws ContainerCreateException {
+- return ContainerFactory.getDefault().createContainer(ECF_SINGLETON_DISCOVERY,
+- new Object[] { ECF_DISCOVERY_JMDNS });
+- }
+-
+- private boolean isNew(URI uri) {
+- List<IBuildServer> servers = BuildsUi.getModel().getServers();
+- for (IBuildServer server : servers) {
+- try {
+- if (server.getUrl().equalsIgnoreCase(uri.toURL().toExternalForm())) {
+- return false;
+- }
+- } catch (MalformedURLException e) {
+- StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN,
+- Messages.HudsonDiscovery_CannotConvertURI, e));
+- }
+- }
+- return true;
+- }
+-
+- @Override
+- public void lazyStartup() {
+- try {
+- final IContainer container = getContainer();
+- final IDiscoveryLocator adapter = (IDiscoveryLocator) getContainer().getAdapter(IDiscoveryLocator.class);
+- adapter.addServiceListener(new IServiceListener() {
+- public void serviceDiscovered(IServiceEvent anEvent) {
+- IServiceInfo serviceInfo = anEvent.getServiceInfo();
+- IServiceID serviceId = serviceInfo.getServiceID();
+- IServiceTypeID serviceTypeId = serviceId.getServiceTypeID();
+- if (serviceTypeId.getName().equals(HUDSON_MDNS_ID)) {
+- IServiceProperties properties = serviceInfo.getServiceProperties();
+- try {
+- if (properties.getProperty(HUDSON_URL_PROPERTY_ID) == null) {
+- notifyMessage(Messages.HudsonDiscovery_MessageTitle, NLS.bind(
+- Messages.HudsonDiscovery_MissingURL, new Object[] { serviceInfo.getLocation()
+- .getHost() }));
+-
+- } else {
+- URI uri = new URI(properties.getProperty(HUDSON_URL_PROPERTY_ID).toString());
+- if (isNew(uri)) {
+- notifyMessage(
+- Messages.HudsonDiscovery_MessageTitle,
+- NLS.bind(Messages.HudsonDiscovery_MessageText, new Object[] { uri,
+- Messages.HudsonDiscovery_ServerName, uri.toString(),
+- UUID.randomUUID().toString() }));
+- }
+- }
+- } catch (URISyntaxException e) {
+- StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
+- Messages.HudsonDiscovery_IncorrectURI,
+- new Object[] { properties.getProperty(HUDSON_URL_PROPERTY_ID).toString() }), e));
+- }
+- }
+- }
+-
+- public void serviceUndiscovered(IServiceEvent anEvent) {
+- // Ignore this for now
+- }
+- });
+- container.connect(null, null);
+-
+- } catch (ContainerCreateException e) {
+- StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
+- Messages.HudsonDiscovery_CouldNotStartService, e));
+- } catch (ContainerConnectException e) {
+- StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
+- Messages.HudsonDiscovery_CouldNotStartService, e));
+- }
+- }
+-
+- private void notifyMessage(String title, String description) {
+- BuildsUi.serverDiscovered(title, description);
+- }
+-
+-}
diff --git a/sources b/sources
index 9fd37f0..9c9818f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5a5debcf23697291073001007a3758e eclipse-mylyn-builds-R_3_5_1-fetched-src.tar.bz2
+b0bac8de5dca30499e2469694ff097eb R_3_6_0.tar.bz2
More information about the scm-commits
mailing list