Skip to content

Commit d223a71

Browse files
wimjongmanwimjongman
authored
Replace httpclient45 with httpclient5 #145 (#1457)
ECF httpclient45 is no longer shipped. Replaced feature httpclient45 with httpclient5 in our products
1 parent 2f4e982 commit d223a71

File tree

2 files changed

+309
-309
lines changed

2 files changed

+309
-309
lines changed

‎io.sloeber.product.sdk/arduino.product‎

Lines changed: 154 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<aboutInfo>
77
<image path="/io.sloeber.application/icons/eclipse_lg.png"/>
88
<text>
9-
Sloeber, the Eclipse IDE for Arduino Developers
10-
11-
Info: https://eclipse.baeyens.it/
12-
Source: https://github.com/sloeber/arduino-eclipse-plugin
13-
14-
15-
Contributors (github users): jantje, wimjongman, rlogiacco, MarceloLimori, brodykenrick, neuweiler, darcade, amorellgarcia
16-
9+
Sloeber, the Eclipse IDE for Arduino Developers
10+
11+
Info: https://eclipse.baeyens.it/
12+
Source: https://github.com/sloeber/arduino-eclipse-plugin
13+
14+
15+
Contributors (github users): jantje, wimjongman, rlogiacco, MarceloLimori, brodykenrick, neuweiler, darcade, amorellgarcia
16+
1717
https://github.com/sloeber/arduino-eclipse-plugin/graphs/contributors
1818
</text>
1919
</aboutInfo>
@@ -22,14 +22,14 @@ https://github.com/sloeber/arduino-eclipse-plugin/graphs/contributors
2222
</configIni>
2323

