Skip to content

Commit fe324de

Browse files
plangerplanger
committed
Update to Eclipse 2021-09 & bump version to 0.0.4
1 parent 7354449 commit fe324de

File tree

12 files changed

+332
-48
lines changed

12 files changed

+332
-48
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
4646
* Git perspective as default and dark theme by default (#7)
4747
* Miminize editor area by default and fix of #8 (#9)
4848
* 0.0.3 Update to Eclipse EGit 2021-03
49+
* 0.0.4 Update to Eclipse EGit 2021-09

‎com.eclipsesource.megit.parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.eclipsesource.megit</groupId>
77
<artifactId>com.eclipsesource.megit.parent</artifactId>
8-
<version>0.0.3-SNAPSHOT</version>
8+
<version>0.0.4-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<properties>

‎com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Plugin
44
Bundle-SymbolicName: com.eclipsesource.megit.plugin;singleton:=true
5-
Bundle-Version: 0.0.3.qualifier
5+
Bundle-Version: 0.0.4.qualifier
66
Bundle-Activator: com.eclipsesource.megit.plugin.Activator
77
Bundle-Vendor: ECLIPSESOURCE
88
Require-Bundle: org.eclipse.ui,

‎com.eclipsesource.megit.plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.0.3-SNAPSHOT</version>
10+
<version>0.0.4-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.plugin</artifactId>

‎com.eclipsesource.megit.product.feature/feature.xml

+282-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,295 @@
22
<feature
33
id="com.eclipsesource.megit.product.feature"
44
label="Minimal EGit Product Feature"
5-
version="0.0.3.qualifier"
5+
version="0.0.4.qualifier"
66
provider-name="ECLIPSESOURCE">
77

88
<description url="http://www.example.com/description">
9-
[Enter Feature Description here.]
9+
A minimal standalone application that contains just enough to run EGit conveniently
1010
</description>
1111

12-
<copyright url="http://www.example.com/copyright">
13-
[Enter Copyright Description here.]
12+
<copyright url="http://www.eclipsesource.com">
13+
Copyright (c) 2019-2021 EclipseSource and others.
1414
</copyright>
1515

16-
<license url="http://www.example.com/license">
17-
[Enter License Description here.]
16+
<license url="https://www.eclipse.org/legal/epl-2.0/">
17+
Eclipse Public License - v 2.0
18+
19+
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
20+
PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
21+
OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
22+
23+
1. DEFINITIONS
24+
25+
"Contribution" means:
26+
27+
a) in the case of the initial Contributor, the initial content
28+
Distributed under this Agreement, and
29+
30+
b) in the case of each subsequent Contributor:
31+
i) changes to the Program, and
32+
ii) additions to the Program;
33+
where such changes and/or additions to the Program originate from
34+
and are Distributed by that particular Contributor. A Contribution
35+
"originates" from a Contributor if it was added to the Program by
36+
such Contributor itself or anyone acting on such Contributor's behalf.
37+
Contributions do not include changes or additions to the Program that
38+
are not Modified Works.
39+
40+
"Contributor" means any person or entity that Distributes the Program.
41+
42+
"Licensed Patents" mean patent claims licensable by a Contributor which
43+
are necessarily infringed by the use or sale of its Contribution alone
44+
or when combined with the Program.
45+
46+
"Program" means the Contributions Distributed in accordance with this
47+
Agreement.
48+
49+
"Recipient" means anyone who receives the Program under this Agreement
50+
or any Secondary License (as applicable), including Contributors.
51+
52+
"Derivative Works" shall mean any work, whether in Source Code or other
53+
form, that is based on (or derived from) the Program and for which the
54+
editorial revisions, annotations, elaborations, or other modifications
55+
represent, as a whole, an original work of authorship.
56+
57+
"Modified Works" shall mean any work in Source Code or other form that
58+
results from an addition to, deletion from, or modification of the
59+
contents of the Program, including, for purposes of clarity any new file
60+
in Source Code form that contains any contents of the Program. Modified
61+
Works shall not include works that contain only declarations,
62+
interfaces, types, classes, structures, or files of the Program solely
63+
in each case in order to link to, bind by name, or subclass the Program
64+
or Modified Works thereof.
65+
66+
"Distribute" means the acts of a) distributing or b) making available
67+
in any manner that enables the transfer of a copy.
68+
69+
"Source Code" means the form of a Program preferred for making
70+
modifications, including but not limited to software source code,
71+
documentation source, and configuration files.
72+
73+
"Secondary License" means either the GNU General Public License,
74+
Version 2.0, or any later versions of that license, including any
75+
exceptions or additional permissions as identified by the initial
76+
Contributor.
77+
78+
2. GRANT OF RIGHTS
79+
80+
a) Subject to the terms of this Agreement, each Contributor hereby
81+
grants Recipient a non-exclusive, worldwide, royalty-free copyright
82+
license to reproduce, prepare Derivative Works of, publicly display,
83+
publicly perform, Distribute and sublicense the Contribution of such
84+
Contributor, if any, and such Derivative Works.
85+
86+
b) Subject to the terms of this Agreement, each Contributor hereby
87+
grants Recipient a non-exclusive, worldwide, royalty-free patent
88+
license under Licensed Patents to make, use, sell, offer to sell,
89+
import and otherwise transfer the Contribution of such Contributor,
90+
if any, in Source Code or other form. This patent license shall
91+
apply to the combination of the Contribution and the Program if, at
92+
the time the Contribution is added by the Contributor, such addition
93+
of the Contribution causes such combination to be covered by the
94+
Licensed Patents. The patent license shall not apply to any other
95+
combinations which include the Contribution. No hardware per se is
96+
licensed hereunder.
97+
98+
c) Recipient understands that although each Contributor grants the
99+
licenses to its Contributions set forth herein, no assurances are
100+
provided by any Contributor that the Program does not infringe the
101+
patent or other intellectual property rights of any other entity.
102+
Each Contributor disclaims any liability to Recipient for claims
103+
brought by any other entity based on infringement of intellectual
104+
property rights or otherwise. As a condition to exercising the
105+
rights and licenses granted hereunder, each Recipient hereby
106+
assumes sole responsibility to secure any other intellectual
107+
property rights needed, if any. For example, if a third party
108+
patent license is required to allow Recipient to Distribute the
109+
Program, it is Recipient's responsibility to acquire that license
110+
before distributing the Program.
111+
112+
d) Each Contributor represents that to its knowledge it has
113+
sufficient copyright rights in its Contribution, if any, to grant
114+
the copyright license set forth in this Agreement.
115+
116+
e) Notwithstanding the terms of any Secondary License, no
117+
Contributor makes additional grants to any Recipient (other than
118+
those set forth in this Agreement) as a result of such Recipient's
119+
receipt of the Program under the terms of a Secondary License
120+
(if permitted under the terms of Section 3).
121+
122+
3. REQUIREMENTS
123+
124+
3.1 If a Contributor Distributes the Program in any form, then:
125+
126+
a) the Program must also be made available as Source Code, in
127+
accordance with section 3.2, and the Contributor must accompany
128+
the Program with a statement that the Source Code for the Program
129+
is available under this Agreement, and informs Recipients how to
130+
obtain it in a reasonable manner on or through a medium customarily
131+
used for software exchange; and
132+
133+
b) the Contributor may Distribute the Program under a license
134+
different than this Agreement, provided that such license:
135+
i) effectively disclaims on behalf of all other Contributors all
136+
warranties and conditions, express and implied, including
137+
warranties or conditions of title and non-infringement, and
138+
implied warranties or conditions of merchantability and fitness
139+
for a particular purpose;
140+
141+
ii) effectively excludes on behalf of all other Contributors all
142+
liability for damages, including direct, indirect, special,
143+
incidental and consequential damages, such as lost profits;
144+
145+
iii) does not attempt to limit or alter the recipients' rights
146+
in the Source Code under section 3.2; and
147+
148+
iv) requires any subsequent distribution of the Program by any
149+
party to be under a license that satisfies the requirements
150+
of this section 3.
151+
152+
3.2 When the Program is Distributed as Source Code:
153+
154+
a) it must be made available under this Agreement, or if the
155+
Program (i) is combined with other material in a separate file or
156+
files made available under a Secondary License, and (ii) the initial
157+
Contributor attached to the Source Code the notice described in
158+
Exhibit A of this Agreement, then the Program may be made available
159+
under the terms of such Secondary Licenses, and
160+
161+
b) a copy of this Agreement must be included with each copy of
162+
the Program.
163+
164+
3.3 Contributors may not remove or alter any copyright, patent,
165+
trademark, attribution notices, disclaimers of warranty, or limitations
166+
of liability ("notices") contained within the Program from any copy of
167+
the Program which they Distribute, provided that Contributors may add
168+
their own appropriate notices.
169+
170+
4. COMMERCIAL DISTRIBUTION
171+
172+
Commercial distributors of software may accept certain responsibilities
173+
with respect to end users, business partners and the like. While this
174+
license is intended to facilitate the commercial use of the Program,
175+
the Contributor who includes the Program in a commercial product
176+
offering should do so in a manner which does not create potential
177+
liability for other Contributors. Therefore, if a Contributor includes
178+
the Program in a commercial product offering, such Contributor
179+
("Commercial Contributor") hereby agrees to defend and indemnify every
180+
other Contributor ("Indemnified Contributor") against any losses,
181+
damages and costs (collectively "Losses") arising from claims, lawsuits
182+
and other legal actions brought by a third party against the Indemnified
183+
Contributor to the extent caused by the acts or omissions of such
184+
Commercial Contributor in connection with its distribution of the Program
185+
in a commercial product offering. The obligations in this section do not
186+
apply to any claims or Losses relating to any actual or alleged
187+
intellectual property infringement. In order to qualify, an Indemnified
188+
Contributor must: a) promptly notify the Commercial Contributor in
189+
writing of such claim, and b) allow the Commercial Contributor to control,
190+
and cooperate with the Commercial Contributor in, the defense and any
191+
related settlement negotiations. The Indemnified Contributor may
192+
participate in any such claim at its own expense.
193+
194+
For example, a Contributor might include the Program in a commercial
195+
product offering, Product X. That Contributor is then a Commercial
196+
Contributor. If that Commercial Contributor then makes performance
197+
claims, or offers warranties related to Product X, those performance
198+
claims and warranties are such Commercial Contributor's responsibility
199+
alone. Under this section, the Commercial Contributor would have to
200+
defend claims against the other Contributors related to those performance
201+
claims and warranties, and if a court requires any other Contributor to
202+
pay any damages as a result, the Commercial Contributor must pay
203+
those damages.
204+
205+
5. NO WARRANTY
206+
207+
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
208+
PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
209+
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
210+
IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
211+
TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
212+
PURPOSE. Each Recipient is solely responsible for determining the
213+
appropriateness of using and distributing the Program and assumes all
214+
risks associated with its exercise of rights under this Agreement,
215+
including but not limited to the risks and costs of program errors,
216+
compliance with applicable laws, damage to or loss of data, programs
217+
or equipment, and unavailability or interruption of operations.
218+
219+
6. DISCLAIMER OF LIABILITY
220+
221+
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
222+
PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
223+
SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
224+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
225+
PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
226+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
227+
ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
228+
EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
229+
POSSIBILITY OF SUCH DAMAGES.
230+
231+
7. GENERAL
232+
233+
If any provision of this Agreement is invalid or unenforceable under
234+
applicable law, it shall not affect the validity or enforceability of
235+
the remainder of the terms of this Agreement, and without further
236+
action by the parties hereto, such provision shall be reformed to the
237+
minimum extent necessary to make such provision valid and enforceable.
238+
239+
If Recipient institutes patent litigation against any entity
240+
(including a cross-claim or counterclaim in a lawsuit) alleging that the
241+
Program itself (excluding combinations of the Program with other software
242+
or hardware) infringes such Recipient's patent(s), then such Recipient's
243+
rights granted under Section 2(b) shall terminate as of the date such
244+
litigation is filed.
245+
246+
All Recipient's rights under this Agreement shall terminate if it
247+
fails to comply with any of the material terms or conditions of this
248+
Agreement and does not cure such failure in a reasonable period of
249+
time after becoming aware of such noncompliance. If all Recipient's
250+
rights under this Agreement terminate, Recipient agrees to cease use
251+
and distribution of the Program as soon as reasonably practicable.
252+
However, Recipient's obligations under this Agreement and any licenses
253+
granted by Recipient relating to the Program shall continue and survive.
254+
255+
Everyone is permitted to copy and distribute copies of this Agreement,
256+
but in order to avoid inconsistency the Agreement is copyrighted and
257+
may only be modified in the following manner. The Agreement Steward
258+
reserves the right to publish new versions (including revisions) of
259+
this Agreement from time to time. No one other than the Agreement
260+
Steward has the right to modify this Agreement. The Eclipse Foundation
261+
is the initial Agreement Steward. The Eclipse Foundation may assign the
262+
responsibility to serve as the Agreement Steward to a suitable separate
263+
entity. Each new version of the Agreement will be given a distinguishing
264+
version number. The Program (including Contributions) may always be
265+
Distributed subject to the version of the Agreement under which it was
266+
received. In addition, after a new version of the Agreement is published,
267+
Contributor may elect to Distribute the Program (including its
268+
Contributions) under the new version.
269+
270+
Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
271+
receives no rights or licenses to the intellectual property of any
272+
Contributor under this Agreement, whether expressly, by implication,
273+
estoppel or otherwise. All rights in the Program not expressly granted
274+
under this Agreement are reserved. Nothing in this Agreement is intended
275+
to be enforceable by any entity that is not a Contributor or Recipient.
276+
No third-party beneficiary rights are created under this Agreement.
277+
278+
Exhibit A - Form of Secondary Licenses Notice
279+
280+
"This Source Code may also be made available under the following
281+
Secondary Licenses when the conditions for such availability set forth
282+
in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
283+
version(s), and exceptions or additional permissions here}."
284+
285+
Simply including a copy of this Agreement, including this Exhibit A
286+
is not sufficient to license the Source Code under Secondary Licenses.
287+
288+
If it is not possible or desirable to put the notice in a particular
289+
file, then You may include the notice in a location (such as a LICENSE
290+
file in a relevant directory) where a recipient would be likely to
291+
look for such a notice.
292+
293+
You may add additional accurate notices of copyright ownership.
18294
</license>
19295

20296
<plugin

‎com.eclipsesource.megit.product.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.0.3-SNAPSHOT</version>
10+
<version>0.0.4-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.product.feature</artifactId>

‎com.eclipsesource.megit.product/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.0.3-SNAPSHOT</version>
10+
<version>0.0.4-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.product</artifactId>
14-
<version>0.0.3-SNAPSHOT</version>
14+
<version>0.0.4-SNAPSHOT</version>
1515
<packaging>eclipse-repository</packaging>
1616

1717
<build>

‎com.eclipsesource.megit.target/.project

+6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
<projects>
66
</projects>
77
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
813
</buildSpec>
914
<natures>
15+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
1016
</natures>
1117
</projectDescription>

0 commit comments

Comments
 (0)