diff --git a/azure-functions-maven-plugin/pom.xml b/azure-functions-maven-plugin/pom.xml index c57e69d7b..a3243b985 100644 --- a/azure-functions-maven-plugin/pom.xml +++ b/azure-functions-maven-plugin/pom.xml @@ -5,9 +5,8 @@ com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - ../azure-maven-plugins-pom + azure-maven-plugins + 1.10.0-SNAPSHOT azure-functions-maven-plugin diff --git a/azure-maven-plugin-lib/pom.xml b/azure-maven-plugin-lib/pom.xml index 67539dd56..4dec2b011 100644 --- a/azure-maven-plugin-lib/pom.xml +++ b/azure-maven-plugin-lib/pom.xml @@ -6,14 +6,11 @@ com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - ../azure-maven-plugins-pom + azure-maven-plugins + 1.10.0-SNAPSHOT azure-maven-plugin-lib - 1.10.0-SNAPSHOT - jar Azure Maven Plugin Library Common library for Azure Maven Plugins https://github.com/microsoft/azure-maven-plugins diff --git a/azure-maven-plugins-pom/pom.xml b/azure-maven-plugins-pom/pom.xml deleted file mode 100644 index dc8023075..000000000 --- a/azure-maven-plugins-pom/pom.xml +++ /dev/null @@ -1,668 +0,0 @@ - - 4.0.0 - - com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - pom - Maven Plugins for Azure - Maven plugins for Microsoft Azure services - https://github.com/microsoft/azure-maven-plugins - - - - MIT License - https://opensource.org/licenses/MIT - repo - - - - - scm:git:https://github.com/microsoft/azure-maven-plugins - scm:git:git@github.com:microsoft/azure-maven-plugins - https://github.com/microsoft/azure-maven-plugins - HEAD - - - - UTF-8 - UTF-8 - - yyyyMMddHHmmssSSS - 1.8 - 1.8 - 3.0.0 - 3.3.0 - 3.3 - 3.2.1 - 3.3.3 - - 0.7.0-SNAPSHOT - 0.15.0-SNAPSHOT - 1.10.0-SNAPSHOT - - 2.6.2 - [2.0,) - 1.0.0-beta - 1.7.12 - 1.2.0 - 2.0.1 - 1.4.2 - 1.0.0-beta - 11.0.1 - 1.38.1 - - 3.3.0 - 1.15 - 4.4 - 2.8.0 - 3.11 - 3.7.2 - 2.1.3 - 2.5.1 - 1.2.2 - 2.8.6 - 30.1-jre - 4.5.13 - 2.12.1 - 0.8.6 - 1.17.1 - 2.3.2 - 2.2.14 - 0.9.1 - 5.87.0.RELEASE - 4.13.1 - 1.18.16 - 1.6 - 3.9.0 - 0.9.12 - 0.9.0 - 1.7.29 - 3.4.1 - 1.27 - 4.1.6.RELEASE - 1.14 - - 3.1.0 - 3.0.2 - 2.2.1 - 3.8.0 - 3.6.0 - 2.22.1 - 3.0.2 - 2.5.2 - 2.8.2 - 3.1.0 - 2.9.1 - 3.1.0 - 4.9.1 - - - - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp.version} - - - com.squareup.okhttp3 - okhttp-urlconnection - ${okhttp.version} - - - com.microsoft.azure - azure-toolkit-common-lib - ${azure.toolkit-lib.version} - compile - - - com.microsoft.azure - azure-toolkit-springcloud-lib - ${azure.toolkit-lib.version} - - - com.microsoft.azure - azure-toolkit-auth-lib - ${azure.toolkit-lib.version} - - - com.microsoft.azure - azure-toolkit-appservice-lib - ${azure.toolkit-lib.version} - - - - - com.microsoft.azure.applicationinsights.v2015_05_01 - azure-mgmt-insights - ${azure.mgmt-insights.version} - - - com.google.errorprone - error_prone_core - ${error.prone.core.version} - - - com.google.guava - guava - - - - - com.microsoft.azure - azure-arm-client-runtime - ${azure.client.version} - - - com.microsoft.azure - azure-client-runtime - ${azure.client.version} - - - com.microsoft.rest - client-runtime - ${azure.client.version} - - - com.google.guava - guava - - - - - org.zeroturnaround - zt-zip - ${zt.zip.version} - - - org.apache.maven - maven-core - ${maven.version} - provided - - - com.google.errorprone - error_prone_annotations - - - com.google.code.findbugs - jsr305 - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - io.jsonwebtoken - jjwt - ${jsonwebtoken.jjwt.version} - - - com.microsoft.azure - azure - ${azure.version} - - - com.google.guava - guava - - - org.apache.httpcomponents - httpcore - - - - - com.microsoft.azure - azure-mgmt-resources - ${azure.version} - - - org.apache.httpcomponents - httpcore - - - - - commons-io - commons-io - ${commons.io.version} - - - com.microsoft.azure - azure-client-authentication - ${azure.client.version} - - - org.apache.commons - commons-lang3 - ${commons.lang3.version} - - - org.apache.commons - commons-collections4 - ${commons.collections4.version} - - - com.microsoft.azure - applicationinsights-core - ${azure.ai.version} - - - com.google.guava - guava - - - - - org.apache.maven - maven-plugin-api - ${maven.version} - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin-tools.version} - provided - - - org.apache.maven - maven-settings - ${maven.version} - - - org.apache.maven - maven-settings-builder - ${maven.version} - - - org.apache.maven - maven-model - ${maven.version} - - - org.apache.maven - maven-model-builder - ${maven.version} - test - - - org.codehaus.plexus - plexus-utils - ${codehaus.plexus-utils.version} - - - com.microsoft.azure - azure-maven-plugin-lib - ${azure.maven-plugin-lib.version} - - - com.microsoft.azure.functions - azure-functions-java-library - ${azure.function.version} - - - org.reflections - reflections - ${reflections.version} - - - com.google.guava - guava - - - - - com.github.zafarkhaja - java-semver - ${semver.version} - - - com.microsoft.azure - azure-tools-common - ${azure.tools-common.version} - - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jaxb.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb.version} - - - com.google.code.gson - gson - ${gson.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - com.github.java-json-tools - json-schema-validator - ${json.schema.validator.version} - - - com.google.guava - guava - - - - - com.google.guava - guava - ${guava.version} - - - com.google.errorprone - error_prone_annotations - - - com.google.code.findbugs - jsr305 - - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - org.apache.maven.shared - maven-filtering - ${maven.filtering.version} - - - commons-net - commons-net - ${commons.net.version} - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - org.beryx - text-io - ${text-io.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.microsoft.azure - applicationinsights-web - ${azure.applicationinsights-web.version} - - - - org.dom4j - dom4j - ${dom4j.version} - - - org.atteo - evo-inflector - ${evo-inflector.version} - - - org.yaml - snakeyaml - ${snakeyaml.version} - - - org.jtwig - jtwig-core - ${jtwig.core.version} - - - com.google.guava - guava - - - - - org.commonjava.maven - maven3-model-jdom-support - ${maven3-model-jdom-support.version} - - - com.microsoft.azure - azure-storage-blob - ${azure.storage-blob.version} - - - org.apache.maven.shared - maven-shared-utils - ${maven.shared-utils.version} - - - - com.microsoft.azure.appplatform.v2020_07_01 - azure-mgmt-appplatform - ${azure.appplatform-sdk.version} - - - com.microsoft.azure - azure-client-runtime - - - - - org.apache.maven - maven-artifact - ${maven.version} - provided - - - - - commons-codec - commons-codec - ${commons.codec.version} - - - org.springframework - spring-test - ${spring-test.version} - test - - - com.microsoft.azure - azure-eventhubs - ${azure.eventhubs.version} - test - - - com.microsoft.azure - azure-eventhubs-eph - ${azure.eventhubs-eph.version} - - - com.fasterxml.jackson.core - jackson-core - - - test - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.apache.maven - maven-compat - ${maven.version} - test - - - org.apache.maven.plugin-testing - maven-plugin-testing-harness - ${maven.plugin-testing-harness.version} - test - - - org.jacoco - org.jacoco.agent - ${jacoco.version} - runtime - - - - - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - true - default - - - - - - xscript - Kevin Zhao - kevinzha@microsoft.com - - - - - - - - - maven-clean-plugin - ${maven.clean-plugin.version} - - - org.apache.maven.plugins - maven-dependency-plugin - 3.1.2 - - - maven-resources-plugin - ${maven.resources-plugin.version} - - - maven-source-plugin - ${maven.source-plugin.version} - - - maven-compiler-plugin - ${maven.compiler-plugin.version} - - - maven-plugin-plugin - ${maven.plugin-plugin.version} - - - maven-surefire-plugin - ${maven.surefire-plugin.version} - - - maven-jar-plugin - ${maven.jar-plugin.version} - - - maven-install-plugin - ${maven.install-plugin.version} - - - maven-deploy-plugin - ${maven.deploy-plugin.version} - - - maven-invoker-plugin - ${maven.invoker-plugin.version} - - - maven-javadoc-plugin - ${maven.javadoc-plugin.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle-plugin.version} - - - com.microsoft.azure - maven-plugins-build-tools - 1.0.1-SNAPSHOT - - - com.puppycrawl.tools - checkstyle - 8.29 - - - - checkstyle/checkstyle.xml - checkstyle/checkstyle-suppressions.xml - checkstyle/java.header - UTF-8 - true - true - true - false - - - - verify - - check - - - - - - - - diff --git a/azure-sfmesh-maven-plugin/pom.xml b/azure-sfmesh-maven-plugin/pom.xml index 84dbc4785..d02bd364d 100644 --- a/azure-sfmesh-maven-plugin/pom.xml +++ b/azure-sfmesh-maven-plugin/pom.xml @@ -7,9 +7,8 @@ com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - ../azure-maven-plugins-pom + azure-maven-plugins + 1.10.0-SNAPSHOT azure-sfmesh-maven-plugin diff --git a/azure-spring-cloud-maven-plugin/pom.xml b/azure-spring-cloud-maven-plugin/pom.xml index 5088ade2b..4c0ff6dbb 100644 --- a/azure-spring-cloud-maven-plugin/pom.xml +++ b/azure-spring-cloud-maven-plugin/pom.xml @@ -11,9 +11,8 @@ maven-plugin com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - ../azure-maven-plugins-pom + azure-maven-plugins + 1.10.0-SNAPSHOT Azure Spring Cloud Maven Plugin diff --git a/azure-tools-common/pom.xml b/azure-tools-common/pom.xml index 1f733e8a9..c21049193 100644 --- a/azure-tools-common/pom.xml +++ b/azure-tools-common/pom.xml @@ -2,14 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - ../azure-maven-plugins-pom + azure-maven-plugins + 1.10.0-SNAPSHOT azure-tools-common - 0.15.0-SNAPSHOT diff --git a/azure-webapp-maven-plugin/pom.xml b/azure-webapp-maven-plugin/pom.xml index b010396b9..bdbb55089 100644 --- a/azure-webapp-maven-plugin/pom.xml +++ b/azure-webapp-maven-plugin/pom.xml @@ -6,9 +6,8 @@ com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - ../azure-maven-plugins-pom + azure-maven-plugins + 1.10.0-SNAPSHOT azure-webapp-maven-plugin diff --git a/build-tools/pom.xml b/build-tools/pom.xml index 522680de0..1166537ae 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -6,10 +6,8 @@ 4.0.0 com.microsoft.azure - azure-maven-plugins-pom - 1.2.0-SNAPSHOT - ../azure-maven-plugins-pom + azure-maven-plugins + 1.10.0-SNAPSHOT maven-plugins-build-tools - 1.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index f7522fece..9f075a549 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 - com.microsoft.azure azure-maven-plugins - 1.0.0-SNAPSHOT + 1.10.0-SNAPSHOT pom Maven Plugins for Azure Maven plugins for Microsoft Azure services @@ -25,6 +26,14 @@ HEAD + + + xscript + Kevin Zhao + kevinzha@microsoft.com + + + ossrh @@ -35,17 +44,8 @@ - - - xscript - Kevin Zhao - kevinzha@microsoft.com - - - build-tools - azure-maven-plugins-pom azure-tools-common azure-toolkit-libs azure-maven-plugin-lib @@ -54,4 +54,626 @@ azure-sfmesh-maven-plugin azure-spring-cloud-maven-plugin + + + UTF-8 + UTF-8 + + yyyyMMddHHmmssSSS + 1.8 + 1.8 + 3.0.0 + 3.3.0 + 3.3 + 3.2.1 + 3.3.3 + + 0.7.0-SNAPSHOT + 1.10.0-SNAPSHOT + + 2.6.2 + [2.0,) + 1.0.0-beta + 1.7.12 + 1.2.0 + 2.0.1 + 1.4.2 + 1.0.0-beta + 11.0.1 + 1.38.1 + + 3.3.0 + 1.15 + 4.4 + 2.8.0 + 3.11 + 3.7.2 + 2.1.3 + 2.5.1 + 1.2.2 + 2.8.6 + 30.1-jre + 4.5.13 + 2.12.1 + 0.8.6 + 1.17.1 + 2.3.2 + 2.2.14 + 0.9.1 + 5.87.0.RELEASE + 4.13.1 + 1.18.16 + 1.6 + 3.9.0 + 0.9.12 + 0.9.0 + 1.7.29 + 3.4.1 + 1.27 + 4.1.6.RELEASE + 1.14 + + 3.1.0 + 3.0.2 + 2.2.1 + 3.8.0 + 3.6.0 + 2.22.1 + 3.0.2 + 2.5.2 + 2.8.2 + 3.1.0 + 2.9.1 + 3.1.0 + 4.9.1 + + + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + com.squareup.okhttp3 + logging-interceptor + ${okhttp.version} + + + com.squareup.okhttp3 + okhttp-urlconnection + ${okhttp.version} + + + com.microsoft.azure + azure-toolkit-common-lib + ${azure.toolkit-lib.version} + compile + + + com.microsoft.azure + azure-toolkit-springcloud-lib + ${azure.toolkit-lib.version} + + + com.microsoft.azure + azure-toolkit-auth-lib + ${azure.toolkit-lib.version} + + + com.microsoft.azure + azure-toolkit-appservice-lib + ${azure.toolkit-lib.version} + + + + + com.microsoft.azure.applicationinsights.v2015_05_01 + azure-mgmt-insights + ${azure.mgmt-insights.version} + + + com.google.errorprone + error_prone_core + ${error.prone.core.version} + + + com.google.guava + guava + + + + + com.microsoft.azure + azure-arm-client-runtime + ${azure.client.version} + + + com.microsoft.azure + azure-client-runtime + ${azure.client.version} + + + com.microsoft.rest + client-runtime + ${azure.client.version} + + + com.google.guava + guava + + + + + org.zeroturnaround + zt-zip + ${zt.zip.version} + + + org.apache.maven + maven-core + ${maven.version} + provided + + + com.google.errorprone + error_prone_annotations + + + com.google.code.findbugs + jsr305 + + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + io.jsonwebtoken + jjwt + ${jsonwebtoken.jjwt.version} + + + com.microsoft.azure + azure + ${azure.version} + + + com.google.guava + guava + + + org.apache.httpcomponents + httpcore + + + + + com.microsoft.azure + azure-mgmt-resources + ${azure.version} + + + org.apache.httpcomponents + httpcore + + + + + commons-io + commons-io + ${commons.io.version} + + + com.microsoft.azure + azure-client-authentication + ${azure.client.version} + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + org.apache.commons + commons-collections4 + ${commons.collections4.version} + + + com.microsoft.azure + applicationinsights-core + ${azure.ai.version} + + + com.google.guava + guava + + + + + org.apache.maven + maven-plugin-api + ${maven.version} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin-tools.version} + provided + + + org.apache.maven + maven-settings + ${maven.version} + + + org.apache.maven + maven-settings-builder + ${maven.version} + + + org.apache.maven + maven-model + ${maven.version} + + + org.apache.maven + maven-model-builder + ${maven.version} + test + + + org.codehaus.plexus + plexus-utils + ${codehaus.plexus-utils.version} + + + com.microsoft.azure + azure-maven-plugin-lib + ${azure.maven-plugin-lib.version} + + + com.microsoft.azure.functions + azure-functions-java-library + ${azure.function.version} + + + org.reflections + reflections + ${reflections.version} + + + com.google.guava + guava + + + + + com.github.zafarkhaja + java-semver + ${semver.version} + + + com.microsoft.azure + azure-tools-common + ${azure.maven-plugin-lib.version} + + + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jaxb.version} + + + org.glassfish.jaxb + jaxb-runtime + ${jaxb.version} + + + com.google.code.gson + gson + ${gson.version} + + + org.fusesource.jansi + jansi + ${jansi.version} + + + com.github.java-json-tools + json-schema-validator + ${json.schema.validator.version} + + + com.google.guava + guava + + + + + com.google.guava + guava + ${guava.version} + + + com.google.errorprone + error_prone_annotations + + + com.google.code.findbugs + jsr305 + + + + + org.projectlombok + lombok + ${lombok.version} + provided + + + org.apache.maven.shared + maven-filtering + ${maven.filtering.version} + + + commons-net + commons-net + ${commons.net.version} + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + org.beryx + text-io + ${text-io.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.microsoft.azure + applicationinsights-web + ${azure.applicationinsights-web.version} + + + + org.dom4j + dom4j + ${dom4j.version} + + + org.atteo + evo-inflector + ${evo-inflector.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + org.jtwig + jtwig-core + ${jtwig.core.version} + + + com.google.guava + guava + + + + + org.commonjava.maven + maven3-model-jdom-support + ${maven3-model-jdom-support.version} + + + com.microsoft.azure + azure-storage-blob + ${azure.storage-blob.version} + + + org.apache.maven.shared + maven-shared-utils + ${maven.shared-utils.version} + + + + com.microsoft.azure.appplatform.v2020_07_01 + azure-mgmt-appplatform + ${azure.appplatform-sdk.version} + + + com.microsoft.azure + azure-client-runtime + + + + + org.apache.maven + maven-artifact + ${maven.version} + provided + + + + + commons-codec + commons-codec + ${commons.codec.version} + + + org.springframework + spring-test + ${spring-test.version} + test + + + com.microsoft.azure + azure-eventhubs + ${azure.eventhubs.version} + test + + + com.microsoft.azure + azure-eventhubs-eph + ${azure.eventhubs-eph.version} + + + com.fasterxml.jackson.core + jackson-core + + + test + + + junit + junit + ${junit.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.apache.maven + maven-compat + ${maven.version} + test + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + ${maven.plugin-testing-harness.version} + test + + + org.jacoco + org.jacoco.agent + ${jacoco.version} + runtime + + + + + + + + + + maven-clean-plugin + ${maven.clean-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.2 + + + maven-resources-plugin + ${maven.resources-plugin.version} + + + maven-source-plugin + ${maven.source-plugin.version} + + + maven-compiler-plugin + ${maven.compiler-plugin.version} + + + maven-plugin-plugin + ${maven.plugin-plugin.version} + + + maven-surefire-plugin + ${maven.surefire-plugin.version} + + + maven-jar-plugin + ${maven.jar-plugin.version} + + + maven-install-plugin + ${maven.install-plugin.version} + + + maven-deploy-plugin + ${maven.deploy-plugin.version} + + + maven-invoker-plugin + ${maven.invoker-plugin.version} + + + maven-javadoc-plugin + ${maven.javadoc-plugin.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle-plugin.version} + + + com.microsoft.azure + maven-plugins-build-tools + 1.10.0-SNAPSHOT + + + com.puppycrawl.tools + checkstyle + 8.29 + + + + checkstyle/checkstyle.xml + checkstyle/checkstyle-suppressions.xml + checkstyle/java.header + UTF-8 + true + true + true + false + + + + verify + + check + + + + + + +