Skip to content

Commit

Permalink
Update Quarkus to 3.4.3 which fixes #221
Browse files Browse the repository at this point in the history
  • Loading branch information
SailReal committed Oct 19, 2023
1 parent 6e52c95 commit 00bd3aa
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 27 deletions.
2 changes: 1 addition & 1 deletion backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<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>3.2.6.Final</quarkus.platform.version>
<quarkus.platform.version>3.4.3</quarkus.platform.version>
<quarkus.jib.base-jvm-image>eclipse-temurin:17-jre</quarkus.jib.base-jvm-image> <!-- irrelevant for -Pnative -->
<jwt.version>4.4.0</jwt.version>
<surefire-plugin.version>3.1.2</surefire-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.annotation.security.RolesAllowed;
import jakarta.inject.Inject;
import jakarta.ws.rs.BadRequestException;
Expand Down Expand Up @@ -37,7 +36,6 @@
import java.util.UUID;

@Path("/auditlog")
@RegisterForReflection(targets = {UUID[].class})
public class AuditLogResource {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.auth0.jwt.algorithms.Algorithm;
import com.auth0.jwt.exceptions.JWTVerificationException;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.quarkus.runtime.annotations.RegisterForReflection;
import io.quarkus.security.identity.SecurityIdentity;
import jakarta.annotation.Nullable;
import jakarta.annotation.security.RolesAllowed;
Expand Down Expand Up @@ -71,7 +70,6 @@
import java.util.stream.Stream;

@Path("/vaults")
@RegisterForReflection(targets = {UUID[].class})
public class VaultResource {

@Inject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.cryptomator.hub.entities;

import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
Expand All @@ -19,7 +18,6 @@

@Entity
@Table(name = "access_token")
@RegisterForReflection(targets = {UUID[].class})
public class AccessToken extends PanacheEntityBase {

@EmbeddedId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -13,7 +12,6 @@
@Entity
@Table(name = "audit_event_vault_access_grant")
@DiscriminatorValue(AuditEventVaultAccessGrant.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultAccessGrant extends AuditEvent {

public static final String TYPE = "VAULT_ACCESS_GRANT";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -13,7 +12,6 @@
@Entity
@Table(name = "audit_event_vault_create")
@DiscriminatorValue(AuditEventVaultCreate.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultCreate extends AuditEvent {

public static final String TYPE = "VAULT_CREATE";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -15,7 +14,6 @@
@Entity
@Table(name = "audit_event_vault_key_retrieve")
@DiscriminatorValue(AuditEventVaultKeyRetrieve.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultKeyRetrieve extends AuditEvent {

public static final String TYPE = "VAULT_KEY_RETRIEVE";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -15,7 +14,6 @@
@Entity
@Table(name = "audit_event_vault_member_add")
@DiscriminatorValue(AuditEventVaultMemberAdd.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultMemberAdd extends AuditEvent {

public static final String TYPE = "VAULT_MEMBER_ADD";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -13,7 +12,6 @@
@Entity
@Table(name = "audit_event_vault_member_remove")
@DiscriminatorValue(AuditEventVaultMemberRemove.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultMemberRemove extends AuditEvent {

public static final String TYPE = "VAULT_MEMBER_REMOVE";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -15,7 +14,6 @@
@Entity
@Table(name = "audit_event_vault_member_update")
@DiscriminatorValue(AuditEventVaultMemberUpdate.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultMemberUpdate extends AuditEvent {

public static final String TYPE = "VAULT_MEMBER_UPDATE";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -13,7 +12,6 @@
@Entity
@Table(name = "audit_event_vault_ownership_claim")
@DiscriminatorValue(AuditEventVaultOwnershipClaim.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultOwnershipClaim extends AuditEvent {

public static final String TYPE = "VAULT_OWNERSHIP_CLAIM";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.cryptomator.hub.entities;

import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
Expand All @@ -13,7 +12,6 @@
@Entity
@Table(name = "audit_event_vault_update")
@DiscriminatorValue(AuditEventVaultUpdate.TYPE)
@RegisterForReflection(targets = {UUID[].class})
public class AuditEventVaultUpdate extends AuditEvent {

public static final String TYPE = "VAULT_UPDATE";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
import io.quarkus.panache.common.Parameters;
import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.EmbeddedId;
Expand Down Expand Up @@ -47,7 +46,6 @@ SELECT count(DISTINCT u)
FROM EffectiveVaultAccess eva
WHERE eva.id.vaultId = :vaultId AND eva.id.authorityId = :authorityId
""")
@RegisterForReflection(targets = {UUID[].class})
public class EffectiveVaultAccess extends PanacheEntityBase {

@EmbeddedId
Expand Down
2 changes: 0 additions & 2 deletions backend/src/main/java/org/cryptomator/hub/entities/Vault.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
import io.quarkus.panache.common.Parameters;
import io.quarkus.runtime.annotations.RegisterForReflection;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
Expand Down Expand Up @@ -54,7 +53,6 @@
WHERE v.id IN :ids
"""
)
@RegisterForReflection(targets = {UUID[].class})
public class Vault extends PanacheEntityBase {

@Id
Expand Down

0 comments on commit 00bd3aa

Please sign in to comment.