Skip to content

Commit 206206a

Browse files
authored
Configuration changes (helidon-io#1357)
* Removal of project Reactor. * Change support refactoring - in progress. * Fixed value resolving, MP uses latest config. * Longer timeouts for slow tests. Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
1 parent 92c5340 commit 206206a

56 files changed

Lines changed: 384 additions & 1366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3RD-PARTY.txt

Lines changed: 0 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,153 +1313,6 @@ Copyright 2017-2018 The OpenTracing Authors
13131313
Apache License, Version 2.0
13141314
--------------------------------------------
13151315

1316-
=======================
1317-
reactor-core 3.1.5-RELEASE
1318-
=======================
1319-
1320-
Non-Blocking Reactive Foundation for the JVM (io.projectreactor:reactor-core)
1321-
Copyright (c) Pivotal Software Inc, All Rights Reserved.
1322-
Copyright The Netty Project
1323-
Copyright the original author or authors.
1324-
Apache License, Version 2.0
1325-
--------------------------------------------
1326-
"reactive-streams" 1.0.1 (org.reactivestreams:reactive-streams)
1327-
To the extent possible under law, the person who associated CC0 with this
1328-
code has waived all copyright and related or neighboring rights to this code.
1329-
1330-
Statement of Purpose The laws of most jurisdictions throughout the world
1331-
automatically confer exclusive Copyright and Related Rights (defined below) upon
1332-
the creator and subsequent owner(s) (each and all, an "owner") of an original
1333-
work of authorship and/or a database (each, a "Work").
1334-
1335-
Certain owners wish to permanently relinquish those rights to a Work for the
1336-
purpose of contributing to a commons of creative, cultural and scientific works
1337-
("Commons") that the public can reliably and without fear of later claims of
1338-
infringement build upon, modify, incorporate in other works, reuse and
1339-
redistribute as freely as possible in any form whatsoever and for any purposes,
1340-
including without limitation commercial purposes. These owners may contribute to
1341-
the Commons to promote the ideal of a free culture and the further production of
1342-
creative, cultural and scientific works, or to gain reputation or greater
1343-
distribution for their Work in part through the use and efforts of others.
1344-
1345-
For these and/or other purposes and motivations, and without any expectation of
1346-
additional consideration or compensation, the person associating CC0 with a Work
1347-
(the "Affirmer"), to the extent that he or she is an owner of Copyright and
1348-
Related Rights in the Work, voluntarily elects to apply CC0 to the Work and
1349-
publicly distribute the Work under its terms, with knowledge of his or her
1350-
Copyright and Related Rights in the Work and the meaning and intended legal
1351-
effect of CC0 on those rights.
1352-
1353-
1. Copyright and Related Rights. A Work made available under CC0 may be
1354-
protected by copyright and related or neighboring rights ("Copyright and Related
1355-
Rights"). Copyright and Related Rights include, but are not limited to, the
1356-
following:
1357-
1358-
the right to reproduce, adapt, distribute, perform, display, communicate, and
1359-
translate a Work; moral rights retained by the original author(s) and/or
1360-
performer(s); publicity and privacy rights pertaining to a person's image or
1361-
likeness depicted in a Work; rights protecting against unfair competition in
1362-
regards to a Work, subject to the limitations in paragraph 4(a), below; rights
1363-
protecting the extraction, dissemination, use and reuse of data in a Work;
1364-
database rights (such as those arising under Directive 96/9/EC of the European
1365-
Parliament and of the Council of 11 March 1996 on the legal protection of
1366-
databases, and under any national implementation thereof, including any amended
1367-
or successor version of such directive); and other similar, equivalent or
1368-
corresponding rights throughout the world based on applicable law or treaty, and
1369-
any national implementations thereof. 2. Waiver. To the greatest extent
1370-
permitted by, but not in contravention of, applicable law, Affirmer hereby
1371-
overtly, fully, permanently, irrevocably and unconditionally waives, abandons,
1372-
and surrenders all of Affirmer's Copyright and Related Rights and associated
1373-
claims and causes of action, whether now known or unknown (including existing as
1374-
well as future claims and causes of action), in the Work (i) in all territories
1375-
worldwide, (ii) for the maximum duration provided by applicable law or treaty
1376-
(including future time extensions), (iii) in any current or future medium and
1377-
for any number of copies, and (iv) for any purpose whatsoever, including without
1378-
limitation commercial, advertising or promotional purposes (the "Waiver").
1379-
Affirmer makes the Waiver for the benefit of each member of the public at large
1380-
and to the detriment of Affirmer's heirs and successors, fully intending that
1381-
such Waiver shall not be subject to revocation, rescission, cancellation,
1382-
termination, or any other legal or equitable action to disrupt the quiet
1383-
enjoyment of the Work by the public as contemplated by Affirmer's express
1384-
Statement of Purpose.
1385-
1386-
3. Public License Fallback. Should any part of the Waiver for any reason be
1387-
judged legally invalid or ineffective under applicable law, then the Waiver
1388-
shall be preserved to the maximum extent permitted taking into account
1389-
Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
1390-
is so judged Affirmer hereby grants to each affected person a royalty-free, non
1391-
transferable, non sublicensable, non exclusive, irrevocable and unconditional
1392-
license to exercise Affirmer's Copyright and Related Rights in the Work (i) in
1393-
all territories worldwide, (ii) for the maximum duration provided by applicable
1394-
law or treaty (including future time extensions), (iii) in any current or future
1395-
medium and for any number of copies, and (iv) for any purpose whatsoever,
1396-
including without limitation commercial, advertising or promotional purposes
1397-
(the "License"). The License shall be deemed effective as of the date CC0 was
1398-
applied by Affirmer to the Work. Should any part of the License for any reason
1399-
be judged legally invalid or ineffective under applicable law, such partial
1400-
invalidity or ineffectiveness shall not invalidate the remainder of the License,
1401-
and in such case Affirmer hereby affirms that he or she will not (i) exercise
1402-
any of his or her remaining Copyright and Related Rights in the Work or (ii)
1403-
assert any associated claims and causes of action with respect to the Work, in
1404-
either case contrary to Affirmer's express Statement of Purpose.
1405-
1406-
4. Limitations and Disclaimers.
1407-
1408-
No trademark or patent rights held by Affirmer are waived, abandoned,
1409-
surrendered, licensed or otherwise affected by this document. Affirmer offers
1410-
the Work as-is and makes no representations or warranties of any kind concerning
1411-
the Work, express, implied, statutory or otherwise, including without limitation
1412-
warranties of title, merchantability, fitness for a particular purpose, non
1413-
infringement, or the absence of latent or other defects, accuracy, or the
1414-
present or absence of errors, whether or not discoverable, all to the greatest
1415-
extent permissible under applicable law. Affirmer disclaims responsibility for
1416-
clearing rights of other persons that may apply to the Work or any use thereof,
1417-
including without limitation any person's Copyright and Related Rights in the
1418-
Work. Further, Affirmer disclaims responsibility for obtaining any necessary
1419-
consents, permissions or other rights required for any use of the Work. Affirmer
1420-
understands and acknowledges that Creative Commons is not a party to this
1421-
document and has no duty or obligation with respect to this CC0 or use of the
1422-
Work.
1423-
1424-
--------------------------------------------
1425-
"SLF4J API Module" 1.7.12 (org.slf4j:slf4j-api)
1426-
Copyright (c) QOS.ch
1427-
1428-
The MIT License SPDX short identifier: MIT
1429-
1430-
Further resources on the MIT License Copyright
1431-
1432-
Permission is hereby granted, free of charge, to any person obtaining a copy of
1433-
this software and associated documentation files (the "Software"), to deal in
1434-
the Software without restriction, including without limitation the rights to
1435-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
1436-
the Software, and to permit persons to whom the Software is furnished to do so,
1437-
subject to the following conditions:
1438-
1439-
The above copyright notice and this permission notice shall be included in all
1440-
copies or substantial portions of the Software.
1441-
1442-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1443-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
1444-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
1445-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
1446-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
1447-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1448-
1449-
--------------------------------------------
1450-
"FindBugs-jsr305" 3.0.2 (com.google.code.findbugs:jsr305)
1451-
Copyright (c) 2007-2009, JSR305 expert group
1452-
Apache License, Version 2.0
1453-
--------------------------------------------
1454-
"org.jetbrains.kotlin:kotlin-stdlib" 1.1.51 (org.jetbrains.kotlin:kotlin-stdlib)
1455-
Copyright JetBrains s.r.o.
1456-
Apache License, Version 2.0
1457-
--------------------------------------------
1458-
"IntelliJ IDEA Annotations" 13.0 (org.jetbrains:annotations)
1459-
Copyright Sascha Weinreuter
1460-
Copyright JetBrains s.r.o.
1461-
Apache License, Version 2.0
1462-
--------------------------------------------
14631316

14641317
=======================
14651318
SLF4J 1.7.15

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ Notable changes:
7878
- Upgrade Netty to 4.1.45 [1309](https://github.com/oracle/helidon/pull/1309)
7979
- Upgrade Google libraries for Google login provider. [1229](https://github.com/oracle/helidon/pull/1229)
8080
- Upgrade H2, HikariCP, Jedis, OCI SDK versions [1198](https://github.com/oracle/helidon/pull/1198)
81-
- Upgrade reactor to 3.3.1-RELEASE [1235](https://github.com/oracle/helidon/pull/1235)
8281
- Upgrade to FT 2.0.2 and Failsafe 2.2.3 [1204](https://github.com/oracle/helidon/pull/1204)
8382

8483

@@ -99,6 +98,7 @@ Here are the details:
9998
- Removed `io.helidon.common.OptionalHelper`, please use methods of `java.util.Optional`
10099
- Removed `io.helidon.common.StackWalker`, please use `java.lang.StackWalker`
101100
- Removed `io.helidon.common.InputStreamHelper`, please use `java.io.InputStream` methods
101+
- Removed dependency on Project Reactor
102102

103103
#### Tracing
104104
- We have upgraded to OpenTracing version 0.33.0 that is not backward compatible, the following breaking changes exist

common/reactive/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2018, 2020 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -66,10 +66,6 @@
6666
<groupId>io.helidon.common</groupId>
6767
<artifactId>helidon-common-mapper</artifactId>
6868
</dependency>
69-
<dependency>
70-
<groupId>io.projectreactor</groupId>
71-
<artifactId>reactor-core</artifactId>
72-
</dependency>
7369
<dependency>
7470
<groupId>org.junit.jupiter</groupId>
7571
<artifactId>junit-jupiter-api</artifactId>

common/reactive/src/main/java/io/helidon/common/reactive/OriginThreadPublisher.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2020 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@
3333
* {@link #submit(Object)}. In other words, whenever the source of chunks sends data, the same thread is used to deliver the data
3434
* to the subscriber.
3535
* <p>
36-
* Standard publisher implementations (such as {@link SubmissionPublisher} or Reactor Flux would use the same thread as
37-
* {@link Subscription#request(long)} was called on to deliver the chunk when the data are already available; this implementation
38-
* however strictly uses the originating thread.<p>
36+
* Standard publisher implementations (such as {@link java.util.concurrent.SubmissionPublisher} or Reactor Flux would use
37+
* the same thread as {@link Subscription#request(long)} was called on to deliver the chunk when the data are already available;
38+
* this implementation however strictly uses the originating thread.<p>
3939
* In order to be able to achieve such behavior, this publisher provides hooks on subscription methods: {@link #hookOnCancel()}
4040
* and {@link #hookOnRequested(long, long)}.
4141
* </p>

0 commit comments

Comments
 (0)