Skip to content

Commit ad021e1

Browse files
jbonofrejbonofre
authored
Fix binary distributions LICENSE and NOTICE (#1940)
1 parent 3e3cd23 commit ad021e1

File tree

6 files changed

+108
-28
lines changed

6 files changed

+108
-28
lines changed

‎runtime/admin/distribution/LICENSE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
339339

340340
--------------------------------------------------------------------------------
341341

342-
Group: com.github.ben-manes.caffeine Name: caffeine Version: 3.2.1
342+
Group: com.github.ben-manes.caffeine Name: caffeine Version: 3.2.0
343343
Project URL: https://github.com/ben-manes/caffeine
344344
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
345345

@@ -749,9 +749,9 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
749749

750750
--------------------------------------------------------------------------------
751751

752-
Group: io.micrometer Name: micrometer-commons Version: 1.15.1
753-
Group: io.micrometer Name: micrometer-core Version: 1.15.1
754-
Group: io.micrometer Name: micrometer-observation Version: 1.15.1
752+
Group: io.micrometer Name: micrometer-commons Version: 1.14.6
753+
Group: io.micrometer Name: micrometer-core Version: 1.14.6
754+
Group: io.micrometer Name: micrometer-observation Version: 1.14.6
755755
Project URL: https://github.com/micrometer-metrics/micrometer
756756
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
757757

@@ -829,7 +829,7 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
829829

830830
--------------------------------------------------------------------------------
831831

832-
Group: io.projectreactor Name: reactor-core Version: 3.7.6
832+
Group: io.projectreactor Name: reactor-core Version: 3.7.7
833833
Project URL: https://github.com/reactor/reactor-core
834834
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
835835

‎runtime/admin/distribution/NOTICE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ NOTICE:
107107

108108
--------------------------------------------------------------------------------
109109

110-
Group: io.micrometer Name: micrometer-commons Version: 1.15.1
111-
Group: io.micrometer Name: micrometer-core Version: 1.15.1
112-
Group: io.micrometer Name: micrometer-observation Version: 1.15.1
110+
Group: io.micrometer Name: micrometer-commons Version: 1.14.6
111+
Group: io.micrometer Name: micrometer-core Version: 1.14.6
112+
Group: io.micrometer Name: micrometer-observation Version: 1.14.6
113113

114114
NOTICE:
115115
| Micrometer

‎runtime/distribution/LICENSE‎

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
447447

448448
--------------------------------------------------------------------------------
449449

450-
Group: com.github.ben-manes.caffeine Name: caffeine Version: 3.2.1
450+
Group: com.github.ben-manes.caffeine Name: caffeine Version: 3.2.0
451451
Project URL: https://github.com/ben-manes/caffeine
452452
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
453453

@@ -956,10 +956,10 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
956956

957957
--------------------------------------------------------------------------------
958958

959-
Group: io.micrometer Name: micrometer-commons Version: 1.15.1
960-
Group: io.micrometer Name: micrometer-core Version: 1.15.1
961-
Group: io.micrometer Name: micrometer-observation Version: 1.15.1
962-
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.15.1
959+
Group: io.micrometer Name: micrometer-commons Version: 1.14.6
960+
Group: io.micrometer Name: micrometer-core Version: 1.14.6
961+
Group: io.micrometer Name: micrometer-observation Version: 1.14.6
962+
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.14.6
963963
Project URL: https://github.com/micrometer-metrics/micrometer
964964
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
965965

@@ -1054,7 +1054,7 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
10541054

10551055
--------------------------------------------------------------------------------
10561056

1057-
Group: io.projectreactor Name: reactor-core Version: 3.7.6
1057+
Group: io.projectreactor Name: reactor-core Version: 3.7.7
10581058
Project URL: https://github.com/reactor/reactor-core
10591059
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
10601060

@@ -1817,3 +1817,43 @@ Project URL: https://github.com/awslabs/aws-eventstream-java
18171817
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
18181818

18191819
--------------------------------------------------------------------------------
1820+
1821+
Group: org.hamcrest Name: hamcrest Version: 2.2
1822+
Project URL: https://github.com/hamcrest/JavaHamcrest
1823+
License: BSD 3-Clause
1824+
| BSD 3-Clause License
1825+
|
1826+
| Copyright (c) 2000-2024, www.hamcrest.org
1827+
|
1828+
| Redistribution and use in source and binary forms, with or without
1829+
| modification, are permitted provided that the following conditions are met:
1830+
|
1831+
| 1. Redistributions of source code must retain the above copyright notice, this
1832+
| list of conditions and the following disclaimer.
1833+
|
1834+
| 2. Redistributions in binary form must reproduce the above copyright notice,
1835+
| this list of conditions and the following disclaimer in the documentation
1836+
| and/or other materials provided with the distribution.
1837+
|
1838+
| 3. Neither the name of the copyright holder nor the names of its
1839+
| contributors may be used to endorse or promote products derived from
1840+
| this software without specific prior written permission.
1841+
|
1842+
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1843+
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1844+
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1845+
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
1846+
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1847+
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
1848+
| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1849+
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
1850+
| OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1851+
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1852+
1853+
--------------------------------------------------------------------------------
1854+
1855+
Group: org.awaitility Name: awaitility Version: 4.3.0
1856+
Project URL: https://github.com/awaitility/awaitility
1857+
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
1858+
1859+
--------------------------------------------------------------------------------

‎runtime/distribution/NOTICE‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ NOTICE:
150150

151151
--------------------------------------------------------------------------------
152152

153-
Group: io.micrometer Name: micrometer-commons Version: 1.15.1
154-
Group: io.micrometer Name: micrometer-core Version: 1.15.1
155-
Group: io.micrometer Name: micrometer-observation Version: 1.15.1
156-
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.15.1
153+
Group: io.micrometer Name: micrometer-commons Version: 1.14.6
154+
Group: io.micrometer Name: micrometer-core Version: 1.14.6
155+
Group: io.micrometer Name: micrometer-observation Version: 1.14.6
156+
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.14.6
157157

158158
NOTICE:
159159
| Micrometer

‎runtime/server/distribution/LICENSE‎

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
458458

459459
--------------------------------------------------------------------------------
460460

461-
Group: com.github.ben-manes.caffeine Name: caffeine Version: 3.2.1
461+
Group: com.github.ben-manes.caffeine Name: caffeine Version: 3.2.0
462462
Project URL: https://github.com/ben-manes/caffeine
463463
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
464464

@@ -961,10 +961,10 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
961961

962962
--------------------------------------------------------------------------------
963963

964-
Group: io.micrometer Name: micrometer-commons Version: 1.15.1
965-
Group: io.micrometer Name: micrometer-core Version: 1.15.1
966-
Group: io.micrometer Name: micrometer-observation Version: 1.15.1
967-
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.15.1
964+
Group: io.micrometer Name: micrometer-commons Version: 1.14.6
965+
Group: io.micrometer Name: micrometer-core Version: 1.14.6
966+
Group: io.micrometer Name: micrometer-observation Version: 1.14.6
967+
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.14.6
968968
Project URL: https://github.com/micrometer-metrics/micrometer
969969
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
970970

@@ -1060,7 +1060,7 @@ License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
10601060

10611061
--------------------------------------------------------------------------------
10621062

1063-
Group: io.projectreactor Name: reactor-core Version: 3.7.6
1063+
Group: io.projectreactor Name: reactor-core Version: 3.7.7
10641064
Project URL: https://github.com/reactor/reactor-core
10651065
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
10661066

@@ -1806,3 +1806,43 @@ Project URL: https://github.com/awslabs/aws-eventstream-java
18061806
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
18071807

18081808
--------------------------------------------------------------------------------
1809+
1810+
Group: org.hamcrest Name: hamcrest Version: 2.2
1811+
Project URL: https://github.com/hamcrest/JavaHamcrest
1812+
License: BSD 3-Clause
1813+
| BSD 3-Clause License
1814+
|
1815+
| Copyright (c) 2000-2024, www.hamcrest.org
1816+
|
1817+
| Redistribution and use in source and binary forms, with or without
1818+
| modification, are permitted provided that the following conditions are met:
1819+
|
1820+
| 1. Redistributions of source code must retain the above copyright notice, this
1821+
| list of conditions and the following disclaimer.
1822+
|
1823+
| 2. Redistributions in binary form must reproduce the above copyright notice,
1824+
| this list of conditions and the following disclaimer in the documentation
1825+
| and/or other materials provided with the distribution.
1826+
|
1827+
| 3. Neither the name of the copyright holder nor the names of its
1828+
| contributors may be used to endorse or promote products derived from
1829+
| this software without specific prior written permission.
1830+
|
1831+
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1832+
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1833+
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1834+
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
1835+
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1836+
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
1837+
| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1838+
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
1839+
| OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1840+
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1841+
1842+
--------------------------------------------------------------------------------
1843+
1844+
Group: org.awaitility Name: awaitility Version: 4.3.0
1845+
Project URL: https://github.com/awaitility/awaitility
1846+
License: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
1847+
1848+
--------------------------------------------------------------------------------

‎runtime/server/distribution/NOTICE‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ NOTICE:
141141

142142
--------------------------------------------------------------------------------
143143

144-
Group: io.micrometer Name: micrometer-commons Version: 1.15.1
145-
Group: io.micrometer Name: micrometer-core Version: 1.15.1
146-
Group: io.micrometer Name: micrometer-observation Version: 1.15.1
147-
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.15.1
144+
Group: io.micrometer Name: micrometer-commons Version: 1.14.6
145+
Group: io.micrometer Name: micrometer-core Version: 1.14.6
146+
Group: io.micrometer Name: micrometer-observation Version: 1.14.6
147+
Group: io.micrometer Name: micrometer-registry-prometheus-simpleclient Version: 1.14.6
148148

149149
NOTICE:
150150
| Micrometer

0 commit comments

Comments
 (0)