Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions .github/workflows/actions.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# This file is machine-generated by `gh actions-lock`.
# Do not edit by hand; run `gh actions-lock` to update.
# Docs: https://gh.io/actions-lockfile
version: 'v0.0.3'
workflows:
'.github/workflows/dist-win.yml':
- 'actions/checkout@v7.0.1'
- 'actions/setup-java@v6.3.0'
- 'actions/upload-artifact@v7.0.2'
- 'stcarolas/setup-maven@v5.1'
- 'step-security/harden-runner@v2.23.0'
'.github/workflows/maven.yml':
- 'actions/cache@v6.1.0'
- 'actions/checkout@v7.0.1'
- 'actions/setup-java@v6.3.0'
- 'actions/upload-artifact@v7.0.2'
- 'mikepenz/action-junit-report@v6.7.1'
- 'stcarolas/setup-maven@v5.1'
- 'step-security/harden-runner@v2.23.0'
'.github/workflows/verify-lockfile.yml':
- 'actions/checkout@v7.0.1'
- 'step-security/harden-runner@v2.23.0'
dependencies:
'actions/cache@v6.1.0':
ref: 'v6.1.0'
commit: 'sha1-55cc8345863c7cc4c66a329aec7e433d2d1c52a9'
owner_id: 44036562
repo_id: 215566462
'actions/checkout@v7.0.1':
ref: 'v7.0.1'
commit: 'sha1-3d3c42e5aac5ba805825da76410c181273ba90b1'
owner_id: 44036562
repo_id: 197814629
'actions/setup-java@v6.3.0':
ref: 'v6.3.0'
commit: 'sha1-d1374f8ac74474200d16ef8ecee22c7ae7a51880'
owner_id: 44036562
repo_id: 196057608
'actions/upload-artifact@v7.0.2':
ref: 'v7.0.2'
commit: 'sha1-cf430e030ddbb5b0abf93d22962f4752f3646cd9'
owner_id: 44036562
repo_id: 192625955
'mikepenz/action-junit-report@v6.7.1':
ref: 'v6.7.1'
commit: 'sha1-a16be3a69023e9bd7e748ede768b3282ea7b30ce'
owner_id: 1476232
repo_id: 330384746
'stcarolas/setup-maven@v5.1':
ref: 'v5.1'
commit: 'sha1-12eb41b233df95d49b0c11fc1b5bc8312e5d4ce0'
owner_id: 2007081
repo_id: 226509858
'step-security/harden-runner@v2.23.0':
ref: 'v2.23.0'
commit: 'sha1-aebdcf6156ab6691adf63218240e476564a1ed4c'
owner_id: 88700172
repo_id: 422287306
10 changes: 5 additions & 5 deletions .github/workflows/dist-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
uses: step-security/harden-runner@v2.23.0
with:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@v7.0.1
with:
ref: ${{ inputs.ref || github.ref }}

- name: Set up JDK 25 (x64)
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
uses: actions/setup-java@v6.3.0
with:
java-version: 25
distribution: 'temurin'
architecture: x64
cache: maven

- name: Set up Maven
uses: stCarolas/setup-maven@12eb41b233df95d49b0c11fc1b5bc8312e5d4ce0 # v5.1
uses: stCarolas/setup-maven@v5.1
with:
maven-version: 3.9.16

Expand All @@ -62,7 +62,7 @@ jobs:
clean package

- name: Upload MSI artifact
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
uses: actions/upload-artifact@v7.0.2
with:
name: inception-msi-x86_64
path: inception/inception-dist-win/target/jpackage-x86_64/*.msi
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
uses: step-security/harden-runner@v2.23.0
with:
# egress-policy: audit
egress-policy: block
Expand Down Expand Up @@ -117,10 +117,10 @@ jobs:
echo "::endgroup::"

- name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@v7.0.1

- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
uses: actions/setup-java@v6.3.0
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
Expand All @@ -130,28 +130,28 @@ jobs:
server-password: MAVEN_PASSWORD

- name: Set up Maven
uses: stCarolas/setup-maven@12eb41b233df95d49b0c11fc1b5bc8312e5d4ce0 # v5.1
uses: stCarolas/setup-maven@v5.1
with:
maven-version: 3.9.16

# - name: Cache Docker layers
# uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 #v5.0.4
# uses: actions/cache@v6.1.0
# with:
# path: /var/lib/docker
# key: docker-cache-${{ runner.os }}-${{ github.sha }}
# restore-keys: |
# docker-cache-${{ runner.os }}-

- name: Cache DKPro Core Dataset Cache
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 #v5.0.4
uses: actions/cache@v6.1.0
with:
path: inception/cache
key: dkpro-dataset-cache-${{ runner.os }}-${{ github.sha }}
restore-keys: |
dkpro-dataset-cache-${{ runner.os }}-

- name: Cache Node.js
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 #v5.0.4
uses: actions/cache@v6.1.0
with:
path: inception/nodejs
key: nodejs-cache-${{ runner.os }}-${{ github.sha }}
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
echo "::endgroup::"

- name: Publish Test Report
uses: mikepenz/action-junit-report@a16be3a69023e9bd7e748ede768b3282ea7b30ce # v6.7.1
uses: mikepenz/action-junit-report@v6.7.1
if: success() || failure() # always run even if the previous step fails
with:
check_name: |
Expand All @@ -199,21 +199,21 @@ jobs:

- name: Capture build artifacts
if: matrix.os == 'ubuntu-24.04-arm'
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
uses: actions/upload-artifact@v7.0.2
with:
name: build-artifacts
path: inception/inception-app-webapp/target/inception-app-webapp-*-standalone.jar

- name: Capture RAT reports
if: failure()
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
uses: actions/upload-artifact@v7.0.2
with:
name: rat-reports-${{ matrix.os }}
path: '**/target/rat.txt'
if-no-files-found: ignore

