Skip to content

Commit

Permalink
Bumping to jackson 2.18.0, jline3 3.27.1, protobuf-java 3.25.5, asm 9…
Browse files Browse the repository at this point in the history
….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.
  • Loading branch information
Craigacp authored Oct 25, 2024
1 parent 850d8c3 commit dd7f371
Show file tree
Hide file tree
Showing 30 changed files with 1,653 additions and 1,725 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/maven-macos.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: OLCUT CI (macOS x86_64, Java SE 17, 21)
name: OLCUT CI (macOS x86_64, Java SE 17, 21, 23)

on:
push:
Expand All @@ -15,13 +15,26 @@ jobs:
strategy:
matrix:
# test against supported LTS versions and latest
java: [ 17, 21 ]
java: [ 21, 23 ]
name: OLCUT - macOS Java SE ${{ matrix.java }}
steps:
- uses: actions/checkout@v4
- name: Setup Java Development Kits built by Oracle
uses: oracle-actions/setup-java@v1.3.2
uses: oracle-actions/setup-java@v1.4.0
with:
release: ${{ matrix.java }}
- name: Build with Maven
run: mvn -B package --file pom.xml
build-17:
runs-on: macos-latest
name: OLCUT - macOS Java SE 17
steps:
- uses: actions/checkout@v4
- name: Setup Oracle Java SE
uses: oracle-actions/[email protected]
with:
website: oracle.com
release: 17
version: 17.0.12
- name: Build with Java 17
run: mvn -B package --file pom.xml
19 changes: 16 additions & 3 deletions .github/workflows/maven-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: OLCUT CI (Ubuntu x86_64, Java SE 17, 21)
name: OLCUT CI (Ubuntu x86_64, Java SE 17, 21, 23)

on:
push:
Expand All @@ -15,13 +15,26 @@ jobs:
strategy:
matrix:
# test against supported LTS versions and latest
java: [ 17, 21 ]
java: [ 21, 23 ]
name: OLCUT - Ubuntu Java SE ${{ matrix.java }}
steps:
- uses: actions/checkout@v4
- name: Setup Java Development Kits built by Oracle
uses: oracle-actions/setup-java@v1.3.2
uses: oracle-actions/setup-java@v1.4.0
with:
release: ${{ matrix.java }}
- name: Build with Maven
run: mvn -B package --file pom.xml
build-17:
runs-on: ubuntu-latest
name: OLCUT - Ubuntu Java SE 17
steps:
- uses: actions/checkout@v4
- name: Setup Oracle Java SE
uses: oracle-actions/[email protected]
with:
website: oracle.com
release: 17
version: 17.0.12
- name: Build with Java 17
run: mvn -B package --file pom.xml
19 changes: 16 additions & 3 deletions .github/workflows/maven-windows.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: OLCUT CI (Windows x86_64, Java SE 17, 21)
name: OLCUT CI (Windows x86_64, Java SE 17, 21, 23)

on:
push:
Expand All @@ -15,13 +15,26 @@ jobs:
strategy:
matrix:
# test against supported LTS versions and latest
java: [ 17, 21 ]
java: [ 21, 23 ]
name: OLCUT - Windows Java SE ${{ matrix.java }}
steps:
- uses: actions/checkout@v4
- name: Setup Java Development Kits built by Oracle
uses: oracle-actions/setup-java@v1.3.2
uses: oracle-actions/setup-java@v1.4.0
with:
release: ${{ matrix.java }}
- name: Build with Maven
run: mvn -B package --file pom.xml
build-17:
runs-on: windows-latest
name: OLCUT - Windows Java SE 17
steps:
- uses: actions/checkout@v4
- name: Setup Oracle Java SE
uses: oracle-actions/[email protected]
with:
website: oracle.com
release: 17
version: 17.0.12
- name: Build with Java 17
run: mvn -B package --file pom.xml
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,14 @@ SubprocessConnection | Provides a simple mechanism for communicating over stdio

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

## Development

To regenerate the protobuf implementations use the following command:

```shell
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
```

## Security

Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
Expand Down
76 changes: 70 additions & 6 deletions THIRD_PARTY_LICENSES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
jline 3.22.0
jline 3.27.1

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

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

jackson-core, jackson-databind 2.14.1, 2.14.1
jackson-core, jackson-databind 2.18.0, 2.18.0


Apache License
Expand Down Expand Up @@ -240,9 +240,42 @@ jackson-core, jackson-databind 2.14.1, 2.14.1
See the License for the specific language governing permissions and
limitations under the License.

junit 5.9.2
# Jackson JSON processor

Copyright 2015-2021 the original author or authors.
Jackson is a high-performance, Free/Open Source JSON processing library.
It was originally written by Tatu Saloranta ([email protected]), and has
been in development since 2007.
It is currently developed by a community of developers.

## Copyright

Copyright 2007-, Tatu Saloranta ([email protected])

## Licensing

Jackson 2.x core and extension components are licensed under Apache License 2.0
To find the details that apply to this artifact see the accompanying LICENSE file.

## Credits

A list of contributors may be found from CREDITS(-2.x) file, which is included
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.

## FastDoubleParser

jackson-core bundles a shaded copy of FastDoubleParser <https://github.com/wrandelshofer/FastDoubleParser>.
That code is available under an MIT license <https://github.com/wrandelshofer/FastDoubleParser/blob/main/LICENSE>
under the following copyright.

Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.

See FastDoubleParser-NOTICE for details of other source code included in FastDoubleParser
and the licenses and copyrights that apply to that code.

junit 5.11.3

Copyright 2015-2024 the original author or authors.

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

protobuf-java 3.19.6
protobuf-java 3.25.5

Copyright 2024 Google LLC. All rights reserved.
Copyright 2008 Google Inc. All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -610,3 +644,33 @@ Code generated by the Protocol Buffer compiler is owned by the owner
of the input file used when generating it. This code is not
standalone and requires a support library to be linked with it. This
support library is itself covered by the above license.

asm 9.7.1

ASM: a very small and fast Java bytecode manipulation framework
Copyright (c) 2000-2011 INRIA, France Telecom
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holders nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit dd7f371

Please sign in to comment.