eclipse-sig January 2015

eclipse-sig@lists.fedoraproject.org

4 participants
7 discussions

[Bug 1186629] New: Unable to open a workspace
by Red Hat Bugzilla 18 Feb '15

18 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1186629 Bug ID: 1186629 Summary: Unable to open a workspace Product: Fedora Version: 21 Component: eclipse Severity: high Assignee: akurtako(a)redhat.com Reporter: c.david86(a)gmail.com QA Contact: extras-qa(a)fedoraproject.org CC: akurtako(a)redhat.com, andjrobins(a)gmail.com, eclipse-sig(a)lists.fedoraproject.org, jerboaa(a)gmail.com, krzysztof.daniel(a)gmail.com, mat.booth(a)redhat.com, msimacek(a)redhat.com, overholt(a)gmail.com, rgrunber(a)redhat.com, swagiaal(a)redhat.com Created attachment 985000 --> https://bugzilla.redhat.com/attachment.cgi?id=985000&action=edit The log file Description of problem: Creating a new workspace failed Version-Release number of selected component (if applicable): How reproducible: always Steps to Reproduce: 1. eclipse 2. set the workspace to /tmp/dummy/workspace Log results is attached. -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=SJmviF2FxG&a=cc_unsubscribe

1 3

[eclipse-mylyn] Build/install with mvn_build/mvn_install, let xmvn auto generate
by Mat Booth 29 Jan '15

29 Jan '15

