[eclipse-mylyn] Update to latest upstream release

Krzysztof Daniel kdaniel at fedoraproject.org
Mon Aug 20 13:13:25 UTC 2012 

commit 585b3235d3300bd368e580bf5cdbf541ff74ab07
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Aug 20 15:08:53 2012 +0200

    Update to latest upstream release

 .gitignore                                  |    4 +++
 eclipse-mylyn-compatibility-pom.xml         |    2 +-
 eclipse-mylyn-remove-hudson-discovery.patch |   30 +++++++++++++++-----------
 eclipse-mylyn-tasks-remove-javax.patch      |    2 +-
 eclipse-mylyn.spec                          |   20 ++++++++++++++---
 fetch-eclipse-mylyn.sh                      |    2 +-
 sources                                     |    2 +-
 7 files changed, 41 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7e6f59..e43341f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,7 @@ eclipse-mylyn-R_3_8_0-incubator-fetched-src.tar.bz2
 /eclipse-mylyn-R_3_8_0-fetched-src
 /results_eclipse-mylyn
 /eclipse-mylyn-3.8.0-1.fc18.src.rpm
+eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2
+/eclipse-mylyn-R_3_8_1-fetched-src
+/.m2
+/eclipse-mylyn-3.8.1-1.fc17.src.rpm
diff --git a/eclipse-mylyn-compatibility-pom.xml b/eclipse-mylyn-compatibility-pom.xml
index cc61b0a..e605d7e 100644
--- a/eclipse-mylyn-compatibility-pom.xml
+++ b/eclipse-mylyn-compatibility-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.commons-parent</artifactId>
     <groupId>org.eclipse.mylyn.commons</groupId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.8.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
   <version>3.2.200-SNAPSHOT</version>
diff --git a/eclipse-mylyn-remove-hudson-discovery.patch b/eclipse-mylyn-remove-hudson-discovery.patch
index 2505743..c041e36 100644
--- a/eclipse-mylyn-remove-hudson-discovery.patch
+++ b/eclipse-mylyn-remove-hudson-discovery.patch
@@ -253,9 +253,18 @@
  
 -jars.extra.classpath = platform:/plugin/org.eclipse.ecf,platform:/plugin/org.eclipse.ecf.discovery,platform:/plugin/org.eclipse.ecf.provider.discovery,platform:/plugin/org.eclipse.ecf.provider.jmdns
 +#jars.extra.classpath = platform:/plugin/org.eclipse.ecf,platform:/plugin/org.eclipse.ecf.discovery,platform:/plugin/org.eclipse.ecf.provider.discovery,platform:/plugin/org.eclipse.ecf.provider.jmdns
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java.bak	2012-03-08 11:41:59.000000000 +0100
-+++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java	1970-01-01 01:00:00.000000000 +0100
-@@ -1,59 +0,0 @@
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF.orig	2012-03-08 11:41:59.000000000 +0100
++++ 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-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
@@ -309,18 +318,13 @@
 -
 -	public void stop() {
 -		if (discovery != null) {
--			discovery.stop();
+-			try {
+-				discovery.stop();
+-			} catch (NullPointerException e) {
+-				// ignore, see bug 383316
+-			}
 -			discovery = null;
 -		}
 -	}
 -
 -}
---- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF.orig	2012-03-08 11:41:59.000000000 +0100
-+++ 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-Localization: plugin
--Export-Package: org.eclipse.mylyn.internal.hudson.ui;x-internal:=true
--Bundle-Activator: org.eclipse.mylyn.internal.hudson.ui.HudsonUiPlugin
-+
diff --git a/eclipse-mylyn-tasks-remove-javax.patch b/eclipse-mylyn-tasks-remove-javax.patch
index 46cbc30..364e47d 100644
--- a/eclipse-mylyn-tasks-remove-javax.patch
+++ b/eclipse-mylyn-tasks-remove-javax.patch
@@ -7,5 +7,5 @@
 -      <import plugin="javax.xml.bind" version="2.0.0" match="compatible"/>
 -      <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
        
-       <import feature="org.eclipse.mylyn_feature" version="3.8.0" match="equivalent"/>
+       <import feature="org.eclipse.mylyn_feature" version="3.8.1" match="equivalent"/>
     </requires>
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 98f2a15..269054f 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -1,11 +1,12 @@
 %global install_loc         %{_datadir}/eclipse/dropins
-%global tag 3_8_0
+%global tag 3_8_1
+%global incubator_tag 3_8_0
 %define __jar_repack 0
 
 Name: eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
-Version: 3.8.0
-Release: 6%{?dist}
+Version: 3.8.1
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -19,7 +20,7 @@ Source4: eclipse-mylyn-compatibility-pom.xml
  
 Source6: redhat-bugzilla-custom-transitions.txt
 
-Source7: eclipse-mylyn-R_%{tag}-incubator-fetched-src.tar.bz2
+Source7: eclipse-mylyn-R_%{incubator_tag}-incubator-fetched-src.tar.bz2
 Source8: fetch-eclipse-mylyn-incubator.sh 
 
 Patch1: %{name}-hudson-feature-remove-unnecessary-imports.patch
@@ -394,6 +395,14 @@ eclipse -debug -consolelog -nosplash -verbose \
 -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.1/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml
+sed -i -e '0,/3.8.0/s/3.8.0/3.8.1/' 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.1/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml
+sed -i -e '0,/3.8.0/s/3.8.0/3.8.1/' org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml
+
 %build
 mvn-rpmbuild clean install -Dmaven.test.skip=true 
 #-DforceContextQualifier=v20120612-0600
@@ -686,6 +695,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 Aug 20 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.1-1
+- Update to latest upstream release.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index e142353..48ba62e 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-RELEASE_TAG="R_3_8_0"
+RELEASE_TAG="R_3_8_1"
 FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
 
 #clean up old runs
diff --git a/sources b/sources
index cda82c2..dd7422e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-e34769317f707548b86cdaaa75b2bd1a  eclipse-mylyn-R_3_8_0-fetched-src.tar.bz2
+9c26e77cc433cd18bf7e595fca832675  eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2
 cf614787f054377d9cb9a18722b0c408  org.eclipse.core.runtime.compatibility.auth.tar.bz2
 330ebb2ef358ef54c408e9a08bfb3b1b  eclipse-mylyn-R_3_8_0-incubator-fetched-src.tar.bz2

More information about the scm-commits mailing list