[eclipse-mylyn] Update to latest juno.
Krzysztof Daniel
kdaniel at fedoraproject.org
Tue Jul 10 06:44:55 UTC 2012
commit 64d85d5b06af63f02e7dac36f171ee72cf7f1a9f
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Jul 10 08:44:20 2012 +0200
Update to latest juno.
.gitignore | 6 +
...ug-378230-Submit-failed-invalide-severity.patch | 44 --
eclipse-mylyn-add-apache-xmlrpc.patch | 46 ++
eclipse-mylyn-adjust-lucene-version.patch | 81 +++
eclipse-mylyn-build-compat.patch | 10 +
eclipse-mylyn-compatibility-pom.xml | 19 +
eclipse-mylyn-disable-online-tests.patch | 59 ++
...se-mylyn-ensure-sites-build-after-changes.patch | 88 +++
eclipse-mylyn-hudson-core-to-java6.patch | 69 ++
...hudson-feature-remove-unnecessary-imports.patch | 48 ++
eclipse-mylyn-include-schema-for-tasks-core.patch | 10 -
eclipse-mylyn-merge-incubator.patch | 103 +++
eclipse-mylyn-remove-hudson-discovery.patch | 326 ++++++++++
eclipse-mylyn-remove-javax-activation.patch | 15 +
eclipse-mylyn-tasks-remove-javax.patch | 11 +
eclipse-mylyn.spec | 679 +++++++++++++++++++-
fetch-compatibility.sh | 18 +
fetch-eclipse-mylyn-incubator.sh | 36 +
fetch-eclipse-mylyn.sh | 48 +-
redhat-bugzilla-custom-transitions.txt | 15 +
sources | 4 +-
21 files changed, 1620 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c215c21..c7e6f59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,9 @@ eclipse-mylyn-R_3_7_0-fetched-src.tar.bz2
/eclipse-mylyn-R_3_7_0-fetched-src
/noarch
/.project
+org.eclipse.core.runtime.compatibility.auth.tar.bz2
+eclipse-mylyn-R_3_8_0-fetched-src.tar.bz2
+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
diff --git a/eclipse-mylyn-add-apache-xmlrpc.patch b/eclipse-mylyn-add-apache-xmlrpc.patch
new file mode 100644
index 0000000..9f1a0d6
--- /dev/null
+++ b/eclipse-mylyn-add-apache-xmlrpc.patch
@@ -0,0 +1,46 @@
+--- 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 @@
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.mylyn.commons.core;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.8.0,4.0.0)",
+- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
++ org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)",
++ org.apache.xmlrpc.common
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+--- 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 @@
+ org.eclipse.mylyn.commons.core;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.net,
+ org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.8.0,4.0.0)",
+- org.apache.xmlrpc
++ org.apache.xmlrpc,
++ org.apache.xmlrpc.common
+ Bundle-ActivationPolicy: lazy
+ Bundle-Vendor: %Bundle-Vendor
+ Bundle-ClassPath: .
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.bak 2012-07-02 09:23:09.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 2012-07-03 14:27:53.515951111 +0200
+@@ -9,7 +9,8 @@
+ org.eclipse.mylyn.commons.core;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.8.0,4.0.0)",
+- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
++ org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)",
++ org.apache.xmlrpc.common
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
+ org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
diff --git a/eclipse-mylyn-adjust-lucene-version.patch b/eclipse-mylyn-adjust-lucene-version.patch
new file mode 100644
index 0000000..b494987
--- /dev/null
+++ b/eclipse-mylyn-adjust-lucene-version.patch
@@ -0,0 +1,81 @@
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF.bak 2012-07-02 09:23:09.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF 2012-07-09 10:18:36.787041547 +0200
+@@ -7,7 +7,7 @@
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.mylyn.tasks.core;bundle-version="3.8.0",
+ org.eclipse.mylyn.commons.core;bundle-version="3.8.0",
+- org.apache.lucene.core;bundle-version="[2.9.1,3.0.0)"
++ org.apache.lucene.core
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.tasks.index.core;x-internal:=true
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml.bak 2012-07-02 09:23:09.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml 2012-07-09 10:41:29.526009473 +0200
+@@ -38,7 +38,7 @@
+ <import plugin="org.apache.commons.lang" version="2.3.0" match="compatible"/>
+ <import plugin="org.apache.commons.logging" version="1.0.4" match="compatible"/>
+ <import plugin="org.apache.commons.httpclient" version="3.1.0" match="compatible"/>
+- <import plugin="org.apache.lucene.core" version="2.9.1" match="compatible"/>
++ <import plugin="org.apache.lucene.core" version="0.0.0" match="compatible"/>
+
+ <import feature="org.eclipse.mylyn.discovery" version="3.8.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.monitor" version="3.8.0" match="compatible"/>
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java.bak 2012-07-02 09:23:09.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskAnalyzer.java 2012-07-09 12:49:08.508391039 +0200
+@@ -20,13 +20,20 @@
+ *
+ * @author David Green
+ */
+-class TaskAnalyzer extends PerFieldAnalyzerWrapper {
++class TaskAnalyzer {
+
+- public TaskAnalyzer() {
+- super(new StandardAnalyzer(Version.LUCENE_CURRENT));
+- addAnalyzer(TaskListIndex.FIELD_IDENTIFIER.getIndexKey(), new KeywordAnalyzer());
+- addAnalyzer(TaskListIndex.FIELD_TASK_KEY.getIndexKey(), new KeywordAnalyzer());
+- addAnalyzer(TaskListIndex.FIELD_REPOSITORY_URL.getIndexKey(), new KeywordAnalyzer());
++// public TaskAnalyzer() {
++// super(new StandardAnalyzer(Version.LUCENE_CURRENT));
++// addAnalyzer(TaskListIndex.FIELD_IDENTIFIER.getIndexKey(), new KeywordAnalyzer());
++// addAnalyzer(TaskListIndex.FIELD_TASK_KEY.getIndexKey(), new KeywordAnalyzer());
++// addAnalyzer(TaskListIndex.FIELD_REPOSITORY_URL.getIndexKey(), new KeywordAnalyzer());
++// }
++
++ public static PerFieldAnalyzerWrapper instance() {
++ PerFieldAnalyzerWrapper wrapper = new PerFieldAnalyzerWrapper(new StandardAnalyzer(Version.LUCENE_CURRENT));
++ wrapper.addAnalyzer(TaskListIndex.FIELD_IDENTIFIER.getIndexKey(), new KeywordAnalyzer());
++ wrapper.addAnalyzer(TaskListIndex.FIELD_TASK_KEY.getIndexKey(), new KeywordAnalyzer());
++ wrapper.addAnalyzer(TaskListIndex.FIELD_REPOSITORY_URL.getIndexKey(), new KeywordAnalyzer());
++ return wrapper;
+ }
+-
+ }
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java.bak 2012-07-02 09:23:09.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.index.core/src/org/eclipse/mylyn/internal/tasks/index/core/TaskListIndex.java 2012-07-09 12:46:43.953409552 +0200
+@@ -682,7 +682,7 @@
+ if (!hasBooleanSpecifiers && defaultField.equals(FIELD_SUMMARY) && !containsSpecialCharacters(patternString)) {
+ return new PrefixQuery(new Term(defaultField.getIndexKey(), patternString));
+ }
+- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField.getIndexKey(), new TaskAnalyzer());
++ QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField.getIndexKey(), TaskAnalyzer.instance());
+ Query q;
+ try {
+ q = qp.parse(patternString);
+@@ -1117,7 +1117,7 @@
+ }
+
+ if (writer == null) {
+- writer = new IndexWriter(directory, new TaskAnalyzer(), false,
++ writer = new IndexWriter(directory, TaskAnalyzer.instance(), false,
+ IndexWriter.MaxFieldLength.UNLIMITED);
+ }
+
+@@ -1171,7 +1171,7 @@
+
+ monitor.beginTask(Messages.TaskListIndex_task_rebuilding_index, taskListState.indexableTasks.size());
+ try {
+- final IndexWriter writer = new IndexWriter(directory, new TaskAnalyzer(), true,
++ final IndexWriter writer = new IndexWriter(directory, TaskAnalyzer.instance(), true,
+ IndexWriter.MaxFieldLength.UNLIMITED);
+ try {
+
diff --git a/eclipse-mylyn-build-compat.patch b/eclipse-mylyn-build-compat.patch
new file mode 100644
index 0000000..cfb6d53
--- /dev/null
+++ b/eclipse-mylyn-build-compat.patch
@@ -0,0 +1,10 @@
+--- org.eclipse.mylyn.commons/pom.xml.orig.bak 2012-07-05 16:10:08.000000000 +0200
++++ org.eclipse.mylyn.commons/pom.xml 2012-07-05 16:23:53.590921638 +0200
+@@ -44,6 +44,7 @@
+ </repository>
+ </repositories>
+ <modules>
++ <module>org.eclipse.core.runtime.compatibility.auth</module>
+ <module>org.eclipse.mylyn.commons-feature</module>
+ <module>org.eclipse.mylyn.commons-site</module>
+ <module>org.eclipse.mylyn.commons.core</module>
diff --git a/eclipse-mylyn-compatibility-pom.xml b/eclipse-mylyn-compatibility-pom.xml
new file mode 100644
index 0000000..cc61b0a
--- /dev/null
+++ b/eclipse-mylyn-compatibility-pom.xml
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.mylyn.commons-parent</artifactId>
+ <groupId>org.eclipse.mylyn.commons</groupId>
+ <version>3.8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
+ <version>3.2.200-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/eclipse-mylyn-disable-online-tests.patch b/eclipse-mylyn-disable-online-tests.patch
new file mode 100644
index 0000000..5d9c2bd
--- /dev/null
+++ b/eclipse-mylyn-disable-online-tests.patch
@@ -0,0 +1,59 @@
+--- org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.tests/pom.xml.bak 2012-07-02 09:22:28.000000000 +0200
++++ org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.tests/pom.xml 2012-07-05 12:59:13.696588682 +0200
+@@ -30,25 +30,6 @@
+ <build>
+ <plugins>
+ <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-antrun-plugin</artifactId>
+- <version>1.6</version>
+- <executions>
+- <execution>
+- <id>epubcheck</id>
+- <phase>generate-sources</phase>
+- <configuration>
+- <tasks>
+- <ant antfile="epubcheck.xml" inheritAll="true"/>
+- </tasks>
+- </configuration>
+- <goals>
+- <goal>run</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</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
+@@ -47,13 +47,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.mylyn.wikitext.tests"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ 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 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.eclipse.mylyn.wikitext.tests.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+
+ <plugin
+ id="org.eclipse.mylyn.wikitext.textile.core.source"
diff --git a/eclipse-mylyn-ensure-sites-build-after-changes.patch b/eclipse-mylyn-ensure-sites-build-after-changes.patch
new file mode 100644
index 0000000..70540d6
--- /dev/null
+++ b/eclipse-mylyn-ensure-sites-build-after-changes.patch
@@ -0,0 +1,88 @@
+--- org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml.bak 2012-07-02 09:21:54.000000000 +0200
++++ org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml 2012-07-03 16:24:54.277905705 +0200
+@@ -36,9 +36,9 @@
+ <feature url="features/org.eclipse.mylyn.cvs_0.0.0.jar" id="org.eclipse.mylyn.cvs" version="0.0.0">
+ <category name="Integration"/>
+ </feature>
+- <feature url="features/org.eclipse.mylyn.gerrit.feature_0.0.0.jar" id="org.eclipse.mylyn.gerrit.feature" version="0.0.0">
++ <!--feature url="features/org.eclipse.mylyn.gerrit.feature_0.0.0.jar" id="org.eclipse.mylyn.gerrit.feature" version="0.0.0">
+ <category name="Integration"/>
+- </feature>
++ </feature-->
+ <feature url="features/org.eclipse.mylyn.git_0.0.0.jar" id="org.eclipse.mylyn.git" version="0.0.0">
+ <category name="Integration"/>
+ </feature>
+@@ -103,21 +103,21 @@
+ <feature url="features/org.eclipse.mylyn.htmltext_0.0.0.jar" id="org.eclipse.mylyn.htmltext" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
+- <feature url="features/org.eclipse.mylyn.reviews.feature_0.0.0.jar" id="org.eclipse.mylyn.reviews.feature" version="0.0.0">
++ <!--feature url="features/org.eclipse.mylyn.reviews.feature_0.0.0.jar" id="org.eclipse.mylyn.reviews.feature" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
+ <feature url="features/org.eclipse.mylyn.reviews.sdk.feature_0.0.0.jar" id="org.eclipse.mylyn.reviews.sdk.feature" version="0.0.0">
+ <category name="SDK"/>
+- </feature>
++ </feature-->
+ <feature url="features/org.eclipse.mylyn.sdk_feature_0.0.0.jar" id="org.eclipse.mylyn.sdk_feature" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
+ <feature url="features/org.eclipse.mylyn.tasks.ide_0.0.0.jar" id="org.eclipse.mylyn.tasks.ide" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
+- <feature url="features/org.eclipse.mylyn.test_feature_0.0.0.jar" id="org.eclipse.mylyn.test_feature" version="0.0.0">
++ <!--feature url="features/org.eclipse.mylyn.test_feature_0.0.0.jar" id="org.eclipse.mylyn.test_feature" version="0.0.0">
+ <category name="SDK"/>
+- </feature>
++ </feature-->
+ <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.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 @@
+ <feature url="features/org.eclipse.mylyn.sdk_feature_0.0.0.jar" id="org.eclipse.mylyn.sdk_feature" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
+- <feature url="features/org.eclipse.mylyn.test_feature_0.0.0.jar" id="org.eclipse.mylyn.test_feature" version="0.0.0">
++ <!--feature url="features/org.eclipse.mylyn.test_feature_0.0.0.jar" id="org.eclipse.mylyn.test_feature" version="0.0.0">
+ <category name="SDK"/>
+- </feature>
++ </feature-->
+ <category-def name="Features" label="Mylyn Tasks Features">
+ <description>
+ 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 @@
+ <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">
++ <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.compatibility_0.0.0.jar" id="org.eclipse.mylyn.commons.compatibility" version="0.0.0">
+--- 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 @@
+ <feature url="features/org.eclipse.mylyn.commons.identity_0.0.0.jar" id="org.eclipse.mylyn.commons.identity" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
++ <feature url="features/org.eclipse.mylyn.commons.activity_0.0.0.jar" id="org.eclipse.mylyn.commons.activity" version="0.0.0">
++ <category name="SDK"/>
++ </feature>
+ <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-hudson-core-to-java6.patch b/eclipse-mylyn-hudson-core-to-java6.patch
new file mode 100644
index 0000000..360e985
--- /dev/null
+++ b/eclipse-mylyn-hudson-core-to-java6.patch
@@ -0,0 +1,69 @@
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs.bak 2012-03-08 11:41:59.000000000 +0100
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs 2012-03-27 14:37:52.707959396 +0200
+@@ -9,9 +9,9 @@
+ 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.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
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/.classpath.bak 2012-03-08 11:41:59.000000000 +0100
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/.classpath 2012-03-27 14:37:01.164748276 +0200
+@@ -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>
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF.bak 2012-07-02 12:52:10.372182073 +0200
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF 2012-07-02 09:22:00.000000000 +0200
+@@ -10,10 +10,10 @@
+ org.eclipse.mylyn.commons.core;bundle-version="3.8.0",
+ org.eclipse.mylyn.commons.repositories.core;bundle-version="1.0.0",
+ org.eclipse.mylyn.commons.repositories.http.core;bundle-version="1.0.0",
+- 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.hudson.core;x-internal:=true,
+ org.eclipse.mylyn.internal.hudson.core;x-internal:=true,
+@@ -22,13 +22,13 @@
+ Bundle-Activator: org.eclipse.mylyn.internal.hudson.core.HudsonCorePlugin
+ Import-Package: com.google.gson;version="[2.1.0,3.0.0)",
+ javax.activation,
+- javax.xml.stream;version="1.0.1",
++ javax.xml.stream,
+ org.apache.http;version="4.1.4",
+- org.apache.http.client;version="4.1.2",
+- org.apache.http.client.entity;version="4.1.2",
+- org.apache.http.client.methods;version="4.1.2",
+- org.apache.http.impl.client;version="4.1.2",
+- org.apache.http.cookie;version="4.1.2",
++ org.apache.http.client;version="4.1.3",
++ org.apache.http.client.entity;version="4.1.3",
++ org.apache.http.client.methods;version="4.1.3",
++ org.apache.http.impl.client;version="4.1.3",
++ org.apache.http.cookie;version="4.1.3",
+ org.apache.http.message;version="4.1.4",
+ org.apache.http.protocol;version="4.1.4",
+ org.apache.http.util;version="4.1.4"
diff --git a/eclipse-mylyn-hudson-feature-remove-unnecessary-imports.patch b/eclipse-mylyn-hudson-feature-remove-unnecessary-imports.patch
new file mode 100644
index 0000000..51eaca2
--- /dev/null
+++ b/eclipse-mylyn-hudson-feature-remove-unnecessary-imports.patch
@@ -0,0 +1,48 @@
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml.bak 2012-03-08 11:41:59.000000000 +0100
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml 2012-04-13 11:18:42.746707193 +0200
+@@ -30,10 +30,6 @@
+
+ <requires>
+ <import plugin="com.google.gson" version="2.1.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"/>
+- <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
+
+ <import feature="org.eclipse.mylyn.builds" version="1.0.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons.repositories.http" version="1.0.0" match="compatible"/>
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.sdk-feature/feature.xml.bak 2012-07-02 09:22:00.000000000 +0200
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.sdk-feature/feature.xml 2012-07-03 11:29:46.997160156 +0200
+@@ -71,32 +71,5 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="javax.xml.bind"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="javax.xml.stream"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="com.sun.xml.bind"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="javax.xml"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+
+ </feature>
diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch
new file mode 100644
index 0000000..69f0f0e
--- /dev/null
+++ b/eclipse-mylyn-merge-incubator.patch
@@ -0,0 +1,103 @@
+--- 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>
+--- 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 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+- <artifactId>org.eclipse.mylyn.incubator-parent</artifactId>
+- <groupId>org.eclipse.mylyn.incubator</groupId>
++ <artifactId>org.eclipse.mylyn.tasks-parent</artifactId>
++ <groupId>org.eclipse.mylyn.tasks</groupId>
+ <version>3.8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.mylyn.trac.wiki</artifactId>
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml.bak 2012-07-09 15:06:05.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml 2012-07-09 15:32:59.537242716 +0200
+@@ -3,8 +3,8 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+- <artifactId>org.eclipse.mylyn.incubator-parent</artifactId>
+- <groupId>org.eclipse.mylyn.incubator</groupId>
++ <artifactId>org.eclipse.mylyn.tasks-parent</artifactId>
++ <groupId>org.eclipse.mylyn.tasks</groupId>
+ <version>3.8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.mylyn.trac.wiki_feature</artifactId>
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml.orig.bak 2012-07-09 15:23:30.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml 2012-07-09 15:34:32.295948197 +0200
+@@ -3,8 +3,8 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+- <artifactId>org.eclipse.mylyn.incubator-parent</artifactId>
+- <groupId>org.eclipse.mylyn.incubator</groupId>
++ <artifactId>org.eclipse.mylyn.tasks-parent</artifactId>
++ <groupId>org.eclipse.mylyn.tasks</groupId>
+ <version>3.8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.mylyn.web.tasks</artifactId>
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml.bak 2012-07-09 15:06:05.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml 2012-07-09 15:35:32.489458027 +0200
+@@ -3,8 +3,8 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+- <artifactId>org.eclipse.mylyn.incubator-parent</artifactId>
+- <groupId>org.eclipse.mylyn.incubator</groupId>
++ <artifactId>org.eclipse.mylyn.tasks-parent</artifactId>
++ <groupId>org.eclipse.mylyn.tasks</groupId>
+ <version>3.8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.mylyn.web.tasks_feature</artifactId>
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/feature.xml.bak 2012-07-09 15:06:05.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/feature.xml 2012-07-09 15:48:55.733303630 +0200
+@@ -13,8 +13,7 @@
+ id="org.eclipse.mylyn.web.tasks_feature"
+ label="%featureName"
+ version="3.8.0.qualifier"
+- provider-name="%providerName"
+- plugin="org.eclipse.mylyn.sandbox.ui">
++ provider-name="%providerName">
+
+ <description url="http://eclipse.org/mylyn">
+ %description
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/feature.xml.bak 2012-07-09 15:49:49.000000000 +0200
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/feature.xml 2012-07-09 15:50:03.736772241 +0200
+@@ -13,8 +13,7 @@
+ id="org.eclipse.mylyn.trac.wiki_feature"
+ label="%featureName"
+ version="3.8.0.qualifier"
+- provider-name="%providerName"
+- plugin="org.eclipse.mylyn.sandbox.ui">
++ provider-name="%providerName">
+
+ <description url="http://eclipse.org/mylyn">
+ %description
+--- org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml.bak 2012-07-09 19:42:50.000000000 +0200
++++ org.eclipse.mylyn/org.eclipse.mylyn-site/site.xml 2012-07-09 19:54:02.657739369 +0200
+@@ -130,6 +130,12 @@
+ <feature url="features/org.eclipse.mylyn.wikitext.sdk_0.0.0.jar" id="org.eclipse.mylyn.wikitext.sdk" version="0.0.0">
+ <category name="SDK"/>
+ </feature>
++ <feature url="features/org.eclipse.mylyn.trac.wiki_feature_0.0.0.jar" id="org.eclipse.mylyn.trac.wiki_feature" version="0.0.0">
++ <category name="SDK"/>
++ </feature>
++ <feature url="features/org.eclipse.mylyn.web.tasks_feature_0.0.0.jar" id="org.eclipse.mylyn.web.tasks_feature" version="0.0.0">
++ <category name="SDK"/>
++ </feature>
+
+ <category-def name="Features" label="Mylyn Features">
+ <description>
diff --git a/eclipse-mylyn-remove-hudson-discovery.patch b/eclipse-mylyn-remove-hudson-discovery.patch
new file mode 100644
index 0000000..2505743
--- /dev/null
+++ b/eclipse-mylyn-remove-hudson-discovery.patch
@@ -0,0 +1,326 @@
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml.bak 2012-03-08 11:41:59.000000000 +0100
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/plugin.xml 2012-03-27 14:16:20.168665293 +0200
+@@ -34,11 +34,4 @@
+ </description>
+ </wizard>
+ </extension>
+- <extension
+- point="org.eclipse.mylyn.builds.ui.startup">
+- <startup
+- class="org.eclipse.mylyn.internal.hudson.ui.HudsonStartup">
+- </startup>
+- </extension>
+-
+ </plugin>
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.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/HudsonUiPlugin.java 1970-01-01 01:00:00.000000000 +0100
+@@ -1,35 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2011 Tasktop Technologies.
+- * 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.ui.plugin.AbstractUIPlugin;
+-import org.osgi.framework.BundleContext;
+-
+-/**
+- * @author Steffen Pingel
+- */
+-public class HudsonUiPlugin extends AbstractUIPlugin {
+-
+- public static String ID_PLUGIN = "org.eclipse.mylyn.hudson.ui";
+-
+- public HudsonUiPlugin() {
+- }
+-
+- @Override
+- public void stop(BundleContext context) throws Exception {
+- if (HudsonStartup.getInstance() != null) {
+- HudsonStartup.getInstance().stop();
+- }
+- super.stop(context);
+- }
+-
+-}
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.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/HudsonDiscovery.java 1970-01-01 01:00:00.000000000 +0100
+@@ -1,192 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2010, 2011 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:
+- * Torkild U. Resheim - initial API and implementation
+- * Torkild U. Resheim - Uniquely identify Jenkins servers, bug 341725
+- * Torkild U. Resheim - Distinguish between Hudson and Jenkins, bug 353861
+- * Tasktop Technologies - improvements
+- *******************************************************************************/
+-
+-package org.eclipse.mylyn.internal.hudson.ui;
+-
+-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.ui.BuildsUi;
+-import org.eclipse.mylyn.commons.core.StatusHandler;
+-import org.eclipse.mylyn.commons.repositories.core.RepositoryLocation;
+-import org.eclipse.osgi.util.NLS;
+-
+-/**
+- * This class implements a mechanism for discovering Hudson and Jenkins servers through the use of Multicast DNS (MDNS).
+- *
+- * @author Torkild U. Resheim, Itema AS
+- * @author Steffen Pingel
+- */
+-public class HudsonDiscovery {
+-
+- private static final String ECF_DISCOVERY_JMDNS = "ecf.discovery.jmdns"; //$NON-NLS-1$
+-
+- private static final String HUDSON_MDNS_ID = "_hudson._tcp.local._iana"; //$NON-NLS-1$
+-
+- private static final String JENKINS_MDNS_ID = "_jenkins._tcp.local._iana"; //$NON-NLS-1$
+-
+- private static final String URL_PROPERTY = "url"; //$NON-NLS-1$
+-
+- /** Server id property name (Jenkins only). */
+- private static final String SERVER_ID_PROPERTY = "server-id"; //$NON-NLS-1$
+-
+- private IContainer container;
+-
+- public HudsonDiscovery() {
+- }
+-
+- protected IContainer getContainer() throws ContainerCreateException {
+- return ContainerFactory.getDefault().createContainer(ECF_DISCOVERY_JMDNS);
+- }
+-
+- /**
+- * Determines whether or not the detected server is a new server or not.
+- *
+- * @param url
+- * the server URL
+- * @param id
+- * the server identifier
+- * @return <code>true</code> if the detected server is new.
+- */
+- private boolean isNew(String url, String id) {
+- if (url == null) {
+- return false;
+- }
+- List<RepositoryLocation> locations = BuildsUi.getServerLocations();
+- for (RepositoryLocation location : locations) {
+- if (location.hasUrl(url) || location.getId().equals(id)) {
+- return false;
+- }
+- }
+- return true;
+- }
+-
+- public void start() {
+- try {
+- container = getContainer();
+- final IDiscoveryLocator adapter = (IDiscoveryLocator) container.getAdapter(IDiscoveryLocator.class);
+- adapter.addServiceListener(new IServiceListener() {
+- public void serviceDiscovered(IServiceEvent anEvent) {
+- IServiceInfo serviceInfo = anEvent.getServiceInfo();
+- IServiceID serviceId = serviceInfo.getServiceID();
+- IServiceTypeID serviceTypeId = serviceId.getServiceTypeID();
+- // Note that Jenkins will claim that it's both Jenkins and
+- // Hudson for backward compatibility.
+- if (serviceTypeId.getName().equals(JENKINS_MDNS_ID)) {
+- IServiceProperties properties = serviceInfo.getServiceProperties();
+- try {
+- if (properties.getProperty(URL_PROPERTY) == null) {
+- notifyMessage(Messages.JenkinsDiscovery_MessageTitle, NLS.bind(
+- Messages.JenkinsDiscovery_MissingURL, new Object[] { serviceInfo.getLocation()
+- .getHost() }));
+- } else {
+- issueJenkinsNotification(properties);
+- }
+- } catch (URISyntaxException e) {
+- StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
+- Messages.Discovery_IncorrectURI,
+- new Object[] { properties.getProperty(URL_PROPERTY).toString() }), e));
+- }
+- }
+- if (serviceTypeId.getName().equals(HUDSON_MDNS_ID)) {
+- IServiceProperties properties = serviceInfo.getServiceProperties();
+- try {
+- if (properties.getProperty(URL_PROPERTY) == null) {
+- notifyMessage(Messages.HudsonDiscovery_MessageTitle, NLS.bind(
+- Messages.HudsonDiscovery_MissingURL, new Object[] { serviceInfo.getLocation()
+- .getHost() }));
+- } else {
+- issueHudsonNotification(properties);
+- }
+- } catch (URISyntaxException e) {
+- StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
+- Messages.Discovery_IncorrectURI,
+- new Object[] { properties.getProperty(URL_PROPERTY).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.Discovery_CouldNotStartService, e));
+- } catch (ContainerConnectException e) {
+- StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
+- Messages.Discovery_CouldNotStartService, e));
+- }
+- }
+-
+- public void stop() {
+- if (container != null) {
+- container.disconnect();
+- container = null;
+- }
+- }
+-
+- private void notifyMessage(String title, String description) {
+- BuildsUi.serverDiscovered(title, description);
+- }
+-
+- private void issueHudsonNotification(IServiceProperties properties) throws URISyntaxException {
+- String url = properties.getProperty(URL_PROPERTY).toString();
+- String id = getId(properties);
+- if (isNew(url, id)) {
+- notifyMessage(
+- Messages.HudsonDiscovery_MessageTitle,
+- NLS.bind(Messages.HudsonDiscovery_MessageText, new Object[] { url,
+- Messages.HudsonDiscovery_ServerName, url, id }));
+- }
+- }
+-
+- private void issueJenkinsNotification(IServiceProperties properties) throws URISyntaxException {
+- String url = properties.getProperty(URL_PROPERTY).toString();
+- String id = getId(properties);
+- if (isNew(url, id)) {
+- // Change the first segment (org.eclipse.mylyn.hudson) to the id of
+- // the new repository type when we start differentiation between the two
+- notifyMessage(
+- Messages.JenkinsDiscovery_MessageTitle,
+- NLS.bind(Messages.JenkinsDiscovery_MessageText, new Object[] { url,
+- Messages.JenkinsDiscovery_ServerName, url, id }));
+- }
+- }
+-
+- private String getId(IServiceProperties properties) {
+- String id = (String) properties.getProperty(SERVER_ID_PROPERTY);
+- if (id == null) {
+- id = UUID.randomUUID().toString();
+- }
+- return id;
+- }
+-
+-}
+--- org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties.bak 2012-03-27 14:48:20.000000000 +0200
++++ org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties 2012-03-27 14:48:32.555612843 +0200
+@@ -18,4 +18,4 @@
+ icons/
+ src.includes = about.html
+
+-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 @@
+-/*******************************************************************************
+- * 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) {
+- discovery.stop();
+- 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-remove-javax-activation.patch b/eclipse-mylyn-remove-javax-activation.patch
new file mode 100644
index 0000000..adeaa6b
--- /dev/null
+++ b/eclipse-mylyn-remove-javax-activation.patch
@@ -0,0 +1,15 @@
+--- 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"/>
+
+- <plugin
+- id="javax.activation"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+
+ <plugin
+ id="javax.mail"
diff --git a/eclipse-mylyn-tasks-remove-javax.patch b/eclipse-mylyn-tasks-remove-javax.patch
new file mode 100644
index 0000000..46cbc30
--- /dev/null
+++ b/eclipse-mylyn-tasks-remove-javax.patch
@@ -0,0 +1,11 @@
+--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/feature.xml.bak 2012-03-16 10:42:08.000000000 +0100
++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/feature.xml 2012-04-13 10:21:14.417113498 +0200
+@@ -33,8 +33,6 @@
+ <import plugin="org.eclipse.mylyn.commons.xmlrpc" version="3.8.0" match="compatible"/>
+ <import plugin="org.apache.xmlrpc" version="3.0.0" match="compatible"/>
+ <import plugin="org.apache.ws.commons.util" version="1.0.1" match="compatible"/>
+- <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"/>
+ </requires>
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index c7b4088..1c3d033 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -1,21 +1,41 @@
%global install_loc %{_datadir}/eclipse/dropins
-# Taken from update site so we match upstream
-# http://download.eclipse.org/mylyn/archive/3.6.3/v20110608-1400/
-%global qualifier v20120319-0200
-%global tag 3_7_0
+%global tag 3_8_0
+%define __jar_repack 0
Name: eclipse-mylyn
Summary: Eclipse Mylyn main feature.
-Version: 3.7.0
-Release: 5%{?dist}
+Version: 3.8.0
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
# bash fetch-eclipse-mylyn.sh
Source0: %{name}-R_%{tag}-fetched-src.tar.bz2
+Source1: fetch-eclipse-mylyn.sh
-Patch0: %{name}-include-schema-for-tasks-core.patch
-Patch1: 0001-REOPENED-bug-378230-Submit-failed-invalide-severity.patch
+Source2: org.eclipse.core.runtime.compatibility.auth.tar.bz2
+Source3: fetch-compatibility.sh
+Source4: eclipse-mylyn-compatibility-pom.xml
+
+Source6: redhat-bugzilla-custom-transitions.txt
+
+Source7: eclipse-mylyn-R_%{tag}-incubator-fetched-src.tar.bz2
+Source8: fetch-eclipse-mylyn-incubator.sh
+
+Patch1: %{name}-hudson-feature-remove-unnecessary-imports.patch
+Patch2: %{name}-hudson-core-to-java6.patch
+Patch3: %{name}-remove-hudson-discovery.patch
+
+Patch4: %{name}-remove-javax-activation.patch
+Patch5: %{name}-tasks-remove-javax.patch
+Patch6: %{name}-add-apache-xmlrpc.patch
+
+Patch7: %{name}-ensure-sites-build-after-changes.patch
+Patch8: %{name}-disable-online-tests.patch
+
+Patch9: %{name}-build-compat.patch
+Patch10: %{name}-adjust-lucene-version.patch
+Patch11: %{name}-merge-incubator.patch
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
@@ -24,63 +44,658 @@ BuildArch: noarch
%endif
BuildRequires: java-devel >= 1.7.0
+BuildRequires: javapackages-tools >= 0.4.0
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-mylyn-commons >= 3.7.0-9
-
-BuildRequires: rome >= 0.9-9
+BuildRequires: eclipse-cdt
+BuildRequires: eclipse-egit
+BuildRequires: eclipse-jgit
+BuildRequires: eclipse-subclipse
+BuildRequires: tycho >= 0.14.1-5
+BuildRequires: eclipse-egit
+BuildRequires: jacoco
+BuildRequires: lucene
+
+BuildRequires: axis >= 1.4
+BuildRequires: apache-commons-lang >= 2.6-6
+BuildRequires: apache-commons-logging
+BuildRequires: apache-commons-io >= 2.3
+BuildRequires: ws-commons-util >= 1.0.1-21
+BuildRequires: xmlrpc3-client >= 3.1.3-8
+BuildRequires: xmlrpc3-common >= 3.1.3-8
+BuildRequires: ws-jaxme >= 0.5.1-2.4
BuildRequires: jdom >= 1.1.2-3
+BuildRequires: rome >= 0.9-9
+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
Requires: eclipse-platform >= 1:4.2.0
-Requires: eclipse-mylyn-commons >= 3.7.0-9
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: xmlrpc3-client >= 3.1.3-8
+Requires: xmlrpc3-common >= 3.1.3-8
+Requires: ws-jaxme >= 0.5.1-2.4
+Requires: jpackage-utils
Requires: rome >= 0.9-9
+Requires: xml-commons-apis
+Requires: httpcomponents-client >= 4.1.3-2
+Requires: httpcomponents-core >= 4.1.4
+Requires: apache-commons-discovery >= 0.5-2
Requires: jdom >= 1.1.2-3
+Requires: javamail >= 1.4.3-11
+Requires: lucene
+
+Provides: %{name}-commons = %{version}-%{release}
+Obsoletes: %{name}-commons < %{version}-%{release}
+Provides: %{name}-context = %{version}-%{release}
+Obsoletes: %{name}-context < %{version}-%{release}
+Obsoletes: %{name}-java < %{version}-%{release}
+Obsoletes: %{name}-pde < %{version}-%{release}
+Obsoletes: %{name}-cdt < %{version}-%{release}
+Obsoletes: %{name}-context-team < %{version}-%{release}
+Obsoletes: %{name}-ide < %{version}-%{release}
+Obsoletes: %{name}-bugzilla < %{version}-%{release}
+Obsoletes: %{name}-wikitext < %{version}-%{release}
+Obsoletes: %{name}-trac < %{version}-%{release}
+Obsoletes: %{name}-webtasks < %{version}-%{release}
+Obsoletes: %{name}-versions < %{version}-%{release}
+Obsoletes: %{name}-versions-git < %{version}-%{release}
+Obsoletes: %{name}-builds < %{version}-%{release}
+Obsoletes: %{name}-builds-hudson < %{version}-%{release}
Group: Development/Tools
+
%description
Mylyn integrates task support into Eclipse. It supports offline editing
for certain task repositories and monitors work activity to hide
information that is not relevant to the current task.
+%package context-java
+Summary: Mylyn Bridge: Java Development
+Requires: eclipse-jdt
+Requires: %{name}-context = %{version}-%{release}
+Provides: eclipse-mylyn-java = %{version}-%{release}
+Obsoletes: eclipse-context-java < %{version}-%{release}
+Group: Development/Tools
+
+%description context-java
+Mylyn Task-Focused UI extensions for JDT. Provides focusing of Java
+element views and editors.
+
+%package context-pde
+Summary: Mylyn Bridge: Plug-in Development
+Requires: eclipse-pde
+Requires: %{name}-java = %{version}-%{release}
+Provides: eclipse-mylyn-pde = %{version}-%{release}
+Obsoletes: eclipse-context-pde < %{version}-%{release}
+Group: Development/Tools
+
+%description context-pde
+Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS.
+
+%package context-cdt
+Summary: Mylyn Bridge: C/C++ Development
+Requires: %{name}-context = %{version}-%{release}
+Requires: eclipse-cdt
+Group: Development/Tools
+Provides: eclipse-cdt-mylyn = 2:1.0.0-1.fc12
+Provides: eclipse-mylyn-cdt = %{version}-%{release}
+Obsoletes: eclipse-context-cdt < %{version}-%{release}
+Obsoletes: eclipse-cdt-mylyn < 2:1.0.0
+
+%description context-cdt
+Mylyn Task-Focused UI extensions for CDT. Provides focusing of C/C++
+element views and editors.
+
+
+%package context-team
+Summary: Mylyn Context Connector: Team Support
+Requires: %{name}-context = %{version}-%{release}
+Group: Development/Tools
+
+%description context-team
+Mylyn Task-Focused UI extensions for Team version control.
+
+%package ide
+Summary: Mylyn Context Connector: Eclipse IDE
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-context = %{version}-%{release}
+Requires: %{name}-context-team = %{version}-%{release}
+
+%description ide
+Mylyn Task-Focused UI extensions for the Eclipse IDE.
+Provides focusing of common IDE views and editors.
+
+%package tasks-bugzilla
+Summary: Mylyn Tasks Connector: Bugzilla
+Requires: eclipse-platform >= 1:4.2.0
+Requires: %{name} = %{version}-%{release}
+Provides: eclipse-mylyn-bugzilla = %{version}-%{release}
+Group: Development/Tools
+
+%description tasks-bugzilla
+Provides Task List integration, offline support and rich editing for the
+open source Bugzilla bug tracker.
+
+
+%package docs-wikitext
+Summary: Mylyn WikiText
+Requires: eclipse-platform >= 1:3.8.0
+Requires: %{name} = %{version}-%{release}
+Requires: eclipse-mylyn-context = %{version}-%{release}
+Requires: jsoup
+Provides: eclipse-mylyn-wikitext = %{version}-%{release}
+Group: Development/Tools
+
+%description docs-wikitext
+Enables parsing and display of lightweight markup (wiki text).
+
+
+%package docs-htmltext
+Summary: Mylyn HtmlText
+Requires: eclipse-platform >= 1:3.8.0
+Group: Development/Tools
+
+%description docs-htmltext
+Enables editing of HTML text.
+
+%package docs-epub
+Summary: Mylyn EPub
+Requires: eclipse-platform >= 1:3.8.0
+Group: Development/Tools
+
+%description docs-epub
+The EPUB framework in Mylyn Docs offers API to create, manipulate,
+read and write EPUB formatted files.
+
+%package tasks-trac
+Summary: Mylyn Tasks Connector: Trac
+Requires: eclipse-platform >= 1:4.2.0
+Requires: eclipse-mylyn = %{version}-%{release}
+Requires: eclipse-mylyn-context = %{version}-%{release}
+Requires: google-gson
+Group: Development/Tools
+Provides: eclipse-mylyn-trac = %{version}-%{release}
+
+%description tasks-trac
+Provides Task List integration, offline support and rich editing
+for the open source Trac issue tracker.
+
+%package tasks-web
+Summary: Mylyn Tasks Connector: Web Templates (Advanced) (Incubation)
+Requires: eclipse-platform >= 1:4.2.0
+Requires: %{name} = %{version}-%{release}
+Requires: rome >= 0.9-9
+Requires: jdom >= 1.1.2-3
+Group: Development/Tools
+Provides: %{name}-webtasks = %{version}-%{release}
+
+%description tasks-web
+Provides Task List integration for web-based issue trackers
+and templates for example projects.
+
+
+%package versions
+Summary: Eclipse Mylyn Versions
+Requires: %{name} = %{version}-%{release}
+Group: Development/Tools
+
+%description versions
+Provides a framework for accessing team providers for Eclipse Mylyn.
+
+
+%package versions-git
+Summary: Mylyn Versions Connector: Git
+Requires: eclipse-platform >= 1:3.8.0
+Requires: eclipse-egit >= 0.10.1
+Requires: %{name}-versions = %{version}-%{release}
+Group: Development/Tools
+
+%description versions-git
+Provides Git integration for Eclipse Mylyn.
+
+%package versions-cvs
+Summary: Mylyn Versions Connector: CVS
+Requires: eclipse-platform >= 1:3.8.0
+Requires: %{name}-versions = %{version}-%{release}
+Group: Development/Tools
+
+%description versions-cvs
+Provides CVS integration for Eclipse Mylyn.
+
+%package versions-subclipse
+Summary: Mylyn Versions Connector: CVS
+Requires: eclipse-platform >= 1:3.8.0
+Requires: %{name}-versions = %{version}-%{release}
+Requires: eclipse-subclipse
+Group: Development/Tools
+
+%description versions-subclipse
+Provides CVS integration for Eclipse Mylyn.
+
+%package builds
+Summary: Eclipse Mylyn Builds
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-context = %{version}-%{release}
+Requires: eclipse-emf
+Requires: %{name}-versions = %{version}-%{release}
+Requires: xml-commons-apis
+
+%description builds
+Provides a common framework to interact with continuous integration
+build providers using Eclipse Mylyn.
+
+%package builds-hudson
+Summary: Mylyn Builds Connector: Hudson/Jenkins
+Requires: java >= 1:1.7.0
+Requires: 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
+
+%description builds-hudson
+Support for the open source Hudson and Jenkins continuous integration servers.
+
+%package sdk
+Summary: Mylyn SDK
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-context = %{version}-%{release}
+Requires: %{name}-context-java = %{version}-%{release}
+Requires: %{name}-context-pde = %{version}-%{release}
+Requires: %{name}-context-cdt = %{version}-%{release}
+Requires: %{name}-context-team = %{version}-%{release}
+Requires: %{name}-ide = %{version}-%{release}
+Requires: %{name}-tasks-bugzilla = %{version}-%{release}
+Requires: %{name}-docs-wikitext = %{version}-%{release}
+Requires: %{name}-docs-htmltext = %{version}-%{release}
+Requires: %{name}-tasks-trac = %{version}-%{release}
+Requires: %{name}-versions = %{version}-%{release}
+Requires: %{name}-versions-git = %{version}-%{release}
+Requires: %{name}-versions-cvs = %{version}-%{release}
+Requires: %{name}-versions-subclipse = %{version}-%{release}
+Requires: %{name}-builds = %{version}-%{release}
+Requires: %{name}-builds-hudson = %{version}-%{release}
+Group: Development/Tools
+
+%description sdk
+Sources for all Mylyn bundles
+
+
%prep
%setup -q -n eclipse-mylyn-R_%{tag}-fetched-src
-%patch0
-%patch1 -p1
-rm -rf orbitDeps
-mkdir orbitDeps
-pushd orbitDeps
+tar xjf %{SOURCE2} -C org.eclipse.mylyn.commons
+cp %{SOURCE4} org.eclipse.mylyn.commons/org.eclipse.core.runtime.compatibility.auth/pom.xml
+tar xjf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1
+
+%patch1
+%patch2
+%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.
+grep -l -r --include="pom.xml" findbugs-maven-plugin . | ( while read pom_path; do %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin $pom_path ; done ) ;
+
+grep -l -r --include="pom.xml" maven-pmd-plugin . | ( while read pom_path; do %pom_remove_plugin org.apache.maven.plugins:maven-pmd-plugin $pom_path ; done ) ;
+
+#Disable modules we can't build yet
+%pom_disable_module org.eclipse.mylyn.reviews .
+
+%pom_disable_module org.eclipse.mylyn.tests org.eclipse.mylyn .
+
+%pom_disable_module org.eclipse.mylyn.test-feature org.eclipse.mylyn.tasks .
+
+#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 ) ;
+
+#Remove all architectures that do not match current build architecture.
+%pom_xpath_remove "*[local-name() = 'environment' and
+ (child::*[local-name() = 'os' and not(text() = 'linux')]
+ 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
+
+mkdir -p orbitDeps/plugins
+pushd orbitDeps/plugins
+ln -s %{_javadir}/javamail/mail.jar
+ln -s %{_javadir}/jsoup.jar
ln -s %{_javadir}/jdom.jar
ln -s %{_javadir}/rome*.jar
+ln -s %{_javadir}/apache-commons-lang.jar
+ln -s %{_javadir}/httpcomponents/httpcore.jar
+ln -s %{_javadir}/httpcomponents/httpclient.jar
+ln -s %{_javadir}/apache-commons-io.jar
+ln -s %{_javadir}/apache-commons-logging-api.jar
+ln -s %{_javadir}/apache-commons-discovery.jar
+ln -s %{_javadir}/xmlrpc3-client.jar
+ln -s %{_javadir}/xmlrpc3-common.jar
+ln -s %{_javadir}/ws-commons-util.jar
+ln -s %{_javadir}/jaxme/jaxmeapi.jar
+ln -s %{_javadir}/jaxp.jar
+ln -s %{_javadir}/google-gson.jar
+ln -s %{_javadir}/axis/axis.jar
+ln -s %{_javadir}/axis/jaxrpc.jar
popd
-%build
-eclipse-pdebuild -f org.eclipse.mylyn_feature \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -d "mylyn-commons" -o `pwd`/orbitDeps
+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
-eclipse-pdebuild -f org.eclipse.mylyn.tasks.ide \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -d "mylyn-commons" -o `pwd`/orbitDeps
+%build
+mvn-rpmbuild clean install -Dmaven.test.skip=true -DforceContextQualifier=v20120612-0600
%install
-install -d -m 755 %{buildroot}%{_datadir}/eclipse
-install -d -m 755 %{buildroot}%{install_loc}/mylyn
+install -d %{buildroot}%{install_loc}/mylyn
+install -d %{buildroot}%{install_loc}/mylyn/plugins
+install -d %{buildroot}%{install_loc}/mylyn/features
+
+cp org.eclipse.mylyn/org.eclipse.mylyn-site/target/site/plugins/*.jar %{buildroot}%{install_loc}/mylyn/plugins/
+
+pushd %{buildroot}%{install_loc}/mylyn/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 javax.xml_*.jar
+rm org.apache.axis_*.jar
+rm org.apache.commons.codec_*.jar
+rm org.apache.commons.discovery_*.jar
+rm org.apache.commons.httpclient_*.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.lucene.core_*.jar
+rm org.apache.ws.commons.util_*.jar
+rm org.apache.xmlrpc_*.jar
+rm org.jdom_*.jar
+rm org.jsoup_*.jar
+ln -s %{_javadir}/jsoup.jar
+ln -s %{_javadir}/jdom.jar
+ln -s %{_javadir}/rome*.jar
+ln -s %{_javadir}/apache-commons-lang.jar
+ln -s %{_javadir}/httpcomponents/httpcore.jar
+ln -s %{_javadir}/httpcomponents/httpclient.jar
+ln -s %{_javadir}/apache-commons-io.jar
+ln -s %{_javadir}/apache-commons-logging-api.jar
+ln -s %{_javadir}/apache-commons-discovery.jar
+ln -s %{_javadir}/xmlrpc3-client.jar
+ln -s %{_javadir}/xmlrpc3-common.jar
+ln -s %{_javadir}/ws-commons-util.jar
+ln -s %{_javadir}/jaxme/jaxmeapi.jar
+ln -s %{_javadir}/jaxp.jar
+ln -s %{_javadir}/google-gson.jar
+ln -s %{_javadir}/axis/axis.jar
+ln -s %{_javadir}/axis/jaxrpc.jar
+ln -s %{_javadir}/javamail/mail.jar
+popd
-unzip -q -o -d %{buildroot}%{install_loc}/mylyn \
- build/rpmBuild/org.eclipse.mylyn_feature.zip
+mkdir -p %{buildroot}%{install_loc}/mylyn/features
+for f in `ls -1 org.eclipse.mylyn/org.eclipse.mylyn-site/target/site/features/ | grep jar$`; do
+ unzip org.eclipse.mylyn/org.eclipse.mylyn-site/target/site/features/$f -d %{buildroot}%{install_loc}/mylyn/features/${f/.jar//};
+done
-unzip -q -o -d %{buildroot}%{install_loc}/mylyn \
- build/rpmBuild/org.eclipse.mylyn.tasks.ide.zip
+install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/redhat-bugzilla-custom-transitions.txt
%files
-%{install_loc}/mylyn
-%doc org.eclipse.mylyn-feature/epl-v10.html
-%doc org.eclipse.mylyn-feature/license.html
+%dir %{install_loc}/mylyn
+%dir %{install_loc}/mylyn/features/
+%dir %{install_loc}/mylyn/plugins/
+%{install_loc}/mylyn/features/org.eclipse.mylyn_feature_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.tasks.ide_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.tasks.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.tasks.index.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.tasks.index.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.tasks.search_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.tasks.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.tasks.bugs_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.help.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.oslc.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.oslc.ui_*.jar
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons.activity_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons.compatibility_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons.identity_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons.notifications_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons.repositories_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons.repositories.http_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.discovery_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.monitor_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.activity.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.identity.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.identity.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.notifications_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.notifications.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.notifications.feed_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.notifications.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.repositories.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.repositories.http.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.repositories.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.repositories_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.screenshots_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.team_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.workbench_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.discovery.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.discovery.ui*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.monitor.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.monitor.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.sdk.util_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.soap_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.xmlrpc_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.commons.net_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.core.runtime.compatibility.auth_*.jar
+%{install_loc}/mylyn/features/org.eclipse.mylyn.context_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.context.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.context.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.resources.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.context.tasks.ui_*.jar
+%{install_loc}/mylyn/plugins/apache-commons-lang.jar
+%{install_loc}/mylyn/plugins/apache-commons-logging-api.jar
+%{install_loc}/mylyn/plugins/apache-commons-io.jar
+%{install_loc}/mylyn/plugins/jdom.jar
+%{install_loc}/mylyn/plugins/rome*.jar
+%{install_loc}/mylyn/plugins/xmlrpc3-client.jar
+%{install_loc}/mylyn/plugins/xmlrpc3-common.jar
+%{install_loc}/mylyn/plugins/httpcore.jar
+%{install_loc}/mylyn/plugins/httpclient.jar
+%{install_loc}/mylyn/plugins/apache-commons-discovery.jar
+%{install_loc}/mylyn/plugins/ws-commons-util.jar
+%{install_loc}/mylyn/plugins/jaxmeapi.jar
+%{install_loc}/mylyn/plugins/jaxp.jar
+%{install_loc}/mylyn/plugins/google-gson.jar
+%{install_loc}/mylyn/plugins/axis.jar
+%{install_loc}/mylyn/plugins/jaxrpc.jar
+%{install_loc}/mylyn/plugins/mail.jar
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/epl-v10.html
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/license.html
+
+%files context-java
+%{install_loc}/mylyn/features/org.eclipse.mylyn.java_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.java.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.java.tasks_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.ide.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.ide.ant_*.jar
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.java-feature/epl-v10.html
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.java-feature/license.html
+
+%files context-pde
+%{install_loc}/mylyn/features/org.eclipse.mylyn.pde_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.pde.ui_*.jar
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.pde-feature/epl-v10.html
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.pde-feature/license.html
+
+%files context-cdt
+%{install_loc}/mylyn/features/org.eclipse.cdt.mylyn_*
+%{install_loc}/mylyn/plugins/org.eclipse.cdt.mylyn.ui_*.jar
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.cdt-feature/epl-v10.html
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.cdt-feature/license.html
+
+%files context-team
+%{install_loc}/mylyn/features/org.eclipse.mylyn.team_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.team.ui_*.jar
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.team-feature/epl-v10.html
+%doc org.eclipse.mylyn.context/org.eclipse.mylyn.team-feature/license.html
+
+%files ide
+%{install_loc}/mylyn/features/org.eclipse.mylyn.ide_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.team.cvs_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.bugzilla.ide_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.ide.ui_*.jar
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ide-feature/epl-v10.html
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ide-feature/license.html
+
+%files tasks-bugzilla
+%{install_loc}/mylyn/features/org.eclipse.mylyn.bugzilla_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.bugzilla.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar
+%{install_loc}/mylyn/redhat-bugzilla-custom-transitions.txt
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/epl-v10.html
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/license.html
+
+%files tasks-trac
+%{install_loc}/mylyn/features/org.eclipse.mylyn.trac_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.trac.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.trac.ui_*.jar
+%{install_loc}/mylyn/features/org.eclipse.mylyn.trac.wiki_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.trac.wiki_*.jar
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/epl-v10.html
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/license.html
+
+%files tasks-web
+%{install_loc}/mylyn/features/org.eclipse.mylyn.web.tasks_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.web.tasks_*.jar
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/epl-v10.html
+%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/license.html
+
+%files docs-wikitext
+%{install_loc}/mylyn/features/org.eclipse.mylyn.wikitext_feature_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.textile.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.mediawiki.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.confluence.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.tracwiki.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.twiki.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.help.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.textile.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.mediawiki.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.confluence.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.tracwiki.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.twiki.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.tasks.ui_*.jar
+%{install_loc}/mylyn/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
+
+%files docs-htmltext
+%{install_loc}/mylyn/features/org.eclipse.mylyn.htmltext_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.htmltext.ui_*.jar
+%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext-feature/epl-v10.html
+%doc org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext-feature/license.html
+
+%files docs-epub
+%{install_loc}/mylyn/features/org.eclipse.mylyn.docs.epub_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.docs.epub.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.docs.epub.help_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.docs.epub.ui_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.docs.epub.ant.core_*.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
+
+%files versions
+%{install_loc}/mylyn/features/org.eclipse.mylyn.versions_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.versions.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.versions.ui_*.jar
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.versions-feature/epl-v10.html
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.versions-feature/license.html
+
+%files versions-git
+%{install_loc}/mylyn/features/org.eclipse.mylyn.git_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.git.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.git.ui_*.jar
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.git-feature/epl-v10.html
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.git-feature/license.html
+
+%files versions-cvs
+%{install_loc}/mylyn/features/org.eclipse.mylyn.cvs_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.cvs.core_*.jar
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.cvs-feature/epl-v10.html
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.cvs-feature/license.html
+
+%files versions-subclipse
+%{install_loc}/mylyn/features/org.eclipse.mylyn.subclipse_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.subclipse.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.subclipse.ui_*.jar
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.subclipse-feature/epl-v10.html
+%doc org.eclipse.mylyn.versions/org.eclipse.mylyn.subclipse-feature/license.html
+
+%files builds
+%{install_loc}/mylyn/features/org.eclipse.mylyn.builds_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.builds.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.builds.ui_*.jar
+%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.builds-feature/epl-v10.html
+%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.builds-feature/license.html
+
+%files builds-hudson
+%{install_loc}/mylyn/features/org.eclipse.mylyn.hudson_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.hudson.core_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.hudson.ui_*.jar
+%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/epl-v10.html
+%doc org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/license.html
+
+%files sdk
+%{install_loc}/mylyn/features/org.eclipse.mylyn.builds.sdk_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.context.sdk_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.commons.sdk_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.docs.epub.sdk_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.docs.sdk_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.sdk_feature_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.versions.sdk_*
+%{install_loc}/mylyn/features/org.eclipse.mylyn.wikitext.sdk_*
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.context.sdk.java_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.context.sdk.util_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.wikitext.help.sdk_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.tests.util_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.mylyn.*.source_*.jar
+%{install_loc}/mylyn/plugins/org.eclipse.cdt.mylyn.ui.source_*.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
+* Wed Jul 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-1
+- Completely repackaged mylyn.
+- Added epub feature.
+- Added support for subclipse.
+
* Mon May 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-5
- Patch for bug 378230 added.
diff --git a/fetch-compatibility.sh b/fetch-compatibility.sh
new file mode 100755
index 0000000..01d9f78
--- /dev/null
+++ b/fetch-compatibility.sh
@@ -0,0 +1,18 @@
+#!/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 cjf org.eclipse.core.runtime.compatibility.auth.tar.bz2 org.eclipse.core.runtime.compatibility.auth
+ mv org.eclipse.core.runtime.compatibility.auth.tar.bz2 ../../
+popd
+
+rm -rf eclipse.platform.runtime-${TAG}.tar.bz2
+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
new file mode 100755
index 0000000..75c92db
--- /dev/null
+++ b/fetch-eclipse-mylyn-incubator.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+RELEASE_TAG="R_3_8_0"
+FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-incubator-fetched-src"
+
+#clean up old runs
+rm -rf org.eclipse.mylyn.all
+rm -rf $FETCHED_SOURCES_NAME
+rm -rf $RELEASE_TAG
+
+#checkout
+git clone git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.incubator.git $RELEASE_TAG
+cd $RELEASE_TAG
+git checkout $RELEASE_TAG
+
+#remove projects we do not need
+ls -1 | grep -v -e "org.eclipse.mylyn.trac.wiki-feature" \
+ -e "org.eclipse.mylyn.trac.wiki" \
+ -e "org.eclipse.mylyn.web.tasks-feature" \
+ -e "org.eclipse.mylyn.web.tasks" | xargs rm -rf
+
+#remove precomipled binaries
+find . -type f -name ".class" -exec rm {} \;
+find . -type f -name ".jar" -exec rm {} \;
+rm -rf .git
+find . -type f -name ".gitignore" -exec rm {} \;
+find . -type f -name ".gitmodules" -exec rm {} \;
+
+cd ..
+
+#package and clean up
+mv $RELEASE_TAG $FETCHED_SOURCES_NAME
+tar -cjf $FETCHED_SOURCES_NAME.tar.bz2 $FETCHED_SOURCES_NAME
+rm -rf $FETCHED_SOURCES_NAME
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index 6a391f9..e142353 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -1,37 +1,29 @@
#!/bin/sh
-#
-# eclipse-mylyn SRPM produces one binary RPM including
-# the org.eclipse.mylyn-feature
-#
-# Note:
-# eclipse-mylyn-commons needs to be built prior to this package.
-RELEASE_TAG="R_3_7_0"
-rm -rf org.eclipse.mylyn.context.tar.bz2
-rm -rf org.eclipse.mylyn.tasks.tar.bz2
-rm -rf org.eclipse.mylyn.commons.tar.bz2
+set -e
-wget -O org.eclipse.mylyn.commons.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.commons.git/snapshot/${RELEASE_TAG}.tar.bz2
-wget -O org.eclipse.mylyn.context.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.context.git/snapshot/${RELEASE_TAG}.tar.bz2
-wget -O org.eclipse.mylyn.tasks.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.tasks.git/snapshot/${RELEASE_TAG}.tar.bz2
+RELEASE_TAG="R_3_8_0"
+FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
-for i in org.eclipse.mylyn.tasks.tar.bz2 \
- org.eclipse.mylyn.context.tar.bz2 \
- org.eclipse.mylyn.commons.tar.bz2; do
- tar -xjf $i
-done
+#clean up old runs
+rm -rf org.eclipse.mylyn.all
+rm -rf $FETCHED_SOURCES_NAME
+rm -rf $RELEASE_TAG
-# remove sources we don't need
-pushd $RELEASE_TAG > /dev/null
-ls -1 | grep -vE '^org.eclipse.mylyn$|org.eclipse.mylyn.tasks.core|org.eclipse.mylyn.tasks.search|org.eclipse.mylyn-feature|org.eclipse.mylyn.tasks.ui|org.eclipse.mylyn.tasks.index.core|org.eclipse.mylyn.tasks.index.ui|org.eclipse.mylyn.tasks.search|org.eclipse.mylyn.tasks.ide-feature|org.eclipse.mylyn.tasks.bugs|org.eclipse.mylyn.help.ui' | xargs rm -rf
-popd > /dev/null
+#checkout
+git clone -b $RELEASE_TAG --recursive git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.all.git $RELEASE_TAG
+cd $RELEASE_TAG
-FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
+#remove precomipled binaries
+find . -type f -name ".class" -exec rm {} \;
+find . -type f -name ".jar" -exec rm {} \;
+rm -rf .git
+find . -type f -name ".gitignore" -exec rm {} \;
+find . -type f -name ".gitmodules" -exec rm {} \;
+
+cd ..
+
+#package and clean up
mv $RELEASE_TAG $FETCHED_SOURCES_NAME
-rm -rf $FETCHED_SOURCES_NAME.tar.bz2
tar -cjf $FETCHED_SOURCES_NAME.tar.bz2 $FETCHED_SOURCES_NAME
-
rm -rf $FETCHED_SOURCES_NAME
-rm -rf org.eclipse.mylyn.context.tar.bz2
-rm -rf org.eclipse.mylyn.tasks.tar.bz2
-rm -rf org.eclipse.mylyn.commons.tar.bz2
diff --git a/redhat-bugzilla-custom-transitions.txt b/redhat-bugzilla-custom-transitions.txt
new file mode 100644
index 0000000..3d600bc
--- /dev/null
+++ b/redhat-bugzilla-custom-transitions.txt
@@ -0,0 +1,15 @@
+CustomStatusNames=true
+DuplicateStatus=CLOSED
+ClosedCustomStatus=CLOSED
+ClosedCustomStatus=POST
+<transitions>
+name :UNCONFIRMED:, can_change_to :NEW,ASSIGNED,MODIFIED,ON_DEV,ON_QA,RELEASE_PENDING,POST,CLOSED:
+name :NEW:, can_change_to :ASSIGNED,MODIFIED,ON_DEV,ON_QA,RELEASE_PENDING,POST,CLOSED:
+name :ASSIGNED:, can_change_to :MODIFIED,ON_DEV,ON_QA,RELEASE_PENDING,POST,CLOSED:
+name :MODIFIED:, can_change_to :NEW,ASSIGNED,ON_DEV,ON_QA,RELEASE_PENDING,POST,CLOSED:
+name :ON_DEV:, can_change_to :NEW,ASSIGNED,MODIFIED,ON_QA,RELEASE_PENDING,POST,CLOSED:
+name :ON_QA:, can_change_to :NEW,ASSIGNED,MODIFIED,ON_DEV,RELEASE_PENDING,POST,VERIFIED,CLOSED:
+name :RELEASE_PENDING:, can_change_to :NEW,ASSIGNED,MODIFIED,ON_DEV,ON_QA,POST,CLOSED:
+name :POST:, can_change_to :NEW,ASSIGNED,MODIFIED,ON_DEV,ON_QA,RELEASE_PENDING,CLOSED:
+name :VERIFIED:, can_change_to :ASSIGNED,RELEASE_PENDING,CLOSED:
+name :CLOSED:, can_change_to :ASSIGNED:
diff --git a/sources b/sources
index 8e9cf0a..cda82c2 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-2e40f444fa4018ed1c38bcdb218a0bb1 eclipse-mylyn-R_3_7_0-fetched-src.tar.bz2
+e34769317f707548b86cdaaa75b2bd1a eclipse-mylyn-R_3_8_0-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