Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
SailReal committed Jan 16, 2023
2 parents 2e090a5 + c0e90e7 commit b6944e9
Show file tree
Hide file tree
Showing 5 changed files with 628 additions and 596 deletions.
6 changes: 3 additions & 3 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>hub-backend</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>

<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
Expand All @@ -13,10 +13,10 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.container-image.group>cryptomator</quarkus.container-image.group>
<quarkus.container-image.name>hub</quarkus.container-image.name>
<quarkus.platform.version>2.15.0.Final</quarkus.platform.version>
<quarkus.platform.version>2.15.3.Final</quarkus.platform.version>
<quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-mandrel:22.3-java17</quarkus.native.builder-image>
<quarkus.jib.base-jvm-image>eclipse-temurin:17-jre</quarkus.jib.base-jvm-image> <!-- irrelevant for -Pnative -->
<jwt.version>4.2.1</jwt.version>
<jwt.version>4.2.2</jwt.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ hub.keycloak.oidc.cryptomator-client-id=cryptomator
%dev.quarkus.keycloak.devservices.realm-name=cryptomator
%dev.quarkus.keycloak.devservices.port=8180
%dev.quarkus.keycloak.devservices.service-name=quarkus-cryptomator-hub
%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:20.0.2
%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:20.0.3
%dev.quarkus.oidc.devui.grant.type=code
# OIDC will be mocked during unit tests. Use fake auth url to prevent dev services to start:
%test.quarkus.oidc.auth-server-url=http://localhost:43210/dev/null
Expand Down
Loading

0 comments on commit b6944e9

Please sign in to comment.