Merge pull request #37489 from gsmet/drop-container-image-s2i

Remove the container-image-s2i extension
quarkusio · Dec 11, 2023 · b48452c · b48452c
2 parents 8cfaa73 + d87a905
commit b48452c
Show file tree

Hide file tree

Showing 33 changed files with 5 additions and 1,609 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -2579,16 +2579,6 @@
                 <artifactId>quarkus-container-image-jib-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-container-image-s2i</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-container-image-s2i-deployment</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-container-image-openshift</artifactId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java
@@ -99,7 +99,6 @@ public interface Capability {
     String METRICS = QUARKUS_PREFIX + ".metrics";
     String CONTAINER_IMAGE_JIB = QUARKUS_PREFIX + ".container.image.jib";
     String CONTAINER_IMAGE_DOCKER = QUARKUS_PREFIX + ".container.image.docker";
-    String CONTAINER_IMAGE_S2I = QUARKUS_PREFIX + ".container.image.s2i";
     String CONTAINER_IMAGE_OPENSHIFT = QUARKUS_PREFIX + ".container.image.openshift";
     String CONTAINER_IMAGE_BUILDPACK = QUARKUS_PREFIX + ".container.image.buildpack";
     String HIBERNATE_ORM = QUARKUS_PREFIX + ".hibernate.orm";

diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -382,19 +382,6 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-container-image-s2i</artifactId>
-                    <version>${project.version}</version>
-                    <type>pom</type>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-core</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -398,19 +398,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-container-image-s2i-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>

diff --git a/extensions/container-image/container-image-s2i/deployment/pom.xml b/extensions/container-image/container-image-s2i/deployment/pom.xml
diff --git a/...ge-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/RemoveEnvVarDecorator.java b/...ge-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/RemoveEnvVarDecorator.java
diff --git a/...java/io/quarkus/container/image/s2i/deployment/ApplyDockerfileToBuildConfigDecorator.java b/...java/io/quarkus/container/image/s2i/deployment/ApplyDockerfileToBuildConfigDecorator.java
diff --git a/...s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/BuildStrategy.java b/...s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/BuildStrategy.java
diff --git a/...ment/src/main/java/io/quarkus/container/image/s2i/deployment/ContainerImageS2iConfig.java b/...ment/src/main/java/io/quarkus/container/image/s2i/deployment/ContainerImageS2iConfig.java