commit d8e3c418c90f322d44479f7fadde9e904c70ec9b Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Jan 29 16:02:27 2015 +0000 Build/install with mvn_build/mvn_install, let xmvn auto generate requires and provides - Fold context-team and context-ide into base package, it longer makes sense to have these as separate sub packages - Drop update-site patch - Add patch to explicitly require hamcrest for tests that need it - Remove other misc cruft from spec file that is no longer needed .gitignore | 2 +- eclipse-mylyn-add-apache-xmlrpc.patch | 22 + ...se-mylyn-ensure-sites-build-after-changes.patch | 88 ---- eclipse-mylyn.spec | 525 ++++---------------- explicit-hamcrest-use.patch | 32 ++ 5 files changed, 165 insertions(+), 504 deletions(-) --- diff --git a/.gitignore b/.gitignore index 5a1b96a..acbe5a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /noarch /*.src.rpm /.project +/.build-*.log 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 @@ -23,7 +24,6 @@ eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2 /eclipse-mylyn-a6b7cd3ef76434fc22bf9ea295b4fc6aa7dd5281-fetched-src.tar.bz2 /eclipse-mylyn-a6b7cd3ef76434fc22bf9ea295b4fc6aa7dd5281-fetched-src /eclipse-mylyn-2ad84de236137ed860f00acf0749b03dc5c9d8ff-fetched-src.tar.bz2 -/.build-3.9.0-0.8.gita6b7cd.fc20.log /eclipse-mylyn-R_3_9_0-fetched-src.tar.bz2 /eclipse-mylyn-R_3_9_1-fetched-src.tar.bz2 /eclipse-mylyn-R_3_10_0-fetched-src.tar.bz2 diff --git a/eclipse-mylyn-add-apache-xmlrpc.patch b/eclipse-mylyn-add-apache-xmlrpc.patch index 3b3afe2..a5975df 100644 --- a/eclipse-mylyn-add-apache-xmlrpc.patch +++ b/eclipse-mylyn-add-apache-xmlrpc.patch @@ -34,3 +34,25 @@ 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", +--- org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF.orig 2015-01-29 15:28:39.166877841 +0000 ++++ org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF 2015-01-29 15:29:04.377515629 +0000 +@@ -19,6 +19,7 @@ + org.eclipse.mylyn.trac.ui, + org.apache.ws.commons.util;bundle-version="1.0.0", + org.apache.xmlrpc;bundle-version="3.0.0", ++ org.apache.xmlrpc.common, + org.eclipse.ui.forms, + org.apache.commons.lang;bundle-version="2.4.0" + Export-Package: org.eclipse.mylyn.trac.tests;x-internal:=true, +--- org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF.orig 2015-01-29 15:31:57.434029251 +0000 ++++ org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF 2015-01-29 15:32:22.340671406 +0000 +@@ -16,7 +16,8 @@ + org.eclipse.mylyn.commons.workbench, + org.eclipse.mylyn.commons.xmlrpc, + org.eclipse.mylyn.commons.sdk.util;bundle-version="3.8.0", +- org.apache.xmlrpc ++ org.apache.xmlrpc, ++ org.apache.xmlrpc.common,org.apache.xmlrpc.server + Export-Package: org.eclipse.mylyn.commons.core;x-internal:=true, + org.eclipse.mylyn.commons.tests;x-internal:=true, + org.eclipse.mylyn.commons.tests.core;x-internal:=true, diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index 0fe79d3..2fafe51 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -1,42 +1,32 @@ -%{?scl:%scl_package eclipse-mylyn} -%{!?scl:%global pkg_name %{name}} - -%global install_loc %{_datadir}/eclipse/dropins %global tag R_3_14_0 %global incubator_tag af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b -%{!?scl:%global _non_scl_javadir %{_javadir}} -%{?scl:%global _non_scl_javadir /usr/share/java} - -Name: %{?scl_prefix}eclipse-mylyn +Name: eclipse-mylyn Summary: Eclipse Mylyn main feature. Version: 3.14.0 -Release: 1%{?dist} +Release: 2%{?dist} License: EPL URL: http://www.eclipse.org/mylyn # bash fetch-eclipse-mylyn.sh -Source0: %{pkg_name}-%{tag}-fetched-src.tar.xz +Source0: eclipse-mylyn-%{tag}-fetched-src.tar.xz Source1: fetch-eclipse-mylyn.sh Source6: redhat-bugzilla-custom-transitions.txt - Source7: eclipse-mylyn-%{incubator_tag}-incubator-fetched-src.tar.xz Source8: fetch-eclipse-mylyn-incubator.sh -Patch0: %{pkg_name}-remove-hudson-discovery.patch -Patch1: %{pkg_name}-add-apache-xmlrpc.patch -Patch2: %{pkg_name}-ensure-sites-build-after-changes.patch -Patch3: %{pkg_name}-disable-online-tests.patch - -Patch4: %{pkg_name}-merge-incubator.patch -Patch5: %{pkg_name}-bug-419133.patch +Patch0: %{name}-remove-hudson-discovery.patch +Patch1: %{name}-add-apache-xmlrpc.patch +Patch3: %{name}-disable-online-tests.patch +Patch4: %{name}-merge-incubator.patch +Patch5: %{name}-bug-419133.patch Patch6: lucene4.patch -Patch7: %{pkg_name}-remove-epubcheck-tests.patch -Patch8: %{pkg_name}-remove-nullable-annotation.patch +Patch7: %{name}-remove-epubcheck-tests.patch +Patch8: %{name}-remove-nullable-annotation.patch +Patch9: explicit-hamcrest-use.patch BuildArch: noarch -BuildRequires: eclipse-platform >= 1:4.2.0 BuildRequires: eclipse-pde >= 1:4.2.0 BuildRequires: eclipse-cdt BuildRequires: eclipse-egit @@ -46,11 +36,9 @@ BuildRequires: eclipse-license BuildRequires: eclipse-emf BuildRequires: tycho >= 0.14.1-5 BuildRequires: eclipse-egit -BuildRequires: jacoco BuildRequires: lucene BuildRequires: lucene-queryparser BuildRequires: maven-local - BuildRequires: apache-commons-lang >= 2.6-6 BuildRequires: apache-commons-logging BuildRequires: apache-commons-io >= 2.3 @@ -59,8 +47,8 @@ BuildRequires: xmlrpc-client >= 3.1.3 BuildRequires: xmlrpc-common >= 3.1.3 BuildRequires: xmlrpc-server >= 3.1.3 BuildRequires: rome >= 0.9-9 -BuildRequires: httpcomponents-client >= 4.1.3-2 -BuildRequires: httpcomponents-core >= 4.1.4 +BuildRequires: httpcomponents-client +BuildRequires: httpcomponents-core BuildRequires: google-gson >= 2.0.0 BuildRequires: guava BuildRequires: xalan-j2 @@ -68,28 +56,19 @@ BuildRequires: junit BuildRequires: hamcrest BuildRequires: objenesis BuildRequires: mockito -BuildRequires: maven-install-plugin BuildRequires: maven-deploy-plugin BuildRequires: maven-plugin-build-helper +BuildRequires: xml-maven-plugin BuildRequires: tika BuildRequires: tika-parsers -Requires: eclipse-platform >= 1:4.2.0 -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: xmlrpc-client >= 3.1.3 -Requires: xmlrpc-common >= 3.1.3 -Requires: xmlrpc-server >= 3.1.3 -Requires: rome >= 0.9-9 -Requires: xml-commons-apis -Requires: httpcomponents-client >= 4.1.3-2 -Requires: httpcomponents-core >= 4.1.4 -Requires: jdom >= 1.1.2-3 -Requires: guava -Requires: lucene -%{?scl:Requires: %scl_runtime} +Requires: eclipse-platform + +# Obsoletes/Provides added in F22 +Obsoletes: %{name}-ide < %{version}-%{release} +Provides: %{name}-ide = %{version}-%{release} +Obsoletes: %{name}-context-team < %{version}-%{release} +Provides: %{name}-context-team = %{version}-%{release} %description Mylyn integrates task support into Eclipse. It supports offline editing @@ -98,8 +77,7 @@ information that is not relevant to the current task. %package context-java Summary: Mylyn Bridge: Java Development -Requires: %{?scl_prefix}eclipse-jdt -Requires: %{name} = %{version}-%{release} +Requires: eclipse-jdt %description context-java Mylyn Task-Focused UI extensions for JDT. Provides focusing of Java @@ -107,41 +85,21 @@ element views and editors. %package context-pde Summary: Mylyn Bridge: Plug-in Development -Requires: %{?scl_prefix}eclipse-pde -Requires: %{name}-context-java = %{version}-%{release} +Requires: eclipse-pde %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} = %{version}-%{release} -Requires: %{?scl_prefix}eclipse-cdt +Requires: eclipse-cdt %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} = %{version}-%{release} - -%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-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: %{?scl_prefix}eclipse-platform >= 1:4.2.0 -Requires: %{name} = %{version}-%{release} %description tasks-bugzilla Provides Task List integration, offline support and rich editing for the @@ -149,24 +107,14 @@ open source Bugzilla bug tracker. %package docs-wikitext Summary: Mylyn WikiText -Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 -Requires: %{name} = %{version}-%{release} -Requires: jsoup -Provides: %{name}-wikitext = %{version}-%{release} +Obsoletes: %{name}-docs-htmltext < %{version}-%{release} +Provides: %{name}-docs-htmltext = %{version}-%{release} %description docs-wikitext -Enables parsing and display of lightweight markup (wiki text). - -%package docs-htmltext -Summary: Mylyn HtmlText -Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 - -%description docs-htmltext -Enables editing of HTML text. +Enables parsing and display of lightweight markup (wiki text) and HTML text. %package docs-epub Summary: Mylyn EPub -Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 %description docs-epub The EPUB framework in Mylyn Docs offers API to create, manipulate, @@ -174,9 +122,6 @@ read and write EPUB formatted files. %package tasks-trac Summary: Mylyn Tasks Connector: Trac -Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0 -Requires: %{name} = %{version}-%{release} -Requires: google-gson %description tasks-trac Provides Task List integration, offline support and rich editing @@ -184,10 +129,6 @@ for the open source Trac issue tracker. %package tasks-web Summary: Mylyn Tasks Connector: Web Templates (Advanced) (Incubation) -Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0 -Requires: %{name} = %{version}-%{release} -Requires: rome >= 0.9-9 -Requires: jdom >= 1.1.2-3 %description tasks-web Provides Task List integration for web-based issue trackers @@ -195,43 +136,30 @@ and templates for example projects. %package versions Summary: Eclipse Mylyn Versions -Requires: %{name} = %{version}-%{release} %description versions Provides a framework for accessing team providers for Eclipse Mylyn. %package versions-git Summary: Mylyn Versions Connector: Git -Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 -Requires: %{?scl_prefix}eclipse-egit >= 0.10.1 -Requires: %{name}-versions = %{version}-%{release} %description versions-git Provides Git integration for Eclipse Mylyn. %package versions-cvs Summary: Mylyn Versions Connector: CVS -Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 -Requires: %{name}-versions = %{version}-%{release} %description versions-cvs Provides CVS integration for Eclipse Mylyn. %package versions-subclipse Summary: Mylyn Versions Connector: SVN -Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0 -Requires: %{name}-versions = %{version}-%{release} -Requires: %{?scl_prefix}eclipse-subclipse %description versions-subclipse Provides SVN integration for Eclipse Mylyn. %package builds Summary: Eclipse Mylyn Builds -Requires: %{name} = %{version}-%{release} -Requires: %{?scl_prefix}eclipse-emf -Requires: %{name}-versions = %{version}-%{release} -Requires: xml-commons-apis %description builds Provides a common framework to interact with continuous integration @@ -239,10 +167,6 @@ build providers using Eclipse Mylyn. %package builds-hudson Summary: Mylyn Builds Connector: Hudson/Jenkins -Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0-0.6 -Requires: %{name} = %{version}-%{release} -Requires: google-gson >= 1.6.0 -Requires: %{name}-builds = %{version}-%{release} %description builds-hudson Support for the open source Hudson and Jenkins continuous integration servers. @@ -250,34 +174,27 @@ Support for the open source Hudson and Jenkins continuous integration servers. %package sdk Summary: Mylyn SDK Requires: %{name} = %{version}-%{release} +Requires: %{name}-builds = %{version}-%{release} +Requires: %{name}-builds-hudson = %{version}-%{release} +Requires: %{name}-context-cdt = %{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-epub = %{version}-%{release} Requires: %{name}-docs-wikitext = %{version}-%{release} -Requires: %{name}-docs-htmltext = %{version}-%{release} +Requires: %{name}-tasks-bugzilla = %{version}-%{release} Requires: %{name}-tasks-trac = %{version}-%{release} +Requires: %{name}-tasks-web = %{version}-%{release} Requires: %{name}-versions = %{version}-%{release} -Requires: %{name}-versions-git = %{version}-%{release} Requires: %{name}-versions-cvs = %{version}-%{release} +Requires: %{name}-versions-git = %{version}-%{release} Requires: %{name}-versions-subclipse = %{version}-%{release} -Requires: %{name}-builds = %{version}-%{release} -Requires: %{name}-builds-hudson = %{version}-%{release} -Requires: xalan-j2 -Requires: hamcrest -Requires: objenesis -Requires: junit -Requires: mockito %description sdk -Sources for all Mylyn bundles +Sources for all Mylyn bundles. %package tests Summary: Mylyn test bundles -Requires: %{?scl_prefix}eclipse-tests -Requires: %{?scl_prefix}eclipse-swtbot + %description tests All the test bundles for mylyn packages. @@ -287,7 +204,6 @@ tar xaf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1 %patch0 %patch1 -%patch2 -b .sav %patch3 -b .sav %patch4 -b .sav %patch5 @@ -295,62 +211,46 @@ pushd org.eclipse.mylyn.tasks %patch6 -p1 -b .sav popd %patch8 +%patch9 -#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 ) ; -find . -name feature.xml -exec sed -i -e "s/javax.mail/com.sun.mail.javax.mail/" {} \; -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.commons.tck-feature org.eclipse.mylyn.commons +# Disable plugins we can live without (they are skipped by default anyway) +for p in findbugs-maven-plugin maven-pmd-plugin jacoco-maven-plugin ; do + grep -l -r --include="pom.xml" $p . | \ + ( while read pom_path; do %pom_remove_plugin :$p $pom_path ; done ) ; +done -%pom_disable_module org.eclipse.mylyn.tests org.eclipse.mylyn +# Disable site modules, we don't need them +for site in $(grep -l -r --include="pom.xml" eclipse-update-site .) ; do + module=$(basename $(dirname $site)); dir=$(dirname $(dirname $site)) + %pom_disable_module $module $dir +done -%pom_disable_module org.eclipse.mylyn.test-feature org.eclipse.mylyn.tasks +# Disable modules we can't build yet +%pom_disable_module org.eclipse.mylyn.reviews . +sed -i -e '/$gerrit\|reviews$/d' org.eclipse.mylyn/org.eclipse.mylyn.tests/META-INF/MANIFEST.MF +sed -i -e '/AllGerritTests/d' -e '/AllReviewsTests/d' org.eclipse.mylyn/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/All*Tests.java -#Don't build artifacts that we don't ship +# Don't build artifacts that we don't ship +%pom_disable_module org.eclipse.mylyn.commons.tck-feature org.eclipse.mylyn.commons %pom_disable_module org.eclipse.mylyn.wikitext-standalone org.eclipse.mylyn.docs %pom_disable_module org.eclipse.mylyn.wikitext.core.maven org.eclipse.mylyn.docs -#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 ) ; -# Disable tests for which the required bundles are not included in the update site -%pom_disable_module org.eclipse.mylyn.wikitext.creole.tests org.eclipse.mylyn.docs -%pom_disable_module org.eclipse.mylyn.tasks.activity.tests org.eclipse.mylyn.tasks -%pom_disable_module org.eclipse.mylyn.bugzilla.rest.tests org.eclipse.mylyn.tasks/connector-bugzilla-rest -%pom_disable_module org.eclipse.mylyn.bugzilla.rest.core.tests org.eclipse.mylyn.tasks/connector-bugzilla-rest -%pom_disable_module org.eclipse.mylyn.bugzilla.rest.ui.tests org.eclipse.mylyn.tasks/connector-bugzilla-rest - -#Correct hamcrest and mockito names +# Correct bundle names sed -i -e "s/org.hamcrest;/org.hamcrest.core;/g" `find . -name MANIFEST.MF` sed -i -e "s/org.mockito;/org.mockito.mockito-core;/g" `find . -name MANIFEST.MF` sed -i -e "s/org.eclipse.core.runtime.compatibility.auth/org.eclipse.core.runtime.compatibility/g" `find . -name MANIFEST.MF` sed -i -e "s/org.apache.ant.source;/org.apache.ant;/g" `find . -name MANIFEST.MF` -sed -i -e "s/org.apache.xmlrpc/org.apache.xmlrpc,org.apache.xmlrpc.common,org.apache.xmlrpc.server/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF -sed -i -e "s/org.apache.xmlrpc;bundle-version=\"3.0.0\"/org.apache.xmlrpc,org.apache.xmlrpc.common/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF -#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 - -#Use default buildtimestamp source +# Use default buildtimestamp source %pom_remove_dep :tycho-buildtimestamp-jgit org.eclipse.mylyn/org.eclipse.mylyn-parent %pom_remove_dep :tycho-sourceref-jgit org.eclipse.mylyn/org.eclipse.mylyn-parent sed -i -e "/<sourceReferences>/,+3d" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml -%pom_remove_plugin :jacoco-maven-plugin org.eclipse.mylyn/org.eclipse.mylyn.maven-parent/pom.xml -%pom_remove_plugin :jacoco-maven-plugin org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml +# Integrate incubator bundles %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml -sed -i -e "s|3.11.0-SNAPSHOT|3.12.0-SNAPSHOT|g" org.eclipse.mylyn.docs/pom.xml rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java @@ -362,290 +262,85 @@ sed -i -e "s/e3.5/e3.6/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-ta sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF -#Disable pack-and-sign/build.xml -%pom_remove_plugin org.apache.maven.plugins:maven-antrun-plugin org.eclipse.mylyn/org.eclipse.mylyn-site - sed -i -e "s|@NonNull||g" org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/RepositoryKey.java +%mvn_package "::{target,pom}::" __noinstall +%mvn_package "::jar:sources:" sdk +%mvn_package ":*.sdk{,_feature}" sdk +%mvn_package ":org.eclipse.mylyn.tests.util" sdk +%mvn_package ":org.eclipse.mylyn.{context,commons}.sdk.util" sdk +%mvn_package ":org.eclipse.mylyn.context.sdk.java" sdk +%mvn_package ":*.test{s,_feature}" tests +%mvn_package "org.eclipse.mylyn.builds:*hudson*" builds-hudson +%mvn_package "org.eclipse.mylyn.builds:" builds +%mvn_package "org.eclipse.mylyn.context:*cdt.mylyn*" context-cdt +%mvn_package "org.eclipse.mylyn.context:*mylyn.pde*" context-pde +%mvn_package "org.eclipse.mylyn.context:*{java_feature,java.tasks,java.ui,ide.ant,debug.ui}*" context-java +%mvn_package "org.eclipse.mylyn.docs.epub:" docs-epub +%mvn_package "org.eclipse.mylyn.docs:" docs +%mvn_package "org.eclipse.mylyn.tasks:*bugzilla*" tasks-bugzilla +%mvn_package "org.eclipse.mylyn.tasks:*trac*" tasks-trac +%mvn_package "org.eclipse.mylyn.tasks:*web.tasks*" tasks-web +%mvn_package "org.eclipse.mylyn.versions:*cvs*" versions-cvs +%mvn_package "org.eclipse.mylyn.versions:*git*" versions-git +%mvn_package "org.eclipse.mylyn.versions:*subclipse*" versions-subclipse +%mvn_package "org.eclipse.mylyn.versions:" versions +%mvn_package "org.eclipse.mylyn{,.commons,.context,.tasks}:" commons + %build -export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" -xmvn -o clean verify -Ddist.qualifier="'v'yyyyMMdd-HHmm" -Dmaven.test.skip=true +%mvn_build -f -j -- -Ddist.qualifier="\'v\'yyyyMMdd-HHmm" %install -install -d %{buildroot}%{install_loc}/mylyn/eclipse/plugins -install -d %{buildroot}%{install_loc}/mylyn/eclipse/features +%mvn_install -cp org.eclipse.mylyn/org.eclipse.mylyn-site/target/site/plugins/*.jar %{buildroot}%{install_loc}/mylyn/eclipse/plugins/ +install %{SOURCE6} \ + %{buildroot}%{_datadir}/eclipse/dropins/mylyn-tasks-bugzilla/eclipse/redhat-bugzilla-custom-transitions.txt -pushd %{buildroot}%{install_loc}/mylyn/eclipse/plugins/ +%files -f .mfiles-commons - rm com.google.gson_*.jar - ln -s %{_non_scl_javadir}/google-gson/gson.jar +%files context-java -f .mfiles-context-java - rm com.sun.syndication_*.jar - ln -s %{_non_scl_javadir}/rome*.jar +%files context-pde -f .mfiles-context-pde - rm javax.xml_*.jar - ln -s %{_non_scl_javadir}/jaxp.jar +%files context-cdt -f .mfiles-context-cdt - rm org.apache.xerces_*.jar - ln -s %{_non_scl_javadir}/xerces-j2.jar +%files tasks-bugzilla -f .mfiles-tasks-bugzilla +%{_datadir}/eclipse/dropins/mylyn-tasks-bugzilla/eclipse/redhat-bugzilla-custom-transitions.txt - rm org.apache.xml.resolver_*.jar - ln -s %{_non_scl_javadir}/xml-commons-resolver.jar +%files tasks-trac -f .mfiles-tasks-trac - rm org.apache.xml.serializer*.jar - ln -s %{_non_scl_javadir}/xalan-j2-serializer.jar +%files tasks-web -f .mfiles-tasks-web - rm org.apache.commons.io_*.jar - ln -s %{_non_scl_javadir}/apache-commons-io.jar +%files docs-wikitext -f .mfiles-docs - rm org.apache.commons.lang_*.jar - ln -s %{_non_scl_javadir}/apache-commons-lang.jar +%files docs-epub -f .mfiles-docs-epub - rm org.apache.commons.httpclient_*.jar - ln -s %{_non_scl_javadir}/commons-httpclient.jar +%files versions -f .mfiles-versions - rm org.apache.ws.commons.util_*.jar - ln -s %{_non_scl_javadir}/ws-commons-util.jar - - rm org.apache.xmlrpc_*.jar - ln -s %{_non_scl_javadir}/xmlrpc-client.jar - ln -s %{_non_scl_javadir}/xmlrpc-common.jar - ln -s %{_non_scl_javadir}/xmlrpc-server.jar +%files versions-git -f .mfiles-versions-git - rm org.jdom_*.jar - ln -s %{_non_scl_javadir}/jdom.jar +%files versions-cvs -f .mfiles-versions-cvs - rm org.jsoup_*.jar - ln -s %{_non_scl_javadir}/jsoup/jsoup.jar +%files versions-subclipse -f .mfiles-versions-subclipse - rm com.google.guava_*.jar - ln -s %{_non_scl_javadir}/guava.jar +%files builds -f .mfiles-builds - rm org.apache.tika.core_*.jar - ln -s %{_non_scl_javadir}/tika/tika-core.jar +%files builds-hudson -f .mfiles-builds-hudson - rm org.apache.tika.parsers_*.jar - ln -s %{_non_scl_javadir}/tika/tika-parsers.jar +%files sdk -f .mfiles-sdk - rm org.apache.lucene.core_*.jar #bundled by platform - rm org.apache.httpcomponents.httpclient_*.jar #bundled by platform - rm org.apache.httpcomponents.httpcore_*.jar #bundled by platform - rm org.apache.commons.logging_*.jar #bundled by platform - rm org.apache.commons.codec_*.jar #bundled by platform -popd - -mkdir -p %{buildroot}%{install_loc}/mylyn/eclipse/features -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/eclipse/features/${f/.jar//}; -done - -install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-custom-transitions.txt - -# Collect and install test jars -mkdir -p %{buildroot}%{_javadir}/mylyn-tests/plugins -set +e -for pom in `find . -name pom.xml`; do - grep -q '<packaging>eclipse-test-plugin</packaging>' ${pom} - if [ $? -eq 0 ]; then - ls ${pom/pom.xml/}'target/' - testjar=`ls ${pom/pom.xml/}'target/'*.jar | grep -v sources` - mv ${testjar} %{buildroot}%{_javadir}/mylyn-tests/plugins - fi -done -set -e - -%files -%dir %{install_loc}/mylyn -%dir %{install_loc}/mylyn/eclipse -%dir %{install_loc}/mylyn/eclipse/features/ -%dir %{install_loc}/mylyn/eclipse/plugins/ -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn_feature_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.tasks.ide_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.index.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.index.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.search_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.bugs_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.help.ui_*.jar -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.activity_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.identity_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.notifications_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.repositories_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.repositories.http_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.discovery_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.monitor_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.activity.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.identity.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.notifications.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.notifications.feed_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.notifications.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.repositories.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.repositories.http.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.repositories.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.screenshots_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.workbench_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.discovery.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.discovery.ui*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.monitor.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.monitor.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.sdk.util_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.xmlrpc_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.commons.net_*.jar -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.context_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.resources.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.tasks.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/apache-commons-lang.jar -%{install_loc}/mylyn/eclipse/plugins/apache-commons-io.jar -%{install_loc}/mylyn/eclipse/plugins/jdom.jar -%{install_loc}/mylyn/eclipse/plugins/rome*.jar -%{install_loc}/mylyn/eclipse/plugins/xmlrpc-client.jar -%{install_loc}/mylyn/eclipse/plugins/xmlrpc-common.jar -%{install_loc}/mylyn/eclipse/plugins/xmlrpc-server.jar -%{install_loc}/mylyn/eclipse/plugins/commons-httpclient.jar -%{install_loc}/mylyn/eclipse/plugins/ws-commons-util.jar -%{install_loc}/mylyn/eclipse/plugins/jaxp.jar -%{install_loc}/mylyn/eclipse/plugins/gson.jar -%{install_loc}/mylyn/eclipse/plugins/guava.jar - -%files context-java -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.java_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.java.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.java.tasks_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.ide.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.ide.ant_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.debug.ui_*.jar - -%files context-pde -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.pde_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.pde.ui_*.jar - -%files context-cdt -%{install_loc}/mylyn/eclipse/features/org.eclipse.cdt.mylyn_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.cdt.mylyn.ui_*.jar - -%files context-team -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.team_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.team.ui_*.jar - -%files ide -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.ide_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.team.cvs_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.bugzilla.ide_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.ide.ui_*.jar - -%files tasks-bugzilla -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.bugzilla_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.bugzilla.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar -%{install_loc}/mylyn/eclipse/redhat-bugzilla-custom-transitions.txt - -%files tasks-trac -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.trac_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.trac.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.trac.ui_*.jar -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.trac.wiki_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.trac.wiki_*.jar - -%files tasks-web -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.web.tasks_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.web.tasks_*.jar - -%files docs-wikitext -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.wikitext_feature_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.core.ant_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.core.osgi_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.textile.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.html.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.mediawiki.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.mediawiki.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.markdown.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.markdown.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.confluence.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tracwiki.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.twiki.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.help.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.textile.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.confluence.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tracwiki.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.twiki.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.tasks.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.context.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/jsoup.jar - -%files docs-htmltext -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.htmltext_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.htmltext.ui_*.jar - -%files docs-epub -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.docs.epub_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.help_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.ui_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.docs.epub.ant.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/tika*.jar - -%files versions -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.versions_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.versions.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.versions.ui_*.jar - -%files versions-git -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.git_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.git.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.git.ui_*.jar - -%files versions-cvs -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.cvs_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.cvs.core_*.jar - -%files versions-subclipse -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.subclipse_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.subclipse.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.subclipse.ui_*.jar - -%files builds -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.builds_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.builds.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.builds.ui_*.jar - -%files builds-hudson -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.hudson_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.hudson.core_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.hudson.ui_*.jar - -%files sdk -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.builds.sdk_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.context.sdk_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.commons.sdk_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.docs.epub.sdk_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.docs.sdk_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.sdk_feature_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.versions.sdk_* -%{install_loc}/mylyn/eclipse/features/org.eclipse.mylyn.wikitext.sdk_* -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.sdk.java_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.context.sdk.util_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.wikitext.help.sdk_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tests.util_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.*.source_*.jar -%{install_loc}/mylyn/eclipse/plugins/org.eclipse.cdt.mylyn.ui.source_*.jar -%{install_loc}/mylyn/eclipse/plugins/xerces-j2.jar -%{install_loc}/mylyn/eclipse/plugins/xalan-j2-serializer.jar -%{install_loc}/mylyn/eclipse/plugins/xml-commons-resolver.jar - -%files tests -%{_javadir}/mylyn-tests +%files tests -f .mfiles-tests %changelog +* Thu Jan 29 2015 Mat Booth <mat.booth(a)redhat.com> - 3.14.0-2 +- Build/install with mvn_build/mvn_install, let xmvn auto generate + requires and provides +- Fold context-team and context-ide into base package, it longer makes + sense to have these as separate sub packages +- Drop update-site patch +- Add patch to explicitly require hamcrest for tests that need it +- Remove other misc cruft from spec file that is no longer needed + * Mon Jan 12 2015 Alexander Kurtakov <akurtako(a)redhat.com> 3.14.0-1 - Update to 3.14. diff --git a/explicit-hamcrest-use.patch b/explicit-hamcrest-use.patch new file mode 100644 index 0000000..d4f23b6 --- /dev/null +++ b/explicit-hamcrest-use.patch @@ -0,0 +1,32 @@ +--- org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.tests/META-INF/MANIFEST.MF.orig 2015-01-23 15:54:17.141768216 +0000 ++++ org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.tests/META-INF/MANIFEST.MF 2015-01-23 15:54:34.055533521 +0000 +@@ -9,6 +9,7 @@ + Bundle-ActivationPolicy: lazy + Bundle-Activator: org.eclipse.mylyn.internal.wikitext.tests.WikiTextTestsPlugin + Require-Bundle: org.junit;bundle-version="4.8", ++ org.hamcrest.core, + org.eclipse.mylyn.wikitext.core;bundle-version="2.0.0", + org.eclipse.mylyn.wikitext.core.osgi;bundle-version="2.0.0", + org.eclipse.mylyn.wikitext.core.ant;bundle-version="2.0.0", +--- org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF.orig 2015-01-29 14:13:38.896674915 +0000 ++++ org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF 2015-01-29 14:14:28.583954615 +0000 +@@ -7,8 +7,7 @@ + Fragment-Host: org.eclipse.mylyn.bugzilla.rest.core + Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Require-Bundle: org.junit;bundle-version="4.8.2", +- org.eclipse.mylyn.commons.sdk.util +-Require-Bundle: org.junit;bundle-version="4.8.2", ++ org.hamcrest.core, + org.eclipse.mylyn.commons.sdk.util, + com.google.guava;bundle-version="10.0.1", + org.apache.commons.io +--- org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/META-INF/MANIFEST.MF.orig 2015-01-29 15:00:50.434781602 +0000 ++++ org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/META-INF/MANIFEST.MF 2015-01-29 15:01:05.218570917 +0000 +@@ -6,6 +6,7 @@ + Bundle-Vendor: Eclipse Mylyn + Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Require-Bundle: org.junit;bundle-version="4.8.2", ++ org.hamcrest.core, + org.eclipse.equinox.common, + org.eclipse.jface, + org.eclipse.ui.workbench,

1 0

[tycho] fedoraproject-p2: Allow installation of bundles not built with tycho
by Mikolaj Izdebski 28 Jan '15

28 Jan '15

commit 44f2349702dbd4e9fd1675563f794487fa9fb268 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Wed Jan 28 10:28:17 2015 +0100 fedoraproject-p2: Allow installation of bundles not built with tycho sources | 2 +- tycho.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) --- diff --git a/sources b/sources index 566bbc3..93e77d6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e911bbbfcbf3771be70620d4de991ffa fedoraproject-p2-3d4a0c.tar.xz +b42b7d6e92a7971615a21e8c63624fe3 fedoraproject-p2-b1a848.tar.xz d7ee912e8da240c8d87892ed876960ae org.eclipse.tycho-tycho-0.22.0.tar.bz2 c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz diff --git a/tycho.spec b/tycho.spec index bf918bf..04fc902 100644 --- a/tycho.spec +++ b/tycho.spec @@ -17,7 +17,7 @@ # %%global snap -SNAPSHOT %global snap %{nil} -%global fp_p2_sha 3d4a0c +%global fp_p2_sha b1a848 %global fp_p2_version 0.0.1 %global fp_p2_snap -SNAPSHOT @@ -25,7 +25,7 @@ Name: %{?scl_prefix}tycho Version: 0.22.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries @@ -427,6 +427,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li %{_javadocdir}/tycho %changelog +* Wed Jan 28 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-9 +- fedoraproject-p2: Allow installation of bundles not built with tycho + * Mon Jan 19 2015 Roland Grunberg <rgrunber(a)redhat.com> - 0.22.0-8 - Introduce basic SCL support. - Minor changes for bootstrap build.

1 0

File fedoraproject-p2-b1a848.tar.xz uploaded to lookaside cache by mizdebsk
by Mikolaj Izdebski 28 Jan '15

28 Jan '15

A file has been added to the lookaside cache for tycho: b42b7d6e92a7971615a21e8c63624fe3 fedoraproject-p2-b1a848.tar.xz

1 0

File eclipse-m2e-sourcelookup-1.1.0.201406131218.tar.gz uploaded to lookaside cache by mizdebsk
by Mikolaj Izdebski 27 Jan '15

27 Jan '15

A file has been added to the lookaside cache for eclipse-m2e-sourcelookup: eaf441ff83ae1ce1c0616628d40853de eclipse-m2e-sourcelookup-1.1.0.201406131218.tar.gz

1 0

[eclipse-filesystem] Revert "Add macros to better support building in SCL environment."
by Roland Grunberg 26 Jan '15

26 Jan '15

commit 9706b48592742de133144ad4160ab18e6a43f836 Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Mon Jan 26 13:04:41 2015 -0500 Revert "Add macros to better support building in SCL environment." This reverts commit 21d0bc2f37269a000d1b709da36f64ce9d83b356. eclipse-filesystem.spec | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) --- diff --git a/eclipse-filesystem.spec b/eclipse-filesystem.spec index c9cfa23..4d3d1f3 100644 --- a/eclipse-filesystem.spec +++ b/eclipse-filesystem.spec @@ -1,11 +1,8 @@ -%{?scl:%scl_package eclipse-filesystem} -%{!?scl:%global pkg_name %{name}} - %global debug_package %{nil} -Name: %{?scl_prefix}eclipse-filesystem +Name: eclipse-filesystem Version: 1.0 -Release: 4%{?dist} +Release: 3%{?dist} Summary: Eclipse Platform Filesystem Layout License: EPL URL: http://www.eclipse.org/ @@ -14,8 +11,6 @@ URL: http://www.eclipse.org/ BuildRequires: javapackages-tools Requires: javapackages-tools -%{?scl:Requires: %scl_runtime} - %description This package provides directories needed by the Eclipse platform and other Eclipse plug-ins. This is abstracted out of the main Eclipse package due to @@ -64,9 +59,6 @@ install -m 644 -p eclipse.conf %{buildroot}%{_javaconfdir}/ %config(noreplace) %{_javaconfdir}/eclipse.conf %changelog -* Mon Jan 26 2015 Roland Grunberg <rgrunber(a)redhat.com> - 1.0-4 -- Add macros to better support building in SCL environment. - * Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0-3 - Generate and install eclipse.conf

1 0

Red Hat Bugzilla: confirm account creation
by Red Hat Bugzilla 24 Jan '15

24 Jan '15

Red Hat Bugzilla has received a request to create a user account using your email address (eclipse-sig(a)lists.fedoraproject.org). To continue creating an account using this email address, visit the following link by January 27, 2015 at 04:00 EST: https://bugzilla.redhat.com/token.cgi?t=Jve6F7O1Hj&a=request_new_account If you did not receive this email before January 27, 2015 at 04:00 EST or you wish to create an account using a different email address you can begin again by going to: https://bugzilla.redhat.com/createaccount.cgi PRIVACY NOTICE: Red Hat Bugzilla is an open bug tracking system. Activity on most bugs, including email addresses, will be visible to the public. We recommend using a secondary account or free web email service (such as Gmail, Yahoo, Hotmail, or similar) to avoid receiving spam at your primary email address. If you do not wish to create an account, or if this request was made in error you can do nothing or visit the following link: https://bugzilla.redhat.com/token.cgi?t=Jve6F7O1Hj&a=cancel_new_account If the above links do not work, or you have any other issues regarding your account, please contact administration at bugzilla-requests(a)redhat.com.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

eclipse-sig January 2015