Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into add-oic-auth-e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
jtnord committed Sep 5, 2024
2 parents 3cc8be3 + 93f5d22 commit 818619a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<spotbugs.skip>true</spotbugs.skip>
<jenkins.version>2.474</jenkins.version>
<jenkins.version>2.475</jenkins.version>
<selenium.version>4.24.0</selenium.version>
<guava.version>33.3.0-jre</guava.version> <!-- aligned with selenium -->
<maven.version>3.8.1</maven.version>
Expand Down Expand Up @@ -351,7 +351,7 @@
<!-- upper bounds conflict -->
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.112.Final</version>
<version>4.1.113.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/ath-container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN install -m 0755 -d /etc/apt/keyrings \

# Docker installation according to https://docs.docker.com/engine/install/ubuntu/
ARG DOCKER_BUILDX_VERSION=0.16.2
ARG DOCKER_VERSION=27.1.2
ARG DOCKER_VERSION=27.2.0
RUN install -m 0755 -d /etc/apt/keyrings \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \
&& printf 'deb [arch=%s signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu %s stable\n' "$(dpkg --print-architecture)" "$(lsb_release -cs)" > /etc/apt/sources.list.d/docker.list \
Expand Down

0 comments on commit 818619a

Please sign in to comment.