Skip to content

Commit dd7f371

Browse files
authored
Bumping to jackson 2.18.0, jline3 3.27.1, protobuf-java 3.25.5, asm 9.7.1 (#72)
* Bumping to jackson 2.18.0, jline3 3.27.1, protobuf-java 3.25.5, asm 9.7.1 * Updating github runners. * Splitting out Java 17 into a separate step.
1 parent 850d8c3 commit dd7f371

30 files changed

+1653
-1725
lines changed

.github/workflows/maven-macos.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will build a Java project with Maven
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
33

4-
name: OLCUT CI (macOS x86_64, Java SE 17, 21)
4+
name: OLCUT CI (macOS x86_64, Java SE 17, 21, 23)
55

66
on:
77
push:
@@ -15,13 +15,26 @@ jobs:
1515
strategy:
1616
matrix:
1717
# test against supported LTS versions and latest
18-
java: [ 17, 21 ]
18+
java: [ 21, 23 ]
1919
name: OLCUT - macOS Java SE ${{ matrix.java }}
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Setup Java Development Kits built by Oracle
23-
uses: oracle-actions/setup-java@v1.3.2
23+
uses: oracle-actions/setup-java@v1.4.0
2424
with:
2525
release: ${{ matrix.java }}
2626
- name: Build with Maven
2727
run: mvn -B package --file pom.xml
28+
build-17:
29+
runs-on: macos-latest
30+
name: OLCUT - macOS Java SE 17
31+
steps:
32+
- uses: actions/checkout@v4
33+
- name: Setup Oracle Java SE
34+
uses: oracle-actions/setup-java@v1.4.0
35+
with:
36+
website: oracle.com
37+
release: 17
38+
version: 17.0.12
39+
- name: Build with Java 17
40+
run: mvn -B package --file pom.xml

.github/workflows/maven-ubuntu.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will build a Java project with Maven
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
33

4-
name: OLCUT CI (Ubuntu x86_64, Java SE 17, 21)
4+
name: OLCUT CI (Ubuntu x86_64, Java SE 17, 21, 23)
55

66
on:
77
push:
@@ -15,13 +15,26 @@ jobs:
1515
strategy:
1616
matrix:
1717
# test against supported LTS versions and latest
18-
java: [ 17, 21 ]
18+
java: [ 21, 23 ]
1919
name: OLCUT - Ubuntu Java SE ${{ matrix.java }}
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Setup Java Development Kits built by Oracle
23-
uses: oracle-actions/setup-java@v1.3.2
23+
uses: oracle-actions/setup-java@v1.4.0
2424
with:
2525
release: ${{ matrix.java }}
2626
- name: Build with Maven
2727
run: mvn -B package --file pom.xml
28+
build-17:
29+
runs-on: ubuntu-latest
30+
name: OLCUT - Ubuntu Java SE 17
31+
steps:
32+
- uses: actions/checkout@v4
33+
- name: Setup Oracle Java SE
34+
uses: oracle-actions/setup-java@v1.4.0
35+
with:
36+
website: oracle.com
37+
release: 17
38+
version: 17.0.12
39+
- name: Build with Java 17
40+
run: mvn -B package --file pom.xml

.github/workflows/maven-windows.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will build a Java project with Maven
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
33

4-
name: OLCUT CI (Windows x86_64, Java SE 17, 21)
4+
name: OLCUT CI (Windows x86_64, Java SE 17, 21, 23)
55

66
on:
77
push:
@@ -15,13 +15,26 @@ jobs:
1515
strategy:
1616
matrix:
1717
# test against supported LTS versions and latest
18-
java: [ 17, 21 ]
18+
java: [ 21, 23 ]
1919
name: OLCUT - Windows Java SE ${{ matrix.java }}
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Setup Java Development Kits built by Oracle
23-
uses: oracle-actions/setup-java@v1.3.2
23+
uses: oracle-actions/setup-java@v1.4.0
2424
with:
2525
release: ${{ matrix.java }}
2626
- name: Build with Maven
2727
run: mvn -B package --file pom.xml
28+
build-17:
29+
runs-on: windows-latest
30+
name: OLCUT - Windows Java SE 17
31+
steps:
32+
- uses: actions/checkout@v4
33+
- name: Setup Oracle Java SE
34+
uses: oracle-actions/setup-java@v1.4.0
35+
with:
36+
website: oracle.com
37+
release: 17
38+
version: 17.0.12
39+
- name: Build with Java 17
40+
run: mvn -B package --file pom.xml

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,14 @@ SubprocessConnection | Provides a simple mechanism for communicating over stdio
234234

235235
This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
236236

237+
## Development
238+
239+
To regenerate the protobuf implementations use the following command:
240+
241+
```shell
242+
protoc --java_out=olcut-config-protobuf/src/main/java/ --proto_path=olcut-config-protobuf/src/main/resources/ olcut-config-protobuf/src/main/resources/olcut_proto.proto
243+
```
244+
237245
## Security
238246

239247
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process

THIRD_PARTY_LICENSES.txt

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
jline 3.22.0
1+
jline 3.27.1
22

3-
Copyright (c) 2002-2018, the original author or authors.
3+
Copyright (c) 2002-2023, the original author or authors.
44
All rights reserved.
55

66
https://opensource.org/licenses/BSD-3-Clause
@@ -35,7 +35,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
3535
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
3636
OF THE POSSIBILITY OF SUCH DAMAGE.
3737

38-
jackson-core, jackson-databind 2.14.1, 2.14.1
38+
jackson-core, jackson-databind 2.18.0, 2.18.0
3939

4040

4141
Apache License
@@ -240,9 +240,42 @@ jackson-core, jackson-databind 2.14.1, 2.14.1
240240
See the License for the specific language governing permissions and
241241
limitations under the License.
242242

243-
junit 5.9.2
243+
# Jackson JSON processor
244244

245-
Copyright 2015-2021 the original author or authors.
245+
Jackson is a high-performance, Free/Open Source JSON processing library.
246+
It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
247+
been in development since 2007.
248+
It is currently developed by a community of developers.
249+
250+
## Copyright
251+
252+
Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
253+
254+
## Licensing
255+
256+
Jackson 2.x core and extension components are licensed under Apache License 2.0
257+
To find the details that apply to this artifact see the accompanying LICENSE file.
258+
259+
## Credits
260+
261+
A list of contributors may be found from CREDITS(-2.x) file, which is included
262+
in some artifacts (usually source distributions); but is always available
263+
from the source code management (SCM) system project uses.
264+
265+
## FastDoubleParser
266+
267+
jackson-core bundles a shaded copy of FastDoubleParser <https://github.com/wrandelshofer/FastDoubleParser>.
268+
That code is available under an MIT license <https://github.com/wrandelshofer/FastDoubleParser/blob/main/LICENSE>
269+
under the following copyright.
270+
271+
Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.
272+
273+
See FastDoubleParser-NOTICE for details of other source code included in FastDoubleParser
274+
and the licenses and copyrights that apply to that code.
275+
276+
junit 5.11.3
277+
278+
Copyright 2015-2024 the original author or authors.
246279

247280
Eclipse Public License - v 2.0
248281
==============================
@@ -576,8 +609,9 @@ this Agreement will bring a legal action under this Agreement more than
576609
one year after the cause of action arose. Each party waives its rights to
577610
a jury trial in any resulting litigation.
578611

579-
protobuf-java 3.19.6
612+
protobuf-java 3.25.5
580613

614+
Copyright 2024 Google LLC. All rights reserved.
581615
Copyright 2008 Google Inc. All rights reserved.
582616

583617
Redistribution and use in source and binary forms, with or without
@@ -610,3 +644,33 @@ Code generated by the Protocol Buffer compiler is owned by the owner
610644
of the input file used when generating it. This code is not
611645
standalone and requires a support library to be linked with it. This
612646
support library is itself covered by the above license.
647+
648+
asm 9.7.1
649+
650+
ASM: a very small and fast Java bytecode manipulation framework
651+
Copyright (c) 2000-2011 INRIA, France Telecom
652+
All rights reserved.
653+
654+
Redistribution and use in source and binary forms, with or without
655+
modification, are permitted provided that the following conditions
656+
are met:
657+
1. Redistributions of source code must retain the above copyright
658+
notice, this list of conditions and the following disclaimer.
659+
2. Redistributions in binary form must reproduce the above copyright
660+
notice, this list of conditions and the following disclaimer in the
661+
documentation and/or other materials provided with the distribution.
662+
3. Neither the name of the copyright holders nor the names of its
663+
contributors may be used to endorse or promote products derived from
664+
this software without specific prior written permission.
665+
666+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
667+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
668+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
669+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
670+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
671+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
672+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
673+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
674+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
675+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
676+
THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)