From 0d85188915ad024df721cc85680b5eed1eb2f4dd Mon Sep 17 00:00:00 2001 From: Alexey Loubyansky Date: Fri, 25 Jun 2021 15:17:29 +0200 Subject: [PATCH] Introduced quarkus-bootstrap-bom --- bom/application/pom.xml | 106 +---- .../bootstrap/app-model/pom.xml | 11 + independent-projects/bootstrap/bom/pom.xml | 400 ++++++++++++++++++ independent-projects/bootstrap/core/pom.xml | 12 + .../bootstrap/gradle-resolver/pom.xml | 12 + .../bootstrap/maven-plugin/pom.xml | 13 + .../bootstrap/maven-resolver/pom.xml | 12 + .../modules-in-profiles/runner/pom.xml | 1 - independent-projects/bootstrap/pom.xml | 350 +-------------- independent-projects/bootstrap/runner/pom.xml | 12 + 10 files changed, 482 insertions(+), 447 deletions(-) create mode 100644 independent-projects/bootstrap/bom/pom.xml diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 32d2453d61956..aa540b6451c9b 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -79,12 +79,8 @@ 9.1 2.10.0 11.0.0.Final - 3.8.1 - 1.6.2 3.0-alpha-2 - 30.1.1-jre 3.2.1 - 3.6.0 2.1.0 21.1.0 @@ -202,7 +198,6 @@ 3.14.0 ${protobuf-java.version} 4.6.1 - 0.3.4 1.0.1 1.20 2.8.6 @@ -235,6 +230,14 @@ properties + + io.quarkus + quarkus-bootstrap-bom + ${project.version} + pom + import + + @@ -2830,11 +2833,6 @@ gson ${gson.version} - - com.google.guava - guava - ${guava.version} - com.fasterxml classmate @@ -3645,7 +3643,7 @@ ${kafka2.version} - com.google.code.findbugs + com.google.code.findbugs jsr305 @@ -3655,36 +3653,6 @@ zookeeper ${zookeeper.version} - - org.apache.maven - maven-plugin-api - ${maven-core.version} - - - org.apache.maven - maven-model - ${maven-core.version} - - - org.apache.maven - maven-core - ${maven-core.version} - - - org.apache.maven - maven-artifact - ${maven-core.version} - - - org.apache.maven - maven-resolver-provider - ${maven-core.version} - - - org.apache.maven - maven-settings-builder - ${maven-core.version} - org.apache.maven maven-toolchain @@ -3711,32 +3679,6 @@ sentry-jul ${sentry.version} - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven-plugin-annotations.version} - - - org.apache.maven - maven-artifact - - - - - org.apache.maven.resolver - maven-resolver-connector-basic - ${maven-resolver.version} - - - org.apache.maven.resolver - maven-resolver-transport-file - ${maven-resolver.version} - - - org.apache.maven.resolver - maven-resolver-transport-http - ${maven-resolver.version} - org.assertj assertj-core @@ -4817,11 +4759,6 @@ ${smallrye-reactive-types-converter.version} - - org.eclipse.sisu - org.eclipse.sisu.inject - ${org.eclipse.sisu.inject.version} - org.jetbrains.kotlin kotlin-compiler @@ -5329,31 +5266,6 @@ commons-compress ${commons-compress.version} - - io.quarkus - quarkus-bootstrap-app-model - ${project.version} - - - io.quarkus - quarkus-bootstrap-maven-resolver - ${project.version} - - - io.quarkus - quarkus-bootstrap-gradle-resolver - ${project.version} - - - io.quarkus - quarkus-bootstrap-core - ${project.version} - - - io.quarkus - quarkus-bootstrap-runner - ${project.version} - io.quarkus quarkus-builder diff --git a/independent-projects/bootstrap/app-model/pom.xml b/independent-projects/bootstrap/app-model/pom.xml index b8db0de4cbdb9..99ef8856b52f8 100644 --- a/independent-projects/bootstrap/app-model/pom.xml +++ b/independent-projects/bootstrap/app-model/pom.xml @@ -13,6 +13,17 @@ quarkus-bootstrap-app-model Quarkus - Bootstrap - App Model + + + + io.quarkus + quarkus-bootstrap-bom + ${project.version} + pom + import + + + org.jboss.logging diff --git a/independent-projects/bootstrap/bom/pom.xml b/independent-projects/bootstrap/bom/pom.xml new file mode 100644 index 0000000000000..913c994a86b52 --- /dev/null +++ b/independent-projects/bootstrap/bom/pom.xml @@ -0,0 +1,400 @@ + + 4.0.0 + + io.quarkus + quarkus-bootstrap-parent + 999-SNAPSHOT + + quarkus-bootstrap-bom + Quarkus - Bootstrap - BOM + pom + + + 0.9.5 + 3.4.2.Final + 5.7.2 + 3.8.1 + 0.3.4 + 3.6.0 + 1.6.2 + 3.4.3 + 4.4.14 + 1.7 + 1.6.8 + 1.0.0.Final + 2.12.3 + 1.3.5 + 2.0.2 + 1.0 + 3.12.0 + 30.1.1-jre + 1.2.6 + 1.0.9 + 1.1.0.Final + 1.7.30 + 21.1.0 + 2.6.0 + 3.0.0-M5 + 1.6.0 + 6.8.3 + + + + + io.quarkus + quarkus-bootstrap-app-model + ${project.version} + + + io.quarkus + quarkus-bootstrap-maven-resolver + ${project.version} + + + io.quarkus + quarkus-bootstrap-gradle-resolver + ${project.version} + + + io.quarkus + quarkus-bootstrap-core + ${project.version} + + + io.quarkus + quarkus-bootstrap-runner + ${project.version} + + + com.google.guava + guava + ${guava.version} + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + io.quarkus + quarkus-bootstrap-core + ${project.version} + + + io.quarkus + quarkus-bootstrap-core + ${project.version} + test-jar + test + + + io.quarkus + quarkus-bootstrap-app-model + ${project.version} + + + io.quarkus + quarkus-bootstrap-maven-resolver + ${project.version} + + + io.quarkus + quarkus-bootstrap-maven-plugin + ${project.version} + + + io.quarkus + quarkus-bootstrap-gradle-resolver + ${project.version} + + + org.apache.maven + maven-plugin-api + ${maven-core.version} + + + javax.enterprise + cdi-api + + + javax.inject + javax.inject + + + + + org.apache.maven + maven-model + ${maven-core.version} + + + org.apache.maven + maven-core + ${maven-core.version} + + + javax.inject + javax.inject + + + org.slf4j + slf4j-api + + + + + org.apache.maven + maven-embedder + ${maven-core.version} + + + org.sonatype.plexus + plexus-sec-dispatcher + + + org.sonatype.plexus + plexus-cipher + + + javax.annotation + jsr250-api + + + javax.inject + javax.inject + + + javax.enterprise + cdi-api + + + org.checkerframework + checker-qual + + + org.slf4j + slf4j-api + + + + + org.apache.maven + maven-settings + ${maven-core.version} + + + org.gradle + gradle-tooling-api + ${gradle-tooling.version} + + + org.slf4j + slf4j-api + + + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi-api.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject-api.version} + + + org.apache.maven + maven-resolver-provider + ${maven-core.version} + + + javax.inject + javax.inject + + + org.slf4j + slf4j-api + + + + + org.apache.maven + maven-settings-builder + ${maven-core.version} + + + javax.inject + javax.inject + + + org.codehaus.plexus + plexus-utils + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven-plugin-annotations.version} + + + org.apache.maven + maven-artifact + + + + + org.apache.maven.resolver + maven-resolver-connector-basic + ${maven-resolver.version} + + + org.slf4j + slf4j-api + + + + + org.apache.maven.resolver + maven-resolver-transport-wagon + ${maven-resolver.version} + + + org.slf4j + slf4j-api + + + + + org.apache.maven.wagon + wagon-file + ${maven-wagon.version} + + + org.codehaus.plexus + plexus-utils + + + + + org.apache.maven.wagon + wagon-http + ${maven-wagon.version} + + + org.slf4j + slf4j-api + + + org.codehaus.plexus + plexus-utils + + + commons-io + commons-io + + + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + org.eclipse.sisu + org.eclipse.sisu.inject + ${sisu.version} + + + org.eclipse.sisu + org.eclipse.sisu.plexus + ${sisu.version} + + + * + * + + + + + org.graalvm.sdk + graal-sdk + ${graal-sdk.version} + + + org.jboss.logmanager + jboss-logmanager-embedded + ${jboss-logmanager-embedded.version} + + + org.jboss.logging + jboss-logging + ${jboss-logging.version} + + + org.jboss.logging + commons-logging-jboss-logging + ${commons-logging-jboss-logging.version} + + + org.jboss.slf4j + slf4j-jboss-logmanager + ${slf4j-jboss-logmanager.version} + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + org.codehaus.plexus + plexus-classworlds + ${plexus-classworlds.version} + + + * + * + + + + + org.junit + junit-bom + ${junit.jupiter.version} + import + pom + + + org.jboss.shrinkwrap + shrinkwrap-depchain + pom + test + ${shrinkwrap-depchain.version} + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + import + pom + + + + io.smallrye.common + smallrye-common-bom + ${smallrye-common.version} + import + pom + + + + diff --git a/independent-projects/bootstrap/core/pom.xml b/independent-projects/bootstrap/core/pom.xml index 2e6e3d7549302..8a5bcfcdfd904 100644 --- a/independent-projects/bootstrap/core/pom.xml +++ b/independent-projects/bootstrap/core/pom.xml @@ -13,6 +13,18 @@ quarkus-bootstrap-core Quarkus - Bootstrap - Core + + + + io.quarkus + quarkus-bootstrap-bom + ${project.version} + pom + import + + + + io.quarkus diff --git a/independent-projects/bootstrap/gradle-resolver/pom.xml b/independent-projects/bootstrap/gradle-resolver/pom.xml index 8aadbc57bbb62..e2d0765821220 100644 --- a/independent-projects/bootstrap/gradle-resolver/pom.xml +++ b/independent-projects/bootstrap/gradle-resolver/pom.xml @@ -13,6 +13,18 @@ quarkus-bootstrap-gradle-resolver Quarkus - Bootstrap - Gradle Resolver + + + + io.quarkus + quarkus-bootstrap-bom + ${project.version} + pom + import + + + + io.quarkus diff --git a/independent-projects/bootstrap/maven-plugin/pom.xml b/independent-projects/bootstrap/maven-plugin/pom.xml index ae99badd1abb0..8613f1507441b 100644 --- a/independent-projects/bootstrap/maven-plugin/pom.xml +++ b/independent-projects/bootstrap/maven-plugin/pom.xml @@ -49,6 +49,19 @@ + + + + + io.quarkus + quarkus-bootstrap-bom + ${project.version} + pom + import + + + + io.quarkus diff --git a/independent-projects/bootstrap/maven-resolver/pom.xml b/independent-projects/bootstrap/maven-resolver/pom.xml index 9e9d72ee36dbf..ebd1433d8401a 100644 --- a/independent-projects/bootstrap/maven-resolver/pom.xml +++ b/independent-projects/bootstrap/maven-resolver/pom.xml @@ -13,6 +13,18 @@ quarkus-bootstrap-maven-resolver Quarkus - Bootstrap - Maven Resolver + + + + io.quarkus + quarkus-bootstrap-bom + ${project.version} + pom + import + + + + io.quarkus diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/runner/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/runner/pom.xml index 2994c1c260c3a..5a3c9ebe88722 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/runner/pom.xml +++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/runner/pom.xml @@ -69,7 +69,6 @@ /home/aloubyansky/git/quarkus/integration-tests/maven/target/quarkus-integration-test-maven-999-SNAPSHOT-runner org.jboss.logmanager.LogManager - /home/aloubyansky/apache-maven-3.6.3 diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index 0039b9550e4ff..fe05903061342 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -24,36 +24,10 @@ 11 11 11 - - 0.9.5 - 3.4.2.Final - 5.7.2 - 3.8.1 - 0.3.4 - 3.6.0 - 1.6.2 - 3.4.3 - 4.4.14 - 1.7 - 1.6.8 - 1.0.0.Final - 2.12.3 - 1.3.5 - 2.0.2 - 1.0 - 3.12.0 - 30.1.1-jre - 1.2.6 - 1.0.9 - 1.1.0.Final - 1.7.30 - 21.1.0 - 2.6.0 3.0.0-M5 - 1.6.0 - 6.8.3 + bom app-model maven-resolver core @@ -61,328 +35,6 @@ runner gradle-resolver - - - - com.google.guava - guava - ${guava.version} - - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - io.quarkus - quarkus-bootstrap-core - ${project.version} - - - io.quarkus - quarkus-bootstrap-core - ${project.version} - test-jar - test - - - io.quarkus - quarkus-bootstrap-app-model - ${project.version} - - - io.quarkus - quarkus-bootstrap-maven-resolver - ${project.version} - - - io.quarkus - quarkus-bootstrap-maven-plugin - ${project.version} - - - io.quarkus - quarkus-bootstrap-gradle-resolver - ${project.version} - - - org.apache.maven - maven-plugin-api - ${maven-core.version} - - - javax.enterprise - cdi-api - - - javax.inject - javax.inject - - - - - org.apache.maven - maven-model - ${maven-core.version} - - - org.apache.maven - maven-core - ${maven-core.version} - - - javax.inject - javax.inject - - - org.slf4j - slf4j-api - - - - - org.apache.maven - maven-embedder - ${maven-core.version} - - - org.sonatype.plexus - plexus-sec-dispatcher - - - org.sonatype.plexus - plexus-cipher - - - javax.annotation - jsr250-api - - - javax.inject - javax.inject - - - javax.enterprise - cdi-api - - - org.checkerframework - checker-qual - - - org.slf4j - slf4j-api - - - - - org.gradle - gradle-tooling-api - ${gradle-tooling.version} - - - org.slf4j - slf4j-api - - - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation-api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi-api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject-api.version} - - - org.apache.maven - maven-resolver-provider - ${maven-core.version} - - - javax.inject - javax.inject - - - org.slf4j - slf4j-api - - - - - org.apache.maven - maven-settings-builder - ${maven-core.version} - - - javax.inject - javax.inject - - - org.codehaus.plexus - plexus-utils - - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven-plugin-annotations.version} - - - org.apache.maven - maven-artifact - - - - - org.apache.maven.resolver - maven-resolver-connector-basic - ${maven-resolver.version} - - - org.slf4j - slf4j-api - - - - - org.apache.maven.resolver - maven-resolver-transport-wagon - ${maven-resolver.version} - - - org.slf4j - slf4j-api - - - - - org.apache.maven.wagon - wagon-file - ${maven-wagon.version} - - - org.codehaus.plexus - plexus-utils - - - - - org.apache.maven.wagon - wagon-http - ${maven-wagon.version} - - - org.slf4j - slf4j-api - - - org.codehaus.plexus - plexus-utils - - - commons-io - commons-io - - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - org.eclipse.sisu - org.eclipse.sisu.plexus - ${sisu.version} - - - * - * - - - - - org.graalvm.sdk - graal-sdk - ${graal-sdk.version} - - - org.jboss.logmanager - jboss-logmanager-embedded - ${jboss-logmanager-embedded.version} - - - org.jboss.logging - jboss-logging - ${jboss-logging.version} - - - org.jboss.logging - commons-logging-jboss-logging - ${commons-logging-jboss-logging.version} - - - org.jboss.slf4j - slf4j-jboss-logmanager - ${slf4j-jboss-logmanager.version} - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - org.codehaus.plexus - plexus-classworlds - ${plexus-classworlds.version} - - - * - * - - - - - org.junit - junit-bom - ${junit.jupiter.version} - import - pom - - - org.jboss.shrinkwrap - shrinkwrap-depchain - pom - test - ${shrinkwrap-depchain.version} - - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - import - pom - - - - io.smallrye.common - smallrye-common-bom - ${smallrye-common.version} - import - pom - - - diff --git a/independent-projects/bootstrap/runner/pom.xml b/independent-projects/bootstrap/runner/pom.xml index 4d57c3edab7ee..696962ef9f9ef 100644 --- a/independent-projects/bootstrap/runner/pom.xml +++ b/independent-projects/bootstrap/runner/pom.xml @@ -18,6 +18,18 @@ parent first dependencies. + + + + io.quarkus + quarkus-bootstrap-bom + ${project.version} + pom + import + + + + io.smallrye.common