From cfb11e9f6da504d2b3e4c262384db19c665d484a Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Tue, 28 Mar 2023 18:04:50 +0200 Subject: [PATCH] Refactored dependencies to allow for productization --- plugin/pom.xml | 109 +++++++++++++ pom.xml | 419 +++++++++++++++++++++++++++++++++++++++++-------- tests/pom.xml | 8 +- 3 files changed, 463 insertions(+), 73 deletions(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index c59699be..fd9c3b0b 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -38,6 +38,66 @@ org.wildfly.plugins wildfly-maven-plugin + + org.wildfly.plugins + wildfly-plugin-core + + + org.apache.maven.resolver + maven-resolver-api + + + org.apache.maven.resolver + maven-resolver-spi + + + org.apache.maven.resolver + maven-resolver-impl + + + org.apache.commons + commons-lang3 + + + org.slf4j + slf4j-api + + + org.apache.maven.resolver + maven-resolver-connector-basic + + + org.apache.maven.resolver + maven-resolver-transport-http + + + org.apache.httpcomponents + httpclient + + + commons-logging + commons-logging + + + commons-codec + commons-codec + + + org.apache.httpcomponents + httpcore + + + org.slf4j + jcl-over-slf4j + + + org.apache.maven.resolver + maven-resolver-util + + + org.apache.maven.resolver + maven-resolver-named-locks + org.wildfly.channel channel-core @@ -50,6 +110,34 @@ org.wildfly.prospero prospero-metadata + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + org.yaml + snakeyaml + + + com.networknt + json-schema-validator + + + com.ethlo.time + itu + org.wildfly.common wildfly-common @@ -70,6 +158,18 @@ org.jboss staxmapper + + org.jboss.galleon + galleon-core + + + org.jboss.galleon + galleon-maven-universe + + + org.jboss.galleon + galleon-maven-plugin + org.apache.maven.plugin-tools maven-plugin-annotations @@ -77,6 +177,15 @@ provided true + + org.apache.maven + maven-plugin-api + provided + + + org.apache.maven.shared + maven-artifact-transfer + diff --git a/pom.xml b/pom.xml index 75dd1ddf..9559590a 100644 --- a/pom.xml +++ b/pom.xml @@ -43,21 +43,42 @@ false 11 11 - 4.13.2 - 3.7.0 - 1.1.0 + + 1.7.0 + 2.14.2 31.1.0.jre-redhat-00001 1.0.1.redhat-00003 - 1.2.1.Final - 1.0.8.Final - 1.6.0.Final-redhat-00001 - 20.0.0.Beta6 + 1.0.78.redhat-00001 + 1.11 + 1.2 + + 1 + 4.13.2 + 3.12.0.redhat-00001 + 4.5.14.redhat-00002 + 4.4.16.redhat-00001 + + 3.6.2 + 3.7.0 + 1.9.6.redhat-00002 + 0.9.1 + + 5.0.8.Final-redhat-00001 3.4.3.Final-redhat-00001 + 1.2.1.Final 2.1.19.Final-redhat-00001 1.3.0.Final-redhat-1 - 4.1.0.Beta2 - 1.0.0.Beta5-redhat-00001 - 1.0.0.Beta6-redhat-00001 + + 1.7.36 + + 1.0.0.Beta6-redhat-00001 + 1.0.8.Final + 1.6.0.Final-redhat-00001 + 20.0.0.Beta-redhat-20230313 + 4.1.0.Beta4 + 1.0.0.Beta7-redhat-00001 + + 2.0.0.redhat-00003 @@ -67,6 +88,53 @@ eap-maven-plugin ${project.version} + + + com.ethlo.time + itu + ${version.com.ethlo.time} + + + + com.fasterxml.jackson.core + jackson-annotations + ${version.com.fasterxml.jackson} + + + + com.fasterxml.jackson.core + jackson-core + ${version.com.fasterxml.jackson} + + + + com.fasterxml.jackson.core + jackson-databind + ${version.com.fasterxml.jackson} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${version.com.fasterxml.jackson} + + + org.yaml + snakeyaml + + + + com.google.guava guava @@ -78,139 +146,347 @@ + com.google.guava failureaccess ${version.com.google.guava.failureaccess} + - org.wildfly.plugins - wildfly-maven-plugin - ${version.org.wildfly.maven.plugin} + com.networknt + json-schema-validator + ${version.com.networknt} - org.wildfly.core - * - - - org.jboss.logmanager - jboss-logmanager + com.ethlo.time + itu + + + + + commons-codec + commons-codec + ${version.commons-codec} + + + + commons-logging + commons-logging + ${version.commons-logging} + + + + javax.inject + javax.inject + ${version.javax.inject.javax.inject} + + + + junit + junit + ${version.junit} + + + + org.apache.commons + commons-lang3 + ${version.org.apache.commons} + + + + org.apache.httpcomponents + httpclient + ${version.org.apache.httpcomponents.httpclient} + - org.wildfly.channel - * + commons-logging + commons-logging - org.wildfly.prospero - * + commons-codec + commons-codec + - org.wildfly.channel - channel-core - ${version.org.wildfly.channel} + org.apache.httpcomponents + httpcore + ${version.org.apache.httpcomponents.httpcore} + - org.wildfly.channel - maven-resolver - ${version.org.wildfly.channel} + org.apache.maven + maven-core + ${version.org.apache.maven.maven-core} + - org.wildfly.prospero - prospero-metadata - ${version.org.wildfly.prospero} + org.apache.maven + maven-plugin-api + ${version.org.apache.maven.maven-core} + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${version.org.apache.maven.plugin-tools} + + + + org.apache.maven.resolver + maven-resolver-api + ${version.org.apache.maven.resolver} + + + + org.apache.maven.resolver + maven-resolver-connector-basic + ${version.org.apache.maven.resolver} + + + + org.apache.maven.resolver + maven-resolver-impl + ${version.org.apache.maven.resolver} - org.wildfly.channel - channel-core + org.apache.commons + commons-lang3 + + + org.slf4j + slf4j-api + - org.wildfly.plugins - wildfly-plugin-core - ${version.org.wildfly.maven.plugin} + org.apache.maven.resolver + maven-resolver-named-locks + ${version.org.apache.maven.resolver} + + + + org.apache.maven.resolver + maven-resolver-spi + ${version.org.apache.maven.resolver} + + + + org.apache.maven.resolver + maven-resolver-transport-http + ${version.org.apache.maven.resolver} - org.wildfly.core - * + org.apache.httpcomponents + httpclient - org.jboss.logging - jboss-logging + org.apache.httpcomponents + httpcore - org.wildfly.common - wildfly-common + org.slf4j + jcl-over-slf4j + - org.wildfly.common - wildfly-common - ${version.org.wildfly.common.wildfly-common} + org.apache.maven.resolver + maven-resolver-util + ${version.org.apache.maven.resolver} + - org.wildfly.core - wildfly-launcher - ${version.org.wildfly.core} + org.apache.maven.shared + maven-artifact-transfer + ${version.org.apache.maven.shared} + + + * + * + + + + + org.jboss + staxmapper + ${version.org.jboss.staxmapper} + + + + org.jboss.galleon + galleon-core + ${version.org.jboss.galleon} + + + + org.jboss.galleon + galleon-maven-plugin + ${version.org.jboss.galleon} + + + * + * + + + + + + org.jboss.galleon + galleon-maven-universe + ${version.org.jboss.galleon} + + + org.apache.maven.shared + maven-artifact-transfer + + + org.apache.maven + maven-artifact + + + org.eclipse.aether + aether-api + + + org.eclipse.aether + aether-util + + + + org.jboss.logging jboss-logging ${version.org.jboss.logging.jboss-logging} + org.jboss.logmanager jboss-logmanager ${version.org.jboss.logmanager.jboss-logmanager} + - org.jboss - staxmapper - ${version.org.jboss.staxmapper} + org.jboss.slf4j + slf4j-jboss-logging + ${version.org.jboss.logging.slf4j-jboss-logging} + + + + org.slf4j + jcl-over-slf4j + ${version.org.slf4j} + + + + org.slf4j + slf4j-api + ${version.org.slf4j} + + + + org.wildfly.channel + channel-core + ${version.org.wildfly.channel} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.networknt + json-schema-validator + + + + + + org.wildfly.channel + maven-resolver + ${version.org.wildfly.channel} + org.wildfly.checkstyle wildfly-checkstyle-config ${version.org.wildfly.checkstyle-config} + - org.apache.maven.plugin-tools - maven-plugin-annotations - ${version.org.apache.maven.plugin-tools} + org.wildfly.common + wildfly-common + ${version.org.wildfly.common.wildfly-common} - + org.wildfly.core wildfly-controller-client ${version.org.wildfly.core} + + + org.wildfly.core + wildfly-launcher + ${version.org.wildfly.core} + + org.wildfly.plugins - wildfly-maven-plugin-tests-shared + wildfly-maven-plugin ${version.org.wildfly.maven.plugin} + + + * + * + + + - org.eclipse.aether - aether-connector-basic - ${version.org.eclipse.aether} + org.wildfly.plugins + wildfly-maven-plugin-tests-shared + ${version.org.wildfly.maven.plugin} + - org.eclipse.aether - aether-transport-http - ${version.org.eclipse.aether} + org.wildfly.plugins + wildfly-plugin-core + ${version.org.wildfly.maven.plugin} + + + * + * + + + - org.jboss.slf4j - slf4j-jboss-logging - ${version.org.jboss.logging.slf4j-jboss-logging} + org.wildfly.prospero + prospero-metadata + ${version.org.wildfly.prospero} + + + * + * + + + - junit - junit - ${version.junit} + org.yaml + snakeyaml + ${version.snakeyaml.snakeyaml} @@ -225,6 +501,11 @@ + + org.apache.maven.plugins + maven-plugin-plugin + ${version.org.apache.maven.maven-core} + org.apache.maven.plugins diff --git a/tests/pom.xml b/tests/pom.xml index 4f83122e..735ac13d 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -68,13 +68,13 @@ test - org.eclipse.aether - aether-connector-basic + org.apache.maven.resolver + maven-resolver-connector-basic test - org.eclipse.aether - aether-transport-http + org.apache.maven.resolver + maven-resolver-transport-http test