version up springcloud to 1.4.0 and related modules (#1272)

* version up springcloud to 1.4.0 and related modules
This commit is contained in:
Wang Mingliang 2021-01-28 09:52:38 +08:00 коммит произвёл GitHub
Родитель 14923da51e
Коммит 0bf705551b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
12 изменённых файлов: 198 добавлений и 36 удалений

Просмотреть файл

@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<relativePath>../azure-maven-plugins-pom</relativePath>
</parent>

Просмотреть файл

@ -7,12 +7,12 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<relativePath>../azure-maven-plugins-pom</relativePath>
</parent>
<artifactId>azure-maven-plugin-lib</artifactId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
<packaging>jar</packaging>
<name>Azure Maven Plugin Library</name>
<description>Common library for Azure Maven Plugins</description>
@ -166,7 +166,6 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-auth-lib</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>

Просмотреть файл

@ -4,7 +4,7 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<packaging>pom</packaging>
<name>Maven Plugins for Azure</name>
<description>Maven plugins for Microsoft Azure services</description>
@ -38,6 +38,9 @@
<maven.shared-utils.version>3.2.1</maven.shared-utils.version>
<maven.version>3.3.3</maven.version>
<azure.toolkit-lib.version>0.1.0</azure.toolkit-lib.version>
<azure.tools-common.version>0.11.0</azure.tools-common.version>
<azure.maven-plugin-lib.version>1.6.0</azure.maven-plugin-lib.version>
<azure.ai.version>2.6.2</azure.ai.version>
<azure.applicationinsights-web.version>[2.0,)</azure.applicationinsights-web.version>
<azure.appplatform-sdk.version>1.0.0-beta</azure.appplatform-sdk.version>
@ -45,10 +48,8 @@
<azure.eventhubs.version>1.2.0</azure.eventhubs.version>
<azure.eventhubs-eph.version>2.0.1</azure.eventhubs-eph.version>
<azure.function.version>1.4.2-SNAPSHOT</azure.function.version>
<azure.maven-plugin-lib.version>1.6.0-SNAPSHOT</azure.maven-plugin-lib.version>
<azure.mgmt-insights.version>1.0.0-beta</azure.mgmt-insights.version>
<azure.storage-blob.version>11.0.1</azure.storage-blob.version>
<azure.tools-common.version>0.11.0-SNAPSHOT</azure.tools-common.version>
<azure.version>1.38.1</azure.version>
<codehaus.plexus-utils.version>3.3.0</codehaus.plexus-utils.version>
@ -104,13 +105,18 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-common-lib</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${azure.toolkit-lib.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-springcloud-lib</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${azure.toolkit-lib.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-auth-lib</artifactId>
<version>${azure.toolkit-lib.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.microsoft.azure.applicationinsights.v2015_05_01/azure-mgmt-insights -->

Просмотреть файл

@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<relativePath>../azure-maven-plugins-pom</relativePath>
</parent>

Просмотреть файл

@ -7,12 +7,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>azure-spring-cloud-maven-plugin</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.0</version>
<packaging>maven-plugin</packaging>
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<relativePath>../azure-maven-plugins-pom</relativePath>
</parent>
<name>Azure Spring Cloud Maven Plugin</name>
@ -43,7 +43,10 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-auth-lib</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-common-lib</artifactId>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
@ -199,10 +202,6 @@
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-common-lib</artifactId>
</dependency>
</dependencies>
<build>

Просмотреть файл

@ -5,7 +5,7 @@
<parent>
<artifactId>azure-toolkit-libs</artifactId>
<groupId>com.microsoft.azure</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -80,6 +80,30 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<show>private</show>
<failOnError>false</failOnError>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

Просмотреть файл

@ -5,7 +5,7 @@
<parent>
<artifactId>azure-toolkit-libs</artifactId>
<groupId>com.microsoft.azure</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -59,6 +59,30 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<show>private</show>
<failOnError>false</failOnError>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

Просмотреть файл

@ -5,7 +5,7 @@
<parent>
<artifactId>azure-toolkit-libs</artifactId>
<groupId>com.microsoft.azure</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -56,6 +56,30 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<show>private</show>
<failOnError>false</failOnError>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

Просмотреть файл

@ -1,14 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-libs</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.1.0</version>
<packaging>pom</packaging>
<name>Libs for Azure Toolkits</name>
<description>Wrapped libs for Microsoft Azure Toolkits</description>
<url>https://github.com/microsoft/azure-maven-plugins</url>
<licenses>
<license>
<name>MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/microsoft/azure-maven-plugins</connection>
<developerConnection>scm:git:git@github.com:microsoft/azure-maven-plugins</developerConnection>
<url>https://github.com/microsoft/azure-maven-plugins</url>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<id>wangmingliang-ms</id>
<name>Wang Mingliang</name>
<email>wangmi@microsoft.com</email>
</developer>
</developers>
<modules>
<module>azure-toolkit-common-lib</module>
@ -19,6 +43,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<azure.toolkit-lib.version>${project.version}</azure.toolkit-lib.version>
<maven.build.timestamp.format>yyyyMMddHHmmssSSS</maven.build.timestamp.format>
<maven.compiler.source>1.8</maven.compiler.source>
@ -90,7 +115,6 @@
<google.jsr305.version>3.0.0</google.jsr305.version>
<azure.azure-mgmt-appplatform.version>1.0.0-beta</azure.azure-mgmt-appplatform.version>
<azure.toolkit.common.lib.version>0.0.1-SNAPSHOT</azure.toolkit.common.lib.version>
<azure-identity.version>1.2.1</azure-identity.version>
<azure.version>1.36.3</azure.version>
<lombok.version>1.18.8</lombok.version>
@ -100,6 +124,13 @@
<dependencyManagement>
<dependencies>
<!-- azure toolkit libs -->
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-common-lib</artifactId>
<version>${azure.toolkit-lib.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
@ -270,13 +301,6 @@
<artifactId>azure-identity</artifactId>
<version>${azure-identity.version}</version>
</dependency>
<!-- azure toolkit libs -->
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-common-lib</artifactId>
<version>${azure.toolkit.common.lib.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
@ -287,6 +311,69 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven.jar-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<show>private</show>
<failOnError>false</failOnError>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven.source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

Просмотреть файл

@ -5,11 +5,11 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<relativePath>../azure-maven-plugins-pom</relativePath>
</parent>
<artifactId>azure-tools-common</artifactId>
<version>0.11.0-SNAPSHOT</version>
<version>0.11.0</version>
<repositories>
<repository>
@ -181,7 +181,6 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-toolkit-common-lib</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>

Просмотреть файл

@ -7,7 +7,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<relativePath>../azure-maven-plugins-pom</relativePath>
</parent>

Просмотреть файл

@ -7,7 +7,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-maven-plugins-pom</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
<relativePath>../azure-maven-plugins-pom</relativePath>
</parent>
<artifactId>maven-plugins-build-tools</artifactId>