- name: Capture build timeline
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
uses: actions/upload-artifact@v7.0.2
with:
name: build-artifacts-${{ matrix.os }}
path: target/timeline/timeline.html
64 changes: 64 additions & 0 deletions .github/workflows/verify-lockfile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Fails when .github/workflows/actions.lock is out of sync with the workflows, when a workflow is
# not covered by the lockfile at all, or when a locked pin no longer verifies upstream.
#
# The runner itself only checks workflows that are already in the lockfile, and only when they run.
# This check also covers workflows that don't run on pull requests (dist-win.yml) and new workflows
# that were never locked, which would otherwise run on their mutable tags without any warning.
#
# After changing any "uses:", run "gh actions-lock" and commit the updated lockfile.
# See https://github.com/github/gh-actions-lock

name: Verify actions lockfile

on:
push:
branches: [ "main", "release/**" ]
paths: [ ".github/workflows/**" ]
pull_request:
branches: [ "main", "release/**" ]
paths: [ ".github/workflows/**" ]
workflow_dispatch:

permissions:
contents: read

jobs:
verify:
runs-on: ubuntu-latest

env:
GH_TOKEN: ${{ github.token }}

steps:
- name: Harden Runner
uses: step-security/harden-runner@v2.23.0
with:
egress-policy: block
disable-sudo: true
allowed-endpoints: >
api.github.com:443
github.com:443
objects.githubusercontent.com:443
release-assets.githubusercontent.com:443
hosted-compute-request-orchestrator-gccus02-01.githubapp.com:443
hosted-compute-request-orchestrator-prod-eus-01.githubapp.com:443
hosted-compute-request-orchestrator-prod-eus-02.githubapp.com:443
hosted-compute-request-orchestrator-prod-iad-01.githubapp.com:443
hosted-compute-watchdog-gccus02-01.githubapp.com:443
hosted-compute-watchdog-prod-eus-01.githubapp.com:443
hosted-compute-watchdog-prod-eus-02.githubapp.com:443
hosted-compute-watchdog-prod-iad-01.githubapp.com:443
hosted-compute-watchdog-prod-iad-02.githubapp.com:443

- uses: actions/checkout@v7.0.1
with:
persist-credentials: false

- name: Install gh-actions-lock
# Pinned by release tag, bumped by hand. A binary extension can't be pinned by commit, and
# the release is immutable on GitHub, so neither the tag nor its assets can be replaced.
# The actions above need no SHAs: actions.lock pins them like those of every workflow.
run: gh extension install github/gh-actions-lock --pin v0.4.1

- name: Verify lockfile
run: gh actions-lock --verify
2 changes: 1 addition & 1 deletion inception/inception-dist-docker/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
############################################################

FROM eclipse-temurin:25-jre-noble@sha256:a98128a57de944a72bd31fbc79b898edd5a5864d3652071d5bbd2160ab7d7dce
FROM eclipse-temurin:25-jre-noble@sha256:e3b6f7887a50f20d8f07abf279d8a81a5953fb398a9555bd9edd56b9bd15968c