2424
<launcherArgs>
25-
<programArgs>-perspective io.sloeber.application.perspective
26-
--launcher.defaultAction openFile
25+
<programArgs>-perspective io.sloeber.application.perspective
26+
--launcher.defaultAction openFile
2727
--launcher.appendVmargs
2828
</programArgs>
29-
<vmArgs>-Dosgi.requiredJavaVersion=1.8
30-
-Dorg.eclipse.update.reconcile=false
31-
-Xms40m
32-
-Xmx512m
29+
<vmArgs>-Dosgi.requiredJavaVersion=1.8
30+
-Dorg.eclipse.update.reconcile=false
31+
-Xms40m
32+
-Xmx512m
3333
--add-modules=ALL-SYSTEM
3434
</vmArgs>
3535
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
@@ -60,145 +60,145 @@ https://github.com/sloeber/arduino-eclipse-plugin/graphs/contributors
6060
<license>
6161
<url>http://eclipse.org/legal/epl/notice.php</url>
6262
<text>
63-
Eclipse Foundation Software User Agreement
64-
65-
November 22, 2017
66-
67-
Usage Of Content
68-
69-
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
70-
AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;). USE OF
71-
THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
72-
TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
73-
BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
74-
BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
75-
AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
76-
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
77-
APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
78-
MAY NOT USE THE CONTENT.
79-
80-
Applicable Licenses
81-
82-
Unless otherwise indicated, all Content made available by the Eclipse Foundation
83-
is provided to you under the terms and conditions of the Eclipse Public License
84-
Version 2.0 (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also
85-
available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
86-
&quot;Program&quot; will mean the Content.
87-
88-
Content includes, but is not limited to, source code, object code, documentation
89-
and other files maintained in the Eclipse Foundation source code repository
90-
(&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as
91-
downloadable archives (&quot;Downloads&quot;).
92-
93-
- Content may be structured and packaged into modules to facilitate
94-
delivering, extending, and upgrading the Content. Typical modules may
95-
include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and
96-
features (&quot;Features&quot;).
97-
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR
98-
(Java™ ARchive) in a directory named &quot;plugins&quot;.
99-
- A Feature is a bundle of one or more Plug-ins and/or Fragments and
100-
associated material. Each Feature may be packaged as a sub-directory in a
101-
directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may
102-
contain a list of the names and version numbers of the Plug-ins and/or
103-
Fragments associated with that Feature.
104-
- Features may also include other Features (&quot;Included Features&quot;). Within a
105-
Feature, files named &quot;feature.xml&quot; may contain a list of the names and
106-
version numbers of Included Features.
107-
108-
The terms and conditions governing Plug-ins and Fragments should be contained in
109-
files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features
110-
and Included Features should be contained in files named &quot;license.html&quot;
111-
(&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any
112-
directory of a Download or Module including, but not limited to the following
113-
locations:
114-
115-
- The top-level (root) directory
116-
- Plug-in and Fragment directories
117-
- Inside Plug-ins and Fragments packaged as JARs
118-
- Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
119-
- Feature directories
120-
121-
Note: if a Feature made available by the Eclipse Foundation is installed using
122-
the Provisioning Technology (as defined below), you must agree to a license
123-
(&quot;Feature Update License&quot;) during the installation process. If the Feature
124-
contains Included Features, the Feature Update License should either provide you
125-
with the terms and conditions governing the Included Features or inform you
126-
where you can locate them. Feature Update Licenses may be found in the &quot;license&quot;
127-
property of files named &quot;feature.properties&quot; found within a Feature. Such
128-
Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
129-
conditions (or references to such terms and conditions) that govern your use of
130-
the associated Content in that directory.
131-
132-
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
133-
OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
134-
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
135-
136-
- Eclipse Public License Version 1.0 (available at
137-
http://www.eclipse.org/legal/epl-v10.html)
138-
- Eclipse Distribution License Version 1.0 (available at
139-
http://www.eclipse.org/licenses/edl-v1.0.html)
140-
- Common Public License Version 1.0 (available at
141-
http://www.eclipse.org/legal/cpl-v10.html)
142-
- Apache Software License 1.1 (available at
143-
http://www.apache.org/licenses/LICENSE)
144-
- Apache Software License 2.0 (available at
145-
http://www.apache.org/licenses/LICENSE-2.0)
146-
- Mozilla Public License Version 1.1 (available at
147-
http://www.mozilla.org/MPL/MPL-1.1.html)
148-
149-
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
150-
USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
151-
provided, please contact the Eclipse Foundation to determine what terms and
152-
conditions govern that particular Content.
153-
154-
Use of Provisioning Technology
155-
156-
The Eclipse Foundation makes available provisioning software, examples of which
157-
include, but are not limited to, p2 and the Eclipse Update Manager
158-
(&quot;Provisioning Technology&quot;) for the purpose of allowing users to install
159-
software, documentation, information and/or other materials (collectively
160-
&quot;Installable Software&quot;). This capability is provided with the intent of allowing
161-
such users to install, extend and update Eclipse-based products. Information
162-
about packaging Installable Software is available at
163-
http://eclipse.org/equinox/p2/repository_packaging.html (&quot;Specification&quot;).
164-
165-
You may use Provisioning Technology to allow other parties to install
166-
Installable Software. You shall be responsible for enabling the applicable
167-
license agreements relating to the Installable Software to be presented to, and
168-
accepted by, the users of the Provisioning Technology in accordance with the
169-
Specification. By using Provisioning Technology in such a manner and making it
170-
available in accordance with the Specification, you further acknowledge your
171-
agreement to, and the acquisition of all necessary rights to permit the
172-
following:
173-
174-
1. A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may
175-
execute the Provisioning Technology on a machine (&quot;Target Machine&quot;) with the
176-
intent of installing, extending or updating the functionality of an
177-
Eclipse-based product.
178-
2. During the Provisioning Process, the Provisioning Technology may cause third
179-
party Installable Software or a portion thereof to be accessed and copied to
180-
the Target Machine.
181-
3. Pursuant to the Specification, you will provide to the user the terms and
182-
conditions that govern the use of the Installable Software (&quot;Installable
183-
Software Agreement&quot;) and such Installable Software Agreement shall be
184-
accessed from the Target Machine in accordance with the Specification. Such
185-
Installable Software Agreement must inform the user of the terms and
186-
conditions that govern the Installable Software and must solicit acceptance
187-
by the end user in the manner prescribed in such Installable
188-
Software Agreement. Upon such indication of agreement by the user, the
189-
provisioning Technology will complete installation of the
190-
Installable Software.
191-
192-
Cryptography
193-
194-
Content may contain encryption software. The country in which you are currently
195-
may have restrictions on the import, possession, and use, and/or re-export to
196-
another country, of encryption software. BEFORE using any encryption software,
197-
please check the country&apos;s laws, regulations and policies concerning the import,
198-
possession, or use, and re-export of encryption software, to see if this is
199-
permitted.
200-
201-
Java and all Java-based trademarks are trademarks of Oracle Corporation in the
63+
Eclipse Foundation Software User Agreement
64+
65+
November 22, 2017
66+
67+
Usage Of Content
68+
69+
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
70+
AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;). USE OF
71+
THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
72+
TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
73+
BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
74+
BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
75+
AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
76+
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
77+
APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
78+
MAY NOT USE THE CONTENT.
79+
80+
Applicable Licenses
81+
82+
Unless otherwise indicated, all Content made available by the Eclipse Foundation
83+
is provided to you under the terms and conditions of the Eclipse Public License
84+
Version 2.0 (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also
85+
available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
86+
&quot;Program&quot; will mean the Content.
87+
88+
Content includes, but is not limited to, source code, object code, documentation
89+
and other files maintained in the Eclipse Foundation source code repository
90+
(&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as
91+
downloadable archives (&quot;Downloads&quot;).
92+
93+
- Content may be structured and packaged into modules to facilitate
94+
delivering, extending, and upgrading the Content. Typical modules may
95+
include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and
96+
features (&quot;Features&quot;).
97+
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR
98+
(Java™ ARchive) in a directory named &quot;plugins&quot;.
99+
- A Feature is a bundle of one or more Plug-ins and/or Fragments and
100+
associated material. Each Feature may be packaged as a sub-directory in a
101+
directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may
102+
contain a list of the names and version numbers of the Plug-ins and/or
103+
Fragments associated with that Feature.
104+
- Features may also include other Features (&quot;Included Features&quot;). Within a
105+
Feature, files named &quot;feature.xml&quot; may contain a list of the names and
106+
version numbers of Included Features.
107+
108+
The terms and conditions governing Plug-ins and Fragments should be contained in
109+
files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features
110+
and Included Features should be contained in files named &quot;license.html&quot;
111+
(&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any
112+
directory of a Download or Module including, but not limited to the following
113+
locations:
114+
115+
- The top-level (root) directory
116+
- Plug-in and Fragment directories
117+
- Inside Plug-ins and Fragments packaged as JARs
118+
- Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
119+
- Feature directories
120+
121+
Note: if a Feature made available by the Eclipse Foundation is installed using
122+
the Provisioning Technology (as defined below), you must agree to a license
123+
(&quot;Feature Update License&quot;) during the installation process. If the Feature
124+
contains Included Features, the Feature Update License should either provide you
125+
with the terms and conditions governing the Included Features or inform you
126+
where you can locate them. Feature Update Licenses may be found in the &quot;license&quot;
127+
property of files named &quot;feature.properties&quot; found within a Feature. Such
128+
Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
129+
conditions (or references to such terms and conditions) that govern your use of
130+
the associated Content in that directory.
131+
132+
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
133+
OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
134+
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
135+
136+
- Eclipse Public License Version 1.0 (available at
137+
http://www.eclipse.org/legal/epl-v10.html)
138+
- Eclipse Distribution License Version 1.0 (available at
139+
http://www.eclipse.org/licenses/edl-v1.0.html)
140+
- Common Public License Version 1.0 (available at
141+
http://www.eclipse.org/legal/cpl-v10.html)
142+
- Apache Software License 1.1 (available at
143+
http://www.apache.org/licenses/LICENSE)
144+
- Apache Software License 2.0 (available at
145+
http://www.apache.org/licenses/LICENSE-2.0)
146+
- Mozilla Public License Version 1.1 (available at
147+
http://www.mozilla.org/MPL/MPL-1.1.html)
148+
149+
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
150+
USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
151+
provided, please contact the Eclipse Foundation to determine what terms and
152+
conditions govern that particular Content.
153+
154+
Use of Provisioning Technology
155+
156+
The Eclipse Foundation makes available provisioning software, examples of which
157+
include, but are not limited to, p2 and the Eclipse Update Manager
158+
(&quot;Provisioning Technology&quot;) for the purpose of allowing users to install
159+
software, documentation, information and/or other materials (collectively
160+
&quot;Installable Software&quot;). This capability is provided with the intent of allowing
161+
such users to install, extend and update Eclipse-based products. Information
162+
about packaging Installable Software is available at
163+
http://eclipse.org/equinox/p2/repository_packaging.html (&quot;Specification&quot;).
164+
165+
You may use Provisioning Technology to allow other parties to install
166+
Installable Software. You shall be responsible for enabling the applicable
167+
license agreements relating to the Installable Software to be presented to, and
168+
accepted by, the users of the Provisioning Technology in accordance with the
169+
Specification. By using Provisioning Technology in such a manner and making it
170+
available in accordance with the Specification, you further acknowledge your
171+
agreement to, and the acquisition of all necessary rights to permit the
172+
following:
173+
174+
1. A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may
175+
execute the Provisioning Technology on a machine (&quot;Target Machine&quot;) with the
176+
intent of installing, extending or updating the functionality of an
177+
Eclipse-based product.
178+
2. During the Provisioning Process, the Provisioning Technology may cause third
179+
party Installable Software or a portion thereof to be accessed and copied to
180+
the Target Machine.
181+
3. Pursuant to the Specification, you will provide to the user the terms and
182+
conditions that govern the use of the Installable Software (&quot;Installable
183+
Software Agreement&quot;) and such Installable Software Agreement shall be
184+
accessed from the Target Machine in accordance with the Specification. Such
185+
Installable Software Agreement must inform the user of the terms and
186+
conditions that govern the Installable Software and must solicit acceptance
187+
by the end user in the manner prescribed in such Installable
188+
Software Agreement. Upon such indication of agreement by the user, the
189+
provisioning Technology will complete installation of the
190+
Installable Software.
191+
192+
Cryptography
193+
194+
Content may contain encryption software. The country in which you are currently
195+
may have restrictions on the import, possession, and use, and/or re-export to
196+
another country, of encryption software. BEFORE using any encryption software,
197+
please check the country&apos;s laws, regulations and policies concerning the import,
198+
possession, or use, and re-export of encryption software, to see if this is
199+
permitted.
200+
201+
Java and all Java-based trademarks are trademarks of Oracle Corporation in the
202202
United States, other countries, or both.
203203
</text>
204204
</license>
@@ -222,7 +222,7 @@ United States, other countries, or both.
222222
<feature id="org.eclipse.ecf.core.feature" installMode="root"/>
223223
<feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
224224
<feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
225-
<feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" installMode="root"/>
225+
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
226226
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
227227
<feature id="org.eclipse.egit" installMode="root"/>
228228
<feature id="org.eclipse.emf.common" installMode="root"/>

0 commit comments

Comments
 (0)