Attachment 899078 Details for Bug 1101017 – patch to fix build failure

[patch] patch to fix build failure

0001-Update-to-latest-upstream-1.5.0-milestone.patch (text/plain), 17.72 KB, created by Gerard Ryan on 2014-05-25 15:06:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2014-05-25 15:06:25 UTC

Size: 17.72 KB

patch

obsolete

>From bcf5e4f08368cd4bc733aea321b26df7d727668e Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Sun, 25 May 2014 16:05:16 +0100
>Subject: [PATCH] Update to latest upstream 1.5.0 milestone
>
>---
> eclipse-m2e-core-fix-m2e.core-manifest.patch | 13 +-
> eclipse-m2e-core.spec | 17 +-
> epl-v10.html | 261 +++++++++++++++++++++++++++
> sources | 2 +-
> 4 files changed, 281 insertions(+), 12 deletions(-)
> create mode 100644 epl-v10.html
>
>diff --git a/eclipse-m2e-core-fix-m2e.core-manifest.patch b/eclipse-m2e-core-fix-m2e.core-manifest.patch
>index 166c5d6..87a53a4 100644
>--- a/eclipse-m2e-core-fix-m2e.core-manifest.patch
>+++ b/eclipse-m2e-core-fix-m2e.core-manifest.patch
>@@ -1,13 +1,12 @@
>---- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig	2014-02-16 19:53:39.063321131 +0000
>-+++ org.eclipse.m2e.core/META-INF/MANIFEST.MF	2014-02-16 19:56:46.630738257 +0000
>-@@ -12,9 +12,10 @@
>- org.eclipse.m2e.maven.runtime;bundle-version="[1.5.0,1.6.0)",
>+--- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig	2014-05-25 14:34:26.816788355 +0100
>++++ org.eclipse.m2e.core/META-INF/MANIFEST.MF	2014-05-25 14:37:22.930564977 +0100
>+@@ -13,9 +13,10 @@
> org.eclipse.m2e.archetype.common;bundle-version="[1.5.0,1.6.0)",
> org.eclipse.m2e.maven.indexer;bundle-version="[1.5.0,1.6.0)",
>-- slf4j.api
>-+ slf4j.api,
>+ slf4j.api,
> + org.apache.maven.archetype.catalog,
>-+ org.apache.maven.archetype.descriptor
>++ org.apache.maven.archetype.descriptor,
>+ com.google.guava;bundle-version="[14.0.1,16.0.0)"
> Bundle-ActivationPolicy: lazy
> -Bundle-ClassPath: .
> Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
>diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
>index 3e5ef88..786344d 100644
>--- a/eclipse-m2e-core.spec
>+++ b/eclipse-m2e-core.spec
>@@ -1,10 +1,10 @@
> 
> %global install_loc %{_datadir}/eclipse/dropins/m2e-core
>-%global release_dir m2e-core-8f1095d2e358ddda2002431f1e535d57451cad84
>+%global release_dir m2e-core-milestones/1.5/1.5.0.20140524-0005
> 
> Name: eclipse-m2e-core
> Version: 1.5.0
>-Release: 6%{?dist}
>+Release: 7%{?dist}
> Summary: Maven integration for Eclipse
> 
> Group: Development/Tools
>@@ -14,6 +14,7 @@ License: EPL and ASL 2.0
> URL: http://eclipse.org/m2e/
> 
> Source0: http://git.eclipse.org/c/m2e/m2e-core.git/snapshot/%{release_dir}.tar.bz2
>+Source1: http://www.eclipse.org/legal/epl-v10.html
> 
> # Add some necessary stuff (mainly requires & imports) to manifests
> Patch0: %{name}-fix-m2e.core-manifest.patch
>@@ -62,6 +63,7 @@ BuildArch: noarch
> # they can be regenerated with the following command:
> # xmvn-builddep <path-to-build-log>
> BuildRequires: maven-local
>+BuildRequires: eclipse-license
> BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
> BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
> BuildRequires: mvn(org.eclipse.tycho:target-platform-configuration)
>@@ -74,7 +76,7 @@ BuildRequires: mvn(org.sonatype.forge:forge-parent:pom:)
> # be regenerated using xmvn-builddep because m2e-maven-runtime is not
> # built using %%mvn_build.
> BuildRequires: mvn(com.google.guava:guava)
>-BuildRequires: mvn(io.tesla.aether:aether-connector-okhttp)
>+BuildRequires: mvn(io.takari.aether:aether-connector-okhttp)
> BuildRequires: mvn(io.tesla.aether:tesla-concurrent-localrepo)
> BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
> BuildRequires: mvn(org.apache.maven.archetype:archetype-common)
>@@ -249,7 +251,7 @@ find -name '*.class' -delete
> find -name '*.jar' -delete
> 
> # Copy license files so they can be installed more easily.
>-cp -p org.eclipse.m2e.feature/epl-v10.html .
>+cp -p %{SOURCE1} .
> cp -p m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/resources/about_files/LICENSE-2.0.txt .
> 
> # These don't currently build, but don't seem to be absolutely necessary
>@@ -281,6 +283,10 @@ done
> </execution>
> </executions>"
> 
>+# aether-connector-okhttp has changed groupId
>+#pom_remove_dep io.tesla.aether:aether-connector-okhttp m2e-maven-runtime/org.eclipse.m2e.maven.runtime
>+#pom_add_dep io.takari.aether:aether-connector-okhttp m2e-maven-runtime/org.eclipse.m2e.maven.runtime
>+
> # Embed all Maven dependencies. They may be some superflous deps
> # added this way, but in Fedora we don't have enough manpower to test
> # dependency correctness. And we don't even run m2e tests...
>@@ -336,6 +342,9 @@ xmvn-subst -s `find %{buildroot}%{install_loc} -name jars` $extra
> 
> 
> %changelog
>+* Sun May 25 2014 Gerard Ryan <galileo@fedoraproject.org> - 1.5.0-7
>+- Update to latest upstream 1.5.0 milestone
>+
> * Fri May 23 2014 Gerard Ryan <galileo@fedoraproject.org> - 1.5.0-6
> - Rebuild for plexus-velocity update
> 
>diff --git a/epl-v10.html b/epl-v10.html
>new file mode 100644
>index 0000000..3998fce
>--- /dev/null
>+++ b/epl-v10.html
>@@ -0,0 +1,261 @@
>+<?xml version="1.0" encoding="ISO-8859-1" ?>
>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>+<html xmlns="http://www.w3.org/1999/xhtml">
>+
>+<head>
>+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
>+<title>Eclipse Public License - Version 1.0</title>
>+<style type="text/css">
>+ body {
>+ size: 8.5in 11.0in;
>+ margin: 0.25in 0.5in 0.25in 0.5in;
>+ tab-interval: 0.5in;
>+ }
>+ p { 	
>+ margin-left: auto;
>+ margin-top: 0.5em;
>+ margin-bottom: 0.5em;
>+ }
>+ p.list {
>+ 	margin-left: 0.5in;
>+ margin-top: 0.05em;
>+ margin-bottom: 0.05em;
>+ }
>+ </style>
>+
>+</head>
>+
>+<body lang="EN-US">
>+
>+<h2>Eclipse Public License - v 1.0</h2>
>+
>+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
>+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
>+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
>+AGREEMENT.
>+
>+1. DEFINITIONS
>+
>+&quot;Contribution&quot; means:
>+
>+a) in the case of the initial Contributor, the initial
>+code and documentation distributed under this Agreement, and
>+b) in the case of each subsequent Contributor:
>+i) changes to the Program, and
>+ii) additions to the Program;
>+where such changes and/or additions to the Program
>+originate from and are distributed by that particular Contributor. A
>+Contribution 'originates' from a Contributor if it was added to the
>+Program by such Contributor itself or anyone acting on such
>+Contributor's behalf. Contributions do not include additions to the
>+Program which: (i) are separate modules of software distributed in
>+conjunction with the Program under their own license agreement, and (ii)
>+are not derivative works of the Program.
>+
>+&quot;Contributor&quot; means any person or entity that distributes
>+the Program.
>+
>+&quot;Licensed Patents&quot; mean patent claims licensable by a
>+Contributor which are necessarily infringed by the use or sale of its
>+Contribution alone or when combined with the Program.
>+
>+&quot;Program&quot; means the Contributions distributed in accordance
>+with this Agreement.
>+
>+&quot;Recipient&quot; means anyone who receives the Program under
>+this Agreement, including all Contributors.
>+
>+2. GRANT OF RIGHTS
>+
>+a) Subject to the terms of this Agreement, each
>+Contributor hereby grants Recipient a non-exclusive, worldwide,
>+royalty-free copyright license to reproduce, prepare derivative works
>+of, publicly display, publicly perform, distribute and sublicense the
>+Contribution of such Contributor, if any, and such derivative works, in
>+source code and object code form.
>+
>+b) Subject to the terms of this Agreement, each
>+Contributor hereby grants Recipient a non-exclusive, worldwide,
>+royalty-free patent license under Licensed Patents to make, use, sell,
>+offer to sell, import and otherwise transfer the Contribution of such
>+Contributor, if any, in source code and object code form. This patent
>+license shall apply to the combination of the Contribution and the
>+Program if, at the time the Contribution is added by the Contributor,
>+such addition of the Contribution causes such combination to be covered
>+by the Licensed Patents. The patent license shall not apply to any other
>+combinations which include the Contribution. No hardware per se is
>+licensed hereunder.
>+
>+c) Recipient understands that although each Contributor
>+grants the licenses to its Contributions set forth herein, no assurances
>+are provided by any Contributor that the Program does not infringe the
>+patent or other intellectual property rights of any other entity. Each
>+Contributor disclaims any liability to Recipient for claims brought by
>+any other entity based on infringement of intellectual property rights
>+or otherwise. As a condition to exercising the rights and licenses
>+granted hereunder, each Recipient hereby assumes sole responsibility to
>+secure any other intellectual property rights needed, if any. For
>+example, if a third party patent license is required to allow Recipient
>+to distribute the Program, it is Recipient's responsibility to acquire
>+that license before distributing the Program.
>+
>+d) Each Contributor represents that to its knowledge it
>+has sufficient copyright rights in its Contribution, if any, to grant
>+the copyright license set forth in this Agreement.
>+
>+3. REQUIREMENTS
>+
>+A Contributor may choose to distribute the Program in object code
>+form under its own license agreement, provided that:
>+
>+a) it complies with the terms and conditions of this
>+Agreement; and
>+
>+b) its license agreement:
>+
>+i) effectively disclaims on behalf of all Contributors
>+all warranties and conditions, express and implied, including warranties
>+or conditions of title and non-infringement, and implied warranties or
>+conditions of merchantability and fitness for a particular purpose;
>+
>+ii) effectively excludes on behalf of all Contributors
>+all liability for damages, including direct, indirect, special,
>+incidental and consequential damages, such as lost profits;
>+
>+iii) states that any provisions which differ from this
>+Agreement are offered by that Contributor alone and not by any other
>+party; and
>+
>+iv) states that source code for the Program is available
>+from such Contributor, and informs licensees how to obtain it in a
>+reasonable manner on or through a medium customarily used for software
>+exchange.
>+
>+When the Program is made available in source code form:
>+
>+a) it must be made available under this Agreement; and
>+
>+b) a copy of this Agreement must be included with each
>+copy of the Program.
>+
>+Contributors may not remove or alter any copyright notices contained
>+within the Program.
>+
>+Each Contributor must identify itself as the originator of its
>+Contribution, if any, in a manner that reasonably allows subsequent
>+Recipients to identify the originator of the Contribution.
>+
>+4. COMMERCIAL DISTRIBUTION
>+
>+Commercial distributors of software may accept certain
>+responsibilities with respect to end users, business partners and the
>+like. While this license is intended to facilitate the commercial use of
>+the Program, the Contributor who includes the Program in a commercial
>+product offering should do so in a manner which does not create
>+potential liability for other Contributors. Therefore, if a Contributor
>+includes the Program in a commercial product offering, such Contributor
>+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
>+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
>+against any losses, damages and costs (collectively &quot;Losses&quot;)
>+arising from claims, lawsuits and other legal actions brought by a third
>+party against the Indemnified Contributor to the extent caused by the
>+acts or omissions of such Commercial Contributor in connection with its
>+distribution of the Program in a commercial product offering. The
>+obligations in this section do not apply to any claims or Losses
>+relating to any actual or alleged intellectual property infringement. In
>+order to qualify, an Indemnified Contributor must: a) promptly notify
>+the Commercial Contributor in writing of such claim, and b) allow the
>+Commercial Contributor to control, and cooperate with the Commercial
>+Contributor in, the defense and any related settlement negotiations. The
>+Indemnified Contributor may participate in any such claim at its own
>+expense.
>+
>+For example, a Contributor might include the Program in a commercial
>+product offering, Product X. That Contributor is then a Commercial
>+Contributor. If that Commercial Contributor then makes performance
>+claims, or offers warranties related to Product X, those performance
>+claims and warranties are such Commercial Contributor's responsibility
>+alone. Under this section, the Commercial Contributor would have to
>+defend claims against the other Contributors related to those
>+performance claims and warranties, and if a court requires any other
>+Contributor to pay any damages as a result, the Commercial Contributor
>+must pay those damages.
>+
>+5. NO WARRANTY
>+
>+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
>+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
>+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
>+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
>+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
>+responsible for determining the appropriateness of using and
>+distributing the Program and assumes all risks associated with its
>+exercise of rights under this Agreement , including but not limited to
>+the risks and costs of program errors, compliance with applicable laws,
>+damage to or loss of data, programs or equipment, and unavailability or
>+interruption of operations.
>+
>+6. DISCLAIMER OF LIABILITY
>+
>+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
>+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
>+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
>+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
>+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
>+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
>+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
>+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
>+
>+7. GENERAL
>+
>+If any provision of this Agreement is invalid or unenforceable under
>+applicable law, it shall not affect the validity or enforceability of
>+the remainder of the terms of this Agreement, and without further action
>+by the parties hereto, such provision shall be reformed to the minimum
>+extent necessary to make such provision valid and enforceable.
>+
>+If Recipient institutes patent litigation against any entity
>+(including a cross-claim or counterclaim in a lawsuit) alleging that the
>+Program itself (excluding combinations of the Program with other
>+software or hardware) infringes such Recipient's patent(s), then such
>+Recipient's rights granted under Section 2(b) shall terminate as of the
>+date such litigation is filed.
>+
>+All Recipient's rights under this Agreement shall terminate if it
>+fails to comply with any of the material terms or conditions of this
>+Agreement and does not cure such failure in a reasonable period of time
>+after becoming aware of such noncompliance. If all Recipient's rights
>+under this Agreement terminate, Recipient agrees to cease use and
>+distribution of the Program as soon as reasonably practicable. However,
>+Recipient's obligations under this Agreement and any licenses granted by
>+Recipient relating to the Program shall continue and survive.
>+
>+Everyone is permitted to copy and distribute copies of this
>+Agreement, but in order to avoid inconsistency the Agreement is
>+copyrighted and may only be modified in the following manner. The
>+Agreement Steward reserves the right to publish new versions (including
>+revisions) of this Agreement from time to time. No one other than the
>+Agreement Steward has the right to modify this Agreement. The Eclipse
>+Foundation is the initial Agreement Steward. The Eclipse Foundation may
>+assign the responsibility to serve as the Agreement Steward to a
>+suitable separate entity. Each new version of the Agreement will be
>+given a distinguishing version number. The Program (including
>+Contributions) may always be distributed subject to the version of the
>+Agreement under which it was received. In addition, after a new version
>+of the Agreement is published, Contributor may elect to distribute the
>+Program (including its Contributions) under the new version. Except as
>+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
>+rights or licenses to the intellectual property of any Contributor under
>+this Agreement, whether expressly, by implication, estoppel or
>+otherwise. All rights in the Program not expressly granted under this
>+Agreement are reserved.
>+
>+This Agreement is governed by the laws of the State of New York and
>+the intellectual property laws of the United States of America. No party
>+to this Agreement will bring a legal action under this Agreement more
>+than one year after the cause of action arose. Each party waives its
>+rights to a jury trial in any resulting litigation.
>+
>+</body>
>+
>+</html>
>\ No newline at end of file
>diff --git a/sources b/sources
>index c7fb3e8..1111e9e 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-73027f22cfbe8813c8616b3aa3c75a34 m2e-core-8f1095d2e358ddda2002431f1e535d57451cad84.tar.bz2
>+1dd12307c1369d30ac28ee9a2ec277b4 1.5.0.20140524-0005.tar.bz2
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1101017: 899078