LABEL maintainer="INCEpTION Team"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class GraphDbRepositoryTest
{
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

private static final String GRAPHDB_IMAGE = "ontotext/graphdb:11.5.2";
private static final String GRAPHDB_IMAGE = "ontotext/graphdb:11.5.3";
private static final int GRAPHDB_PORT = 7200;

@Container
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# the Azure OpenAI wire protocol that forwards to an Ollama backend. Built on-the-fly by
# Testcontainers (see OllamazureContainer); ollamazure is a pure-JS npm package, so this is a small,
# quick-to-build layer on top of a Node base image.
FROM node:20-alpine
FROM node:26-alpine

# Pin the version so test behavior is reproducible; bump deliberately.
RUN npm install -g ollamazure@1.4.1
Expand Down
32 changes: 16 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.dkpro</groupId>
<artifactId>dkpro-parent-pom</artifactId>
<version>35</version>
<version>38</version>
</parent>

<groupId>de.tudarmstadt.ukp.inception.app</groupId>
Expand Down Expand Up @@ -72,14 +72,14 @@

<properties>
<build-ant-version>1.10.18</build-ant-version>
<build-groovy-version>5.0.8</build-groovy-version>
<build-groovy-version>5.1.3</build-groovy-version>

<junit.version>6.1.3</junit.version>
<mockito.version>5.24.0</mockito.version>
<assertj.version>3.27.7</assertj.version>
<xmlunit.version>2.14.0</xmlunit.version>
<testcontainers.version>2.0.5</testcontainers.version>
<keycloak-admin-client.version>26.0.12</keycloak-admin-client.version>
<keycloak-admin-client.version>26.0.13</keycloak-admin-client.version>
<testcontainers-keycloak.version>4.4.0</testcontainers-keycloak.version>
<mock-oauth2-server.version>6.1.5</mock-oauth2-server.version>

Expand All @@ -92,28 +92,28 @@

<pdfbox.version>3.0.8</pdfbox.version>

<spring.version>7.0.9</spring.version>
<spring.version>7.0.10</spring.version>
<spring.boot.version>4.1.2</spring.boot.version>
<spring.data.version>4.1.2</spring.data.version>
<spring.security.version>7.1.1</spring.security.version>
<spring.security.version>7.1.2</spring.security.version>
<springdoc.version>3.1.1</springdoc.version>
<swagger.version>2.2.55</swagger.version>
<swagger.version>2.2.56</swagger.version>
<jjwt.version>0.13.0</jjwt.version>

<slf4j.version>2.0.20</slf4j.version>
<log4j2.version>2.26.1</log4j2.version>
<jboss.logging.version>3.6.3.Final</jboss.logging.version>
<sentry.version>8.58.0</sentry.version>

<tomcat.version>11.0.27</tomcat.version>
<jetty.version>12.1.13</jetty.version>
<tomcat.version>11.0.29</tomcat.version>
<jetty.version>12.1.15</jetty.version>
<servlet-api.version>6.1.0</servlet-api.version>

<mariadb.driver.version>3.5.11</mariadb.driver.version>
<mssql.driver.version>13.6.2.jre11</mssql.driver.version>
<mysql.driver.version>26.7.0</mysql.driver.version>
<postgres.driver.version>42.7.14</postgres.driver.version>
<hibernate.version>7.4.15.Final</hibernate.version>
<hibernate.version>7.4.16.Final</hibernate.version>
<hibernate.validator.version>9.1.6.Final</hibernate.validator.version>
<liquibase.version>4.33.0</liquibase.version>
<liquibase-slf4j.version>5.1.0</liquibase-slf4j.version>
Expand Down Expand Up @@ -144,10 +144,10 @@

<ant-version>1.10.18</ant-version>
<json.version>20240303</json.version>
<jackson.version>2.22.3</jackson.version>
<jackson3.version>3.2.3</jackson3.version>
<jackson.version>2.22.4</jackson.version>
<jackson3.version>3.2.4</jackson3.version>
<snakeyaml.version>2.7</snakeyaml.version>
<okhttp.version>5.5.0</okhttp.version>
<okhttp.version>5.5.1</okhttp.version>
<okio.version>3.18.2</okio.version>
<byte-buddy.version>1.18.17</byte-buddy.version>
<caffeine.version>3.3.1</caffeine.version>
Expand All @@ -170,7 +170,7 @@
<flexmark.version>0.64.8</flexmark.version>
<ivy.version>2.6.0</ivy.version>
<imageio-tiff-version>3.15.3</imageio-tiff-version>
<opennlp.version>2.5.12</opennlp.version>
<opennlp.version>2.5.13</opennlp.version>
<txtmark.version>0.13</txtmark.version>
<owasp-java-html-sanitizer.version>20260924.2</owasp-java-html-sanitizer.version>
<jinjava.version>2.8.5</jinjava.version>
Expand Down Expand Up @@ -230,7 +230,7 @@
<omtd-share-annotations.version>3.0.2.7</omtd-share-annotations.version>
<webstomp-client.version>1.2.6</webstomp-client.version>

<node.version>24.22.2</node.version>
<node.version>24.22.3</node.version>
<apache-annotator.version>^0.2.0</apache-annotator.version>
<bootstrap.version>^5.3.8</bootstrap.version>
<cross-env.version>^10.1.0</cross-env.version>
Expand Down Expand Up @@ -328,7 +328,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.25.1</version>
<version>2.25.2</version>
<configuration>
<rulesUri>file:${maven.multiModuleProjectDirectory}/inception/inception-build/src/main/resources/inception/rules.xml</rulesUri>
<!--
Expand Down Expand Up @@ -384,7 +384,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>3.10.4</version>
<version>3.11.0</version>
<inherited>true</inherited>
<configuration>
<java>
Expand Down
Loading