Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhanced extension dependencies validation #14609

Merged
merged 2 commits into from
Mar 12, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make sure extension dependencies on other extensions are properly con…
…figured wrt runtime/deployment artifacts
aloubyansky committed Mar 10, 2021

Verified

This commit was signed with the committer’s verified signature.
maksim-paskal Maksim Paskal
commit 1c29298cfe643566e0c5c551fe0ab4b8c8bc9b97
4 changes: 0 additions & 4 deletions core/test-extension/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -25,10 +25,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-undertow</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-test-extension</artifactId>
4 changes: 4 additions & 0 deletions core/test-extension/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -30,6 +30,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
4 changes: 0 additions & 4 deletions extensions/amazon-alexa/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -15,10 +15,6 @@
<name>Quarkus - Amazon Alexa - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-amazon-alexa</artifactId>
4 changes: 4 additions & 0 deletions extensions/amazon-alexa/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -60,6 +60,10 @@
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logmanager</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jackson</artifactId>
</dependency>
</dependencies>

<build>
4 changes: 4 additions & 0 deletions extensions/caffeine/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@
<name>Quarkus - Caffeine - Runtime</name>
<description>A high performance caching library for Java 8+</description>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
Original file line number Diff line number Diff line change
@@ -14,6 +14,12 @@
<name>Quarkus - Container Image - Docker</name>
<description>Build container images of your application using Docker</description>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
Original file line number Diff line number Diff line change
@@ -14,6 +14,12 @@
<name>Quarkus - Container Image - Jib</name>
<description>Build container images of your application using Jib</description>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
Original file line number Diff line number Diff line change
@@ -20,6 +20,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-internal</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image</artifactId>
</dependency>
</dependencies>

<build>
Original file line number Diff line number Diff line change
@@ -20,6 +20,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-internal</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image</artifactId>
</dependency>
</dependencies>

<build>
6 changes: 6 additions & 0 deletions extensions/container-image/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -20,6 +20,12 @@
-->


<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
4 changes: 0 additions & 4 deletions extensions/jdbc/jdbc-db2/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -13,10 +13,6 @@
<name>Quarkus - JDBC - DB2 - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
2 changes: 1 addition & 1 deletion extensions/jdbc/jdbc-db2/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
4 changes: 0 additions & 4 deletions extensions/jdbc/jdbc-derby/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -13,10 +13,6 @@
<name>Quarkus - JDBC - Derby - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-datasource-deployment-spi</artifactId>
2 changes: 1 addition & 1 deletion extensions/jdbc/jdbc-derby/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
4 changes: 0 additions & 4 deletions extensions/jdbc/jdbc-h2/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -13,10 +13,6 @@
<name>Quarkus - JDBC - H2 - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
4 changes: 4 additions & 0 deletions extensions/jdbc/jdbc-h2/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@
<name>Quarkus - JDBC - H2 - Runtime</name>
<description>Connect to the H2 database via JDBC</description>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
4 changes: 0 additions & 4 deletions extensions/jdbc/jdbc-mariadb/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -13,10 +13,6 @@
<name>Quarkus - JDBC - MariaDB - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
4 changes: 4 additions & 0 deletions extensions/jdbc/jdbc-mariadb/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@
<name>Quarkus - JDBC - MariaDB - Runtime</name>
<description>Connect to the MariaDB database via JDBC</description>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-agroal</artifactId>
4 changes: 0 additions & 4 deletions extensions/jdbc/jdbc-mssql/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -13,10 +13,6 @@
<name>Quarkus - JDBC - MSSQL - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
4 changes: 4 additions & 0 deletions extensions/jdbc/jdbc-mssql/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -14,6 +14,10 @@
<description>Connect to the Microsoft SQL Server database via JDBC</description>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-agroal</artifactId>
4 changes: 0 additions & 4 deletions extensions/jdbc/jdbc-mysql/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -13,10 +13,6 @@
<name>Quarkus - JDBC - MySQL - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
2 changes: 1 addition & 1 deletion extensions/jdbc/jdbc-mysql/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
4 changes: 0 additions & 4 deletions extensions/jdbc/jdbc-postgresql/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -17,10 +17,6 @@
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
4 changes: 4 additions & 0 deletions extensions/jdbc/jdbc-postgresql/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@
<name>Quarkus - JDBC - PostgreSQL - Runtime</name>
<description>Connect to the PostgreSQL database via JDBC</description>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-agroal</artifactId>
4 changes: 4 additions & 0 deletions extensions/jsch/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -15,6 +15,10 @@
<description>JSch is a pure Java implementation of SSH2 and allows you to connect to an sshd server and use port forwarding, X11 forwarding, file transfer, etc.</description>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
</dependency>
<dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
4 changes: 0 additions & 4 deletions extensions/kafka-client/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -14,10 +14,6 @@
<name>Quarkus - Kafka - Client - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kafka-client</artifactId>
2 changes: 1 addition & 1 deletion extensions/kafka-client/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
4 changes: 4 additions & 0 deletions extensions/kotlin/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -44,6 +44,10 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
2 changes: 1 addition & 1 deletion extensions/kubernetes-client/deployment-internal/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client</artifactId>
<artifactId>quarkus-kubernetes-client-internal</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
4 changes: 4 additions & 0 deletions extensions/kubernetes-client/deployment/pom.xml
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@
<name>Quarkus - Kubernetes Client - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
8 changes: 6 additions & 2 deletions extensions/kubernetes-client/runtime-internal/pom.xml
Original file line number Diff line number Diff line change
@@ -13,11 +13,15 @@
<artifactId>quarkus-kubernetes-client-internal</artifactId>
<name>Quarkus - Kubernetes Client - Runtime - Internal</name>
<description>This module only exists as a separate module to house the configuration that needs to be present on the runtime classpath when the kubernetes extension is used</description>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
</dependency>
</dependencies>

22 changes: 0 additions & 22 deletions extensions/kubernetes-client/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -31,28 +31,6 @@
<artifactId>svm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
4 changes: 4 additions & 0 deletions extensions/kubernetes/minikube/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -20,6 +20,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-internal</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes</artifactId>
</dependency>
</dependencies>

<build>
8 changes: 8 additions & 0 deletions extensions/kubernetes/openshift/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -20,6 +20,14 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-internal</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-openshift</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes</artifactId>
</dependency>
</dependencies>

<build>
Loading