From e8f83dd449dda889c40d9b903b0f1c6e18026ed1 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Fri, 17 Mar 2023 14:04:03 +0200
Subject: [PATCH] Remove long deprecated jib property

---
 .../container/image/jib/deployment/JibConfig.java        | 9 ---------
 .../container/image/jib/deployment/JibProcessor.java     | 5 ++---
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java
index c7ce9311e43e8..c5a8fea44e41d 100644
--- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java
@@ -101,15 +101,6 @@ public class JibConfig {
     @ConfigItem
     public Map<String, String> environmentVariables;
 
-    /**
-     * Custom labels to add to the generated image
-     *
-     * @deprecated Use 'quarkus.container-image.labels' instead
-     */
-    @ConfigItem
-    @Deprecated
-    public Map<String, String> labels;
-
     /**
      * The username to use to authenticate with the registry used to pull the base JVM image
      */
diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
index 56f40099ae870..e8246645e1197 100644
--- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
@@ -787,12 +787,11 @@ private void handleExtraFiles(OutputTargetBuildItem outputTarget, JibContainerBu
 
     private Map<String, String> allLabels(JibConfig jibConfig, ContainerImageConfig containerImageConfig,
             List<ContainerImageLabelBuildItem> containerImageLabels) {
-        if (jibConfig.labels.isEmpty() && containerImageLabels.isEmpty() && containerImageConfig.labels.isEmpty()) {
+        if (containerImageLabels.isEmpty() && containerImageConfig.labels.isEmpty()) {
             return Collections.emptyMap();
         }
 
-        final Map<String, String> allLabels = new HashMap<>(jibConfig.labels);
-        allLabels.putAll(containerImageConfig.labels);
+        final Map<String, String> allLabels = new HashMap<>(containerImageConfig.labels);
         for (ContainerImageLabelBuildItem containerImageLabel : containerImageLabels) {
             // we want the user supplied labels to take precedence so the user can override labels generated from other extensions if desired
             allLabels.putIfAbsent(containerImageLabel.getName(), containerImageLabel.getValue());