Skip to content

Commit

Permalink
upgrade versions to resolve problem with duplicated emails being sent
Browse files Browse the repository at this point in the history
  • Loading branch information
mswiderski committed Jun 21, 2023
1 parent bffa6d3 commit 59a506b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 25 deletions.
15 changes: 3 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.automatiko.tekton</groupId>
<artifactId>automatiko-approval-task</artifactId>
<version>0.7.1</version>
<version>0.8.0</version>

<name>Automatiko Tekton Approval Task</name>
<description>Tekton Approval task for pipelines based on Automatiko workflows</description>

<properties>
<quarkus.version>2.16.2.Final</quarkus.version>
<automatiko.version>0.23.0</automatiko.version>
<quarkus.version>3.1.0.Final</quarkus.version>
<automatiko.version>0.30.1</automatiko.version>
<surefire.version>2.22.1</surefire.version>
<compiler.version>3.8.1</compiler.version>

Expand Down Expand Up @@ -81,15 +81,6 @@
<artifactId>quarkus-smallrye-health</artifactId>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>

<!-- validation - optional -->
<!--
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
import java.util.List;
import java.util.Map;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -24,6 +21,8 @@
import io.automatiko.tekton.task.run.CustomRunStatus;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.dsl.Resource;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

@ApplicationScoped
public class ApprovalTaskResourceOperations {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package io.automatiko.tekton.task.approval.internal;

import javax.enterprise.context.ApplicationScoped;

import org.eclipse.microprofile.config.ConfigProvider;

import io.automatiko.engine.api.event.process.DefaultProcessEventListener;
import io.automatiko.engine.api.event.process.ProcessNodeTriggeredEvent;
import io.automatiko.engine.workflow.process.instance.node.HumanTaskNodeInstance;
import io.automatiko.tekton.task.approval.ApprovalTask;
import jakarta.enterprise.context.ApplicationScoped;

@ApplicationScoped
public class UpdateApprovalTaskStatusEventListener extends DefaultProcessEventListener {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import java.security.Principal;

import javax.inject.Singleton;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -12,6 +10,7 @@
import io.quarkus.security.identity.SecurityIdentity;
import io.quarkus.security.runtime.QuarkusSecurityIdentity;
import io.smallrye.mutiny.Uni;
import jakarta.inject.Singleton;

@Singleton
public class ReversProxyIdentityProvider implements IdentityProvider<ReverseProxyAuthenticationRequest> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package io.automatiko.tekton.task.security;

import io.quarkus.security.identity.request.AuthenticationRequest;
import io.quarkus.security.identity.request.BaseAuthenticationRequest;

public class ReverseProxyAuthenticationRequest extends BaseAuthenticationRequest implements AuthenticationRequest {
public class ReverseProxyAuthenticationRequest extends BaseAuthenticationRequest {

public static final String USER = "user";
public static final String GROUPS = "groups";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
import java.util.Collections;
import java.util.Set;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Alternative;

import io.netty.handler.codec.http.HttpResponseStatus;
import io.quarkus.arc.Priority;
import io.quarkus.security.identity.IdentityProviderManager;
import io.quarkus.security.identity.SecurityIdentity;
import io.quarkus.security.identity.request.AuthenticationRequest;
Expand All @@ -16,6 +12,9 @@
import io.quarkus.vertx.http.runtime.security.HttpCredentialTransport;
import io.smallrye.mutiny.Uni;
import io.vertx.ext.web.RoutingContext;
import jakarta.annotation.Priority;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Alternative;

@Alternative
@Priority(1)
Expand Down

0 comments on commit 59a506b

Please sign in to comment.