From 9200e3f6aeb309f55b3bc72925c000e62dc5e76e Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Thu, 17 Sep 2020 11:49:12 +0300 Subject: [PATCH] chore: Upgrade dekorate to 0.12.9 --- bom/application/pom.xml | 2 +- .../kubernetes/deployment/AddContainerPortDecorator.java | 3 +-- .../io/quarkus/kubernetes/deployment/AddEnvVarDecorator.java | 3 +-- .../quarkus/kubernetes/deployment/AddNamespaceDecorator.java | 3 +-- .../kubernetes/deployment/ApplyHttpGetActionPortDecorator.java | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 28651e7108edb..9c164a25bf922 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -147,7 +147,7 @@ 2.34.0 1.3.0 1.3.72 - 0.12.8 + 0.12.9 0.10.0 2.14.6 3.0.1 diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddContainerPortDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddContainerPortDecorator.java index 5e7aef114dc1b..7ab61a932c7c8 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddContainerPortDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddContainerPortDecorator.java @@ -4,7 +4,6 @@ import io.dekorate.kubernetes.annotation.Protocol; import io.dekorate.kubernetes.config.Port; import io.dekorate.kubernetes.decorator.AddSidecarDecorator; -import io.dekorate.kubernetes.decorator.ContainerDecorator; import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; @@ -31,6 +30,6 @@ public void visit(ContainerBuilder containerBuilder) { } public Class[] after() { - return new Class[] { ResourceProvidingDecorator.class, ContainerDecorator.class, AddSidecarDecorator.class }; + return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class }; } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddEnvVarDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddEnvVarDecorator.java index 386a770ab0cba..d7766f8411af7 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddEnvVarDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddEnvVarDecorator.java @@ -3,7 +3,6 @@ import io.dekorate.deps.kubernetes.api.model.ContainerBuilder; import io.dekorate.kubernetes.config.Env; import io.dekorate.kubernetes.decorator.AddSidecarDecorator; -import io.dekorate.kubernetes.decorator.ContainerDecorator; import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; @@ -25,6 +24,6 @@ public void visit(ContainerBuilder containerBuilder) { } public Class[] after() { - return new Class[] { ResourceProvidingDecorator.class, ContainerDecorator.class, AddSidecarDecorator.class }; + return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class }; } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java index 2ad6dbc99f468..ddf9433fc2c4f 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java @@ -5,7 +5,6 @@ import io.dekorate.deps.kubernetes.api.model.ObjectMeta; import io.dekorate.deps.kubernetes.api.model.ObjectMetaBuilder; import io.dekorate.kubernetes.decorator.AddSidecarDecorator; -import io.dekorate.kubernetes.decorator.ContainerDecorator; import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.NamedResourceDecorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; @@ -25,7 +24,7 @@ public void andThenVisit(ObjectMetaBuilder builder, ObjectMeta resourceMeta) { @Override public Class[] after() { - return new Class[] { ResourceProvidingDecorator.class, ContainerDecorator.class, AddSidecarDecorator.class }; + return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class }; } @Override diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java index f3767aba652e7..dc63db06f66b9 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java @@ -6,7 +6,6 @@ import io.dekorate.kubernetes.decorator.AddReadinessProbeDecorator; import io.dekorate.kubernetes.decorator.AddSidecarDecorator; import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator; -import io.dekorate.kubernetes.decorator.ContainerDecorator; import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; @@ -31,7 +30,7 @@ public void andThenVisit(HTTPGetActionFluent action) { @Override public Class[] after() { - return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class, ContainerDecorator.class, + return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class, AddLivenessProbeDecorator.class, AddReadinessProbeDecorator.class }; } }