Skip to content

Commit 5d1ab8d

Browse files
committed
Merge branch 'develop'
2 parents 974d2c8 + 954f677 commit 5d1ab8d

File tree

6 files changed

+19
-18
lines changed

6 files changed

+19
-18
lines changed

.github/workflows/maven-macos.yml

Lines changed: 2 additions & 2 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, OpenJDK 8, 11, latest)
4+
name: OLCUT CI (macOS x86_64, OpenJDK 8, 11, 17)
55

66
on:
77
push:
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
# test against supported LTS versions and latest
18-
java: [ 8, 11, 16 ]
18+
java: [ 8, 11, 17 ]
1919
name: OLCUT - macOS OpenJDK ${{ matrix.java }}
2020
steps:
2121
- uses: actions/checkout@v2

.github/workflows/maven-ubuntu.yml

Lines changed: 2 additions & 2 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, OpenJDK 8, 11, latest)
4+
name: OLCUT CI (Ubuntu x86_64, OpenJDK 8, 11, 17)
55

66
on:
77
push:
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
# test against supported LTS versions and latest
18-
java: [ 8, 11, 16 ]
18+
java: [ 8, 11, 17 ]
1919
name: OLCUT - Ubuntu OpenJDK ${{ matrix.java }}
2020
steps:
2121
- uses: actions/checkout@v2

.github/workflows/maven-windows.yml

Lines changed: 2 additions & 2 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, OpenJDK 8, 11, latest)
4+
name: OLCUT CI (Windows x86_64, OpenJDK 8, 11, 17)
55

66
on:
77
push:
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
# test against supported LTS versions and latest
18-
java: [ 8, 11, 16 ]
18+
java: [ 8, 11, 17 ]
1919
name: OLCUT - Windows OpenJDK ${{ matrix.java }}
2020
steps:
2121
- uses: actions/checkout@v2

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ Maven:
2323
<dependency>
2424
<groupId>com.oracle.labs.olcut</groupId>
2525
<artifactId>olcut-core</artifactId>
26-
<version>5.2.0</version>
26+
<version>5.2.1</version>
2727
</dependency>
2828
```
2929
or from Gradle:
3030
```groovy
31-
implementation 'com.oracle.labs.olcut:olcut-core:5.2.0'
31+
implementation 'com.oracle.labs.olcut:olcut-core:5.2.1'
3232
```
3333

3434
The `olcut-extras` artifact is designed as a small tool for developers, as such you should compile the appropriate

THIRD_PARTY_LICENSES.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
jline 3.20.0
1+
jline 3.21.0
22

33
Copyright (c) 2002-2018, the original author or authors.
44
All rights reserved.
@@ -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.12.5
38+
jackson-core, jackson-databind 2.13.2, 2.13.2.2
3939

4040

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

243-
junit 5.7.1
243+
junit 5.8.2
244244

245245
Copyright 2015-2021 the original author or authors.
246246

@@ -576,7 +576,7 @@ this Agreement will bring a legal action under this Agreement more than
576576
one year after the cause of action arose. Each party waives its rights to
577577
a jury trial in any resulting litigation.
578578

579-
protobuf-java 3.17.3
579+
protobuf-java 3.19.4
580580

581581
Copyright 2008 Google Inc. All rights reserved.
582582

pom.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@
3535
<version>${revision}</version>
3636
<packaging>pom</packaging>
3737
<properties>
38-
<revision>5.2.0</revision>
38+
<revision>5.2.1</revision>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4040
<maven.compiler.source>1.8</maven.compiler.source>
4141
<maven.compiler.target>1.8</maven.compiler.target>
4242
<edn.version>0.7.1</edn.version>
43-
<jackson.version>2.12.5</jackson.version>
44-
<jline.version>3.20.0</jline.version>
45-
<junit.version>5.7.1</junit.version>
46-
<protobuf.version>3.17.3</protobuf.version>
43+
<jackson.version>2.13.2</jackson.version>
44+
<jackson.databind.version>2.13.2.2</jackson.databind.version>
45+
<jline.version>3.21.0</jline.version>
46+
<junit.version>5.8.2</junit.version>
47+
<protobuf.version>3.19.4</protobuf.version>
4748
</properties>
4849
<modules>
4950
<module>olcut-core</module>
@@ -144,7 +145,7 @@
144145
<dependency>
145146
<groupId>com.fasterxml.jackson.core</groupId>
146147
<artifactId>jackson-databind</artifactId>
147-
<version>${jackson.version}</version>
148+
<version>${jackson.databind.version}</version>
148149
</dependency>
149150
<dependency>
150151
<groupId>us.bpsm</groupId>

0 commit comments

Comments
 (0)