Skip to content

Commit bcaa231

Browse files
authored
Merge branch 'main' into error_improvements
2 parents 5ac1fb1 + 57cf791 commit bcaa231

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.github/workflows/ci-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
repository: ${{ github.event.pull_request.head.repo.full_name }}
2020

2121
- name: Restore dependency cache
22-
uses: actions/cache@v3.3.2
22+
uses: actions/cache@v4.0.0
2323
with:
2424
path: ~/.m2/repository
2525
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2626
restore-keys: |
2727
${{ runner.os }}-maven-
2828
2929
- name: Set up Java
30-
uses: actions/setup-java@v3
30+
uses: actions/setup-java@v4
3131
with:
3232
distribution: 'adopt'
3333
java-version: '17'

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: Set up Java
21-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v4
2222
with:
2323
distribution: 'adopt'
2424
java-version: '17'
2525

2626
# Initializes the CodeQL tools for scanning.
2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@v2
28+
uses: github/codeql-action/init@v3
2929
with:
3030
languages: javascript, java
3131

3232
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3333
# If this step fails, then you should remove it and run the build manually (see below)
3434
- name: Autobuild
35-
uses: github/codeql-action/autobuild@v2
35+
uses: github/codeql-action/autobuild@v3
3636

3737
# ℹ️ Command-line programs to run using the OS shell.
3838
# 📚 https://git.io/JvXDl
@@ -46,4 +46,4 @@ jobs:
4646
# make release
4747

4848
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@v2
49+
uses: github/codeql-action/analyze@v3

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3-eclipse-temurin-17-alpine AS build-licensee
1+
FROM docker.io/library/maven:3-eclipse-temurin-17-alpine AS build-licensee
22

33
RUN apk add --update \
44
alpine-sdk \
@@ -10,7 +10,7 @@ RUN apk add --update \
1010
RUN gem install licensee
1111

1212

13-
FROM maven:3-eclipse-temurin-17-alpine
13+
FROM docker.io/library/maven:3-eclipse-temurin-17-alpine
1414
MAINTAINER Stian Soiland-Reyes <[email protected]>
1515

1616
# Build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md
@@ -29,8 +29,8 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
2929
RUN apk add --update \
3030
graphviz \
3131
ttf-freefont \
32-
py3-pip \
3332
gcc \
33+
pipx \
3434
python3-dev \
3535
libc-dev \
3636
nodejs \
@@ -43,9 +43,9 @@ RUN apk add --update \
4343
heimdal \
4444
&& rm -rf /var/cache/apk/*
4545

46-
#wheel needed by ruamel.yaml for some reason
47-
RUN pip3 install -U wheel setuptools pip
48-
RUN pip3 install cwltool
46+
ENV PATH="/root/.local/bin:${PATH}"
47+
48+
RUN pipx install cwltool
4949

5050
RUN cwltool --version
5151

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-starter-parent</artifactId>
18-
<version>2.6.7</version>
18+
<version>2.7.18</version>
1919
<relativePath/>
2020
</parent>
2121

@@ -26,7 +26,7 @@
2626
<jena.version>4.10.0</jena.version>
2727
<!-- BEGIN should correspond to https://repo1.maven.org/maven2/org/apache/jena/jena/3.9.0/jena-3.9.0.pom -->
2828
<ver.jsonldjava>0.13.6</ver.jsonldjava>
29-
<ver.jackson>2.16.0</ver.jackson>
29+
<ver.jackson>2.16.1</ver.jackson>
3030
<!-- END -->
3131
<log4j2.version>2.17.0</log4j2.version>
3232
</properties>
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>org.liquibase</groupId>
8686
<artifactId>liquibase-core</artifactId>
87-
<version>4.25.0</version>
87+
<version>4.25.1</version>
8888
</dependency>
8989
<!-- Postgres -->
9090
<dependency>
@@ -149,7 +149,7 @@
149149
<dependency>
150150
<groupId>commons-io</groupId>
151151
<artifactId>commons-io</artifactId>
152-
<version>2.15.0</version>
152+
<version>2.15.1</version>
153153
</dependency>
154154
<!-- For JSR-303, javax.validation -->
155155
<dependency>
@@ -171,13 +171,13 @@
171171
<dependency>
172172
<groupId>org.testcontainers</groupId>
173173
<artifactId>junit-jupiter</artifactId>
174-
<version>1.19.2</version>
174+
<version>1.19.3</version>
175175
<scope>test</scope>
176176
</dependency>
177177
<dependency>
178178
<groupId>org.testcontainers</groupId>
179179
<artifactId>postgresql</artifactId>
180-
<version>1.19.2</version>
180+
<version>1.19.4</version>
181181
<scope>test</scope>
182182
</dependency>
183183
<!-- We use mockito-inline as it supports mocking static methods -->
@@ -223,7 +223,7 @@
223223
<plugin>
224224
<groupId>com.spotify.fmt</groupId>
225225
<artifactId>fmt-maven-plugin</artifactId>
226-
<version>2.21.1</version>
226+
<version>2.22.1</version>
227227
<executions>
228228
<execution>
229229
<goals>

0 commit comments

Comments
 (0)