Skip to content

Commit 0c396a3

Browse files
committed
Merge branch 'eddsa-removal' into 'main'
Upgrading SSHJ to version that removes dependency on EDDSA See merge request weblogic-cloud/weblogic-deploy-tooling!1804
2 parents ab34f11 + 097a45d commit 0c396a3

File tree

5 files changed

+3
-154
lines changed

5 files changed

+3
-154
lines changed

THIRD_PARTY_LICENSES.txt

Lines changed: 1 addition & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The following packages are licensed under The Apache License, Version 2.0:
1616
com.hierynomus:asn-one:0.6.0
1717
Copyright 2016 Jeroen van Erp <[email protected]>
1818

19-
com.hierynomus:sshj:0.38.0
19+
com.hierynomus:sshj:0.40.0
2020
Copyright (C)2009 - SSHJ Contributors
2121

2222
info.picocli:picocli:4.7.5
@@ -254,140 +254,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
254254

255255
--------------------------------------------------------------------------------
256256

257-
The following packages are licensed under The CC0 1.0 Universal license:
258-
259-
net.i2p.crypto:eddsa:0.3.0
260-
No Copyright
261-
262-
263-
The CC0 1.0 Universal license
264-
265-
Creative Commons Legal Code
266-
267-
CC0 1.0 Universal
268-
269-
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
270-
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
271-
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
272-
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
273-
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
274-
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
275-
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
276-
HEREUNDER.
277-
278-
Statement of Purpose
279-
280-
The laws of most jurisdictions throughout the world automatically confer
281-
exclusive Copyright and Related Rights (defined below) upon the creator
282-
and subsequent owner(s) (each and all, an "owner") of an original work of
283-
authorship and/or a database (each, a "Work").
284-
285-
Certain owners wish to permanently relinquish those rights to a Work for
286-
the purpose of contributing to a commons of creative, cultural and
287-
scientific works ("Commons") that the public can reliably and without fear
288-
of later claims of infringement build upon, modify, incorporate in other
289-
works, reuse and redistribute as freely as possible in any form whatsoever
290-
and for any purposes, including without limitation commercial purposes.
291-
These owners may contribute to the Commons to promote the ideal of a free
292-
culture and the further production of creative, cultural and scientific
293-
works, or to gain reputation or greater distribution for their Work in
294-
part through the use and efforts of others.
295-
296-
For these and/or other purposes and motivations, and without any
297-
expectation of additional consideration or compensation, the person
298-
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
299-
is an owner of Copyright and Related Rights in the Work, voluntarily
300-
elects to apply CC0 to the Work and publicly distribute the Work under its
301-
terms, with knowledge of his or her Copyright and Related Rights in the
302-
Work and the meaning and intended legal effect of CC0 on those rights.
303-
304-
1. Copyright and Related Rights. A Work made available under CC0 may be
305-
protected by copyright and related or neighboring rights ("Copyright and
306-
Related Rights"). Copyright and Related Rights include, but are not
307-
limited to, the following:
308-
309-
i. the right to reproduce, adapt, distribute, perform, display,
310-
communicate, and translate a Work;
311-
ii. moral rights retained by the original author(s) and/or performer(s);
312-
iii. publicity and privacy rights pertaining to a person's image or
313-
likeness depicted in a Work;
314-
iv. rights protecting against unfair competition in regards to a Work,
315-
subject to the limitations in paragraph 4(a), below;
316-
v. rights protecting the extraction, dissemination, use and reuse of data
317-
in a Work;
318-
vi. database rights (such as those arising under Directive 96/9/EC of the
319-
European Parliament and of the Council of 11 March 1996 on the legal
320-
protection of databases, and under any national implementation
321-
thereof, including any amended or successor version of such
322-
directive); and
323-
vii. other similar, equivalent or corresponding rights throughout the
324-
world based on applicable law or treaty, and any national
325-
implementations thereof.
326-
327-
2. Waiver. To the greatest extent permitted by, but not in contravention
328-
of, applicable law, Affirmer hereby overtly, fully, permanently,
329-
irrevocably and unconditionally waives, abandons, and surrenders all of
330-
Affirmer's Copyright and Related Rights and associated claims and causes
331-
of action, whether now known or unknown (including existing as well as
332-
future claims and causes of action), in the Work (i) in all territories
333-
worldwide, (ii) for the maximum duration provided by applicable law or
334-
treaty (including future time extensions), (iii) in any current or future
335-
medium and for any number of copies, and (iv) for any purpose whatsoever,
336-
including without limitation commercial, advertising or promotional
337-
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
338-
member of the public at large and to the detriment of Affirmer's heirs and
339-
successors, fully intending that such Waiver shall not be subject to
340-
revocation, rescission, cancellation, termination, or any other legal or
341-
equitable action to disrupt the quiet enjoyment of the Work by the public
342-
as contemplated by Affirmer's express Statement of Purpose.
343-
344-
3. Public License Fallback. Should any part of the Waiver for any reason
345-
be judged legally invalid or ineffective under applicable law, then the
346-
Waiver shall be preserved to the maximum extent permitted taking into
347-
account Affirmer's express Statement of Purpose. In addition, to the
348-
extent the Waiver is so judged Affirmer hereby grants to each affected
349-
person a royalty-free, non transferable, non sublicensable, non exclusive,
350-
irrevocable and unconditional license to exercise Affirmer's Copyright and
351-
Related Rights in the Work (i) in all territories worldwide, (ii) for the
352-
maximum duration provided by applicable law or treaty (including future
353-
time extensions), (iii) in any current or future medium and for any number
354-
of copies, and (iv) for any purpose whatsoever, including without
355-
limitation commercial, advertising or promotional purposes (the
356-
"License"). The License shall be deemed effective as of the date CC0 was
357-
applied by Affirmer to the Work. Should any part of the License for any
358-
reason be judged legally invalid or ineffective under applicable law, such
359-
partial invalidity or ineffectiveness shall not invalidate the remainder
360-
of the License, and in such case Affirmer hereby affirms that he or she
361-
will not (i) exercise any of his or her remaining Copyright and Related
362-
Rights in the Work or (ii) assert any associated claims and causes of
363-
action with respect to the Work, in either case contrary to Affirmer's
364-
express Statement of Purpose.
365-
366-
4. Limitations and Disclaimers.
367-
368-
a. No trademark or patent rights held by Affirmer are waived, abandoned,
369-
surrendered, licensed or otherwise affected by this document.
370-
b. Affirmer offers the Work as-is and makes no representations or
371-
warranties of any kind concerning the Work, express, implied,
372-
statutory or otherwise, including without limitation warranties of
373-
title, merchantability, fitness for a particular purpose, non
374-
infringement, or the absence of latent or other defects, accuracy, or
375-
the present or absence of errors, whether or not discoverable, all to
376-
the greatest extent permissible under applicable law.
377-
c. Affirmer disclaims responsibility for clearing rights of other persons
378-
that may apply to the Work or any use thereof, including without
379-
limitation any person's Copyright and Related Rights in the Work.
380-
Further, Affirmer disclaims responsibility for obtaining any necessary
381-
consents, permissions or other rights required for any use of the
382-
Work.
383-
d. Affirmer understands and acknowledges that Creative Commons is not a
384-
party to this document and has no duty or obligation with respect to
385-
this CC0 or use of the Work.
386-
387-
For more information, please see https://creativecommons.org/publicdomain/zero/1.0/
388-
389-
--------------------------------------------------------------------------------
390-
391257
The following packages are licensed under The MIT License:
392258

393259
org.slf4j:slf4j-api:2.0.7

core/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@
4040
<groupId>com.hierynomus</groupId>
4141
<artifactId>sshj</artifactId>
4242
</dependency>
43-
<dependency>
44-
<groupId>net.i2p.crypto</groupId>
45-
<artifactId>eddsa</artifactId>
46-
<scope>runtime</scope>
47-
</dependency>
4843
<dependency>
4944
<groupId>org.slf4j</groupId>
5045
<artifactId>slf4j-jdk14</artifactId>
@@ -213,7 +208,7 @@
213208
<archive>
214209
<manifestEntries>
215210
<Multi-Release>true</Multi-Release>
216-
<Class-Path>antlr4-runtime-${antlr.version}.jar snakeyaml-${snakeyaml.version}.jar picocli-${picocli.version}.jar sshj-${sshj.version}.jar asn-one-${asn.one.version}.jar eddsa-${eddsa.version}.jar slf4j-jdk14-${slf4j.version}.jar slf4j-api-${slf4j.version}.jar jzlib-${jzlib.version}.jar jline-reader-${jline.version}.jar jline-terminal-${jline.version}.jar jline-terminal-jni-${jline.version}.jar</Class-Path>
211+
<Class-Path>antlr4-runtime-${antlr.version}.jar snakeyaml-${snakeyaml.version}.jar picocli-${picocli.version}.jar sshj-${sshj.version}.jar asn-one-${asn.one.version}.jar slf4j-jdk14-${slf4j.version}.jar slf4j-api-${slf4j.version}.jar jzlib-${jzlib.version}.jar jline-reader-${jline.version}.jar jline-terminal-${jline.version}.jar jline-terminal-jni-${jline.version}.jar</Class-Path>
217212
</manifestEntries>
218213
</archive>
219214
</configuration>
@@ -250,7 +245,6 @@
250245
<element>org.antlr:antlr4-runtime:jar</element>
251246
<element>org.yaml:snakeyaml:jar</element>
252247
<element>com.hierynomus:sshj:jar</element>
253-
<element>net.i2p.crypto:eddsa:jar</element>
254248
<element>org.slf4j:slf4j-jdk14:jar</element>
255249
<element>org.slf4j:slf4j-api:jar</element>
256250
<element>com.jcraft:jzlib:jar</element>

installer/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<groupId>com.hierynomus</groupId>
3939
<artifactId>sshj</artifactId>
4040
</dependency>
41-
<dependency>
42-
<groupId>net.i2p.crypto</groupId>
43-
<artifactId>eddsa</artifactId>
44-
</dependency>
4541
<dependency>
4642
<groupId>org.slf4j</groupId>
4743
<artifactId>slf4j-jdk14</artifactId>

installer/src/assembly/zip.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
<include>info.picocli:picocli</include>
117117
<include>com.hierynomus:sshj</include>
118118
<include>com.hierynomus:asn-one</include>
119-
<include>net.i2p.crypto:eddsa</include>
120119
<include>org.slf4j:slf4j-jdk14</include>
121120
<include>org.slf4j:slf4j-api</include>
122121
<include>com.jcraft:jzlib</include>

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
<antlr.version>4.9.3</antlr.version>
4141
<snakeyaml.version>2.4</snakeyaml.version>
4242
<picocli.version>4.7.7</picocli.version>
43-
<sshj.version>0.39.0</sshj.version>
44-
<eddsa.version>0.3.0</eddsa.version>
43+
<sshj.version>0.40.0</sshj.version>
4544
<slf4j.version>2.0.17</slf4j.version>
4645
<jzlib.version>1.1.3</jzlib.version>
4746
<asn.one.version>0.6.0</asn.one.version>
@@ -92,11 +91,6 @@
9291
<artifactId>sshj</artifactId>
9392
<version>${sshj.version}</version>
9493
</dependency>
95-
<dependency>
96-
<groupId>net.i2p.crypto</groupId>
97-
<artifactId>eddsa</artifactId>
98-
<version>${eddsa.version}</version>
99-
</dependency>
10094
<dependency>
10195
<groupId>org.slf4j</groupId>
10296
<artifactId>slf4j-jdk14</artifactId>

0 commit comments

Comments
 (0)