From f1953b386097962c4670c5e0a50bdc1d59f5211f Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Wed, 10 May 2023 10:36:20 -0300 Subject: [PATCH] Replace `jboss-parent` with `quarkus-parent` - This renames the root pom.xml artifactId to `quarkus-project` and introduces `quarkus-parent` as an independent project --- bom/application/pom.xml | 2 +- bom/test/pom.xml | 2 +- build-parent/pom.xml | 3 +- independent-projects/arc/pom.xml | 7 +- independent-projects/bootstrap/pom.xml | 9 +- independent-projects/enforcer-rules/pom.xml | 8 +- .../extension-maven-plugin/pom.xml | 8 +- independent-projects/ide-config/pom.xml | 8 +- independent-projects/parent/pom.xml | 434 ++++++++++++++++++ independent-projects/qute/pom.xml | 7 +- .../resteasy-reactive/pom.xml | 7 +- independent-projects/revapi/pom.xml | 12 +- independent-projects/tools/pom.xml | 8 +- pom.xml | 14 +- 14 files changed, 483 insertions(+), 46 deletions(-) create mode 100644 independent-projects/parent/pom.xml diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 5c2d7f2a6643a..40df8f6b141c7 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-parent io.quarkus + quarkus-project 999-SNAPSHOT ../../pom.xml diff --git a/bom/test/pom.xml b/bom/test/pom.xml index 9925ebedf03a3..2933c5fb998de 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-parent io.quarkus + quarkus-project 999-SNAPSHOT ../../pom.xml diff --git a/build-parent/pom.xml b/build-parent/pom.xml index b21004cd9add8..cb6d6ff5061aa 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -3,9 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-parent io.quarkus + quarkus-project 999-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index 697550659c77f..fa9dc00ae202f 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -6,9 +6,10 @@ 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml io.quarkus.arc arc-parent diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index 730366f50975a..93e043300dd66 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -4,16 +4,15 @@ child.project.url.inherit.append.path="false"> 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml - io.quarkus quarkus-bootstrap-parent Quarkus - Bootstrap - Parent https://github.com/quarkusio/quarkus pom - 999-SNAPSHOT Apache License, Version 2.0 diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml index 8a47259e60290..a9082af2a07f7 100644 --- a/independent-projects/enforcer-rules/pom.xml +++ b/independent-projects/enforcer-rules/pom.xml @@ -5,11 +5,11 @@ child.project.url.inherit.append.path="false"> 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml - io.quarkus quarkus-enforcer-rules Quarkus - Enforcer Rules https://github.com/quarkusio/quarkus diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index fb63ce98d42e7..c9be0f5ffb148 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml - io.quarkus quarkus-extension-maven-plugin 999-SNAPSHOT Quarkus - Extension Maven plugin diff --git a/independent-projects/ide-config/pom.xml b/independent-projects/ide-config/pom.xml index 4e061069173af..c5a6117d220f6 100644 --- a/independent-projects/ide-config/pom.xml +++ b/independent-projects/ide-config/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml 4.0.0 - io.quarkus quarkus-ide-config Quarkus - IDE/Tools - Config https://github.com/quarkusio/quarkus diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml new file mode 100644 index 0000000000000..5b7d957eba1a7 --- /dev/null +++ b/independent-projects/parent/pom.xml @@ -0,0 +1,434 @@ + + + 4.0.0 + io.quarkus + quarkus-parent + 999-SNAPSHOT + + Quarkus - Parent POM + Quarkus Parent POM + https://quarkus.io + + 2020 + + pom + + + + 3.3.0 + 3.0.0 + 3.2.0 + 3.11.0 + 3.1.1 + 3.3.0 + 3.1.0 + 3.1.0 + 2.22.0 + 3.0.1 + 1.8.0 + 3.1.1 + 3.5.0 + 3.3.0 + 1.6.13 + 3.0.0 + 3.3.1 + 3.4.1 + 3.2.1 + ${version.failsafe.plugin} + 1.1.3 + + + false + + + true + 11 + ${maven.compiler.release} + ${maven.compiler.release} + ${maven.compiler.target} + ${maven.compiler.source} + false + + + UTF-8 + UTF-8 + + + ${maven.compiler.target} + ${maven.compiler.source} + ${maven.compiler.testTarget} + ${maven.compiler.testSource} + + + 3.8.6 + ${maven.compiler.argument.source} + ERROR + + + false + + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + GitHub + https://github.com/quarkusio/quarkus/issues + + + + + quarkus + Quarkus Community + + + + + scm:git:git@github.com:quarkusio/quarkus.git + scm:git:git@github.com:quarkusio/quarkus.git + https://github.com/quarkusio/quarkus + HEAD + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + + oss.sonatype + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java-version + + enforce + + + + + To build this project, don't use maven repositories over HTTP. Please use + HTTPS in your settings.xml or run the build with property + insecure.repositories=WARN + + ${insecure.repositories} + + http://* + + + http://* + + + + To build this project JDK ${jdk.min.version} (or greater) is required. + Please install it. + + ${jdk.min.version} + + + + + + enforce-maven-version + + enforce + + + + + To build this project Maven ${maven.min.version} (or greater) is required. + Please install it. + + ${maven.min.version} + + + + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + get-scm-revision + initialize + + create + + + false + false + UNKNOWN + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + true + ${maven.compiler.argument.source} + ${maven.compiler.argument.target} + ${maven.compiler.argument.testSource} + ${maven.compiler.argument.testTarget} + true + + -Xlint:unchecked + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.compiler.plugin} + + + org.apache.maven.plugins + maven-gpg-plugin + ${version.gpg.plugin} + + + org.codehaus.mojo + build-helper-maven-plugin + ${version.buildhelper.plugin} + + + org.codehaus.mojo + buildnumber-maven-plugin + ${version.buildnumber.plugin} + + + org.apache.maven.plugins + maven-clean-plugin + ${version.clean.plugin} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${version.enforcer.plugin} + + + org.apache.maven.plugins + maven-install-plugin + ${version.install.plugin} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.javadoc.plugin} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.jar.plugin} + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.deploy.plugin} + + + org.apache.maven.plugins + maven-shade-plugin + ${version.shade.plugin} + + + org.apache.maven.plugins + maven-release-plugin + ${version.release.plugin} + + clean install + true + @{project.version} + false + true + false + + + + org.apache.maven.plugins + maven-resources-plugin + ${version.resources.plugin} + + + org.apache.maven.plugins + maven-source-plugin + ${version.source.plugin} + + + true + + + true + + + true + + + + ${project.url} + ${java.version} + ${java.vendor} + ${os.name} + ${os.arch} + ${os.version} + ${project.scm.url} + ${project.scm.connection} + ${buildNumber} + + + + + + net.revelc.code.formatter + formatter-maven-plugin + ${version.formatter.plugin} + + LF + ${format.skip} + + + + net.revelc.code + impsort-maven-plugin + ${version.impsort.plugin} + + java.,javax.,jakarta.,org.,com. + * + ${format.skip} + true + + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.surefire.plugin} + + + org.jboss.logmanager.LogManager + ${maven.home} + ${settings.localRepository} + ${session.request.userSettingsFile.path} + ${project.build.directory} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${version.failsafe.plugin} + + + org.jboss.logmanager.LogManager + ${maven.home} + ${settings.localRepository} + ${session.request.userSettingsFile.path} + + + + + it.ozimov + yaml-properties-maven-plugin + ${version.yaml-properties.plugin} + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${version.nexus-staging.plugin} + + + org.codehaus.mojo + exec-maven-plugin + ${version.exec.plugin} + + + + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + package + + jar + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + https://s01.oss.sonatype.org/ + ossrh + 60 + + + + + + + diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml index 0d28e7ff5f35d..048276809e653 100644 --- a/independent-projects/qute/pom.xml +++ b/independent-projects/qute/pom.xml @@ -6,9 +6,10 @@ child.project.url.inherit.append.path="false"> 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml io.quarkus.qute qute-parent diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index 4d8c4138af963..061fa8f88bf4f 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -6,9 +6,10 @@ 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml io.quarkus.resteasy.reactive resteasy-reactive-parent diff --git a/independent-projects/revapi/pom.xml b/independent-projects/revapi/pom.xml index 8d37ec70c0168..763f581599ac8 100644 --- a/independent-projects/revapi/pom.xml +++ b/independent-projects/revapi/pom.xml @@ -3,16 +3,16 @@ child.project.url.inherit.append.path="false"> 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml - io.quarkus quarkus-revapi-config Quarkus - Revapi Configuration - 999-SNAPSHOT - Contains the configuration of the Revapi API checker and the list of the API changes + 999-SNAPSHOT + Contains the configuration of the Revapi API checker and the list of the API changes in the Quarkus APIs. https://github.com/quarkusio/quarkus diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 0af8f7ff8bb34..2b02c489716d0 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -4,11 +4,11 @@ child.project.url.inherit.append.path="false"> 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + ../parent/pom.xml - io.quarkus quarkus-tools-parent Quarkus - Dev tools - Parent https://github.com/quarkusio/quarkus diff --git a/pom.xml b/pom.xml index 1dc3c22e4deed..d4af9266be6b7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,15 +5,14 @@ child.project.url.inherit.append.path="false"> 4.0.0 - org.jboss - jboss-parent - 39 + io.quarkus + quarkus-parent + 999-SNAPSHOT + independent-projects/parent/pom.xml - io.quarkus - quarkus-parent - Quarkus - Parent pom - 999-SNAPSHOT + quarkus-project + Quarkus - Project pom pom Quarkus - Kubernetes Native Java stack tailored for OpenJDK HotSpot and GraalVM @@ -84,6 +83,7 @@ + independent-projects/parent independent-projects/ide-config independent-projects/revapi independent-projects/arc