Skip to content

Commit

Permalink
Merge pull request alibaba#1371 from mercyblitz/greenwich
Browse files Browse the repository at this point in the history 
[Feature] Synchronizing source code to Spring Cloud Alibaba greenwich branch
  • Loading branch information
@mercyblitz
mercyblitz authored Apr 14, 2020
2 parents 4b6e101 + 8f5da17 commit 96b5db6
Show file tree
Hide file tree
Showing 74 changed files with 773 additions and 197 deletions.
2 changes: 1 addition & 1 deletion mvnw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export MAVEN_CMD_LINE_ARGS
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

echo "Running version check"
VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<revision' | head -1 | sed -e 's/.*<revision>//' -e 's!</revision>.*$!!' )
echo "The found version is [${VERSION}]"

if echo $VERSION | egrep -q 'M|RC'; then
Expand Down
113 changes: 107 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.1.10.RELEASE</version>
<version>2.1.11.RELEASE</version>
<relativePath/>
</parent>

<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Spring Cloud Alibaba</name>
<description>Spring Cloud Alibaba</description>
<url>https://github.com/alibaba/spring-cloud-alibaba</url>
<url>https://github.com/alibaba/spring-cloud-alibaba/tree/greenwich</url>

<licenses>
<license>
Expand Down Expand Up @@ -69,12 +69,22 @@
<name>yunzheng</name>
<email>[email protected]</email>
</developer>
<developer>
<id>theonefx</id>
<name>theonefx</name>
<email>[email protected]</email>
<organization>Alibaba</organization>
<url>https://github.com/theonefx</url>
</developer>
</developers>

<properties>
<!-- Project revision -->
<revision>2.1.2.RELEASE</revision>

<!-- Dependency Versions -->
<spring-cloud-commons.version>2.1.5.RELEASE</spring-cloud-commons.version>
<spring-cloud-config.version>2.1.6.RELEASE</spring-cloud-config.version>
<spring-cloud-config.version>2.1.7.RELEASE</spring-cloud-config.version>
<spring-cloud-consul.version>2.1.5.RELEASE</spring-cloud-consul.version>
<spring-cloud-gateway.version>2.1.5.RELEASE</spring-cloud-gateway.version>
<spring-cloud-netflix.version>2.1.5.RELEASE</spring-cloud-netflix.version>
Expand All @@ -88,7 +98,7 @@
<slf4j-api.version>1.7.25</slf4j-api.version>

<!-- Apache Dubbo -->
<dubbo.version>2.7.4.1</dubbo.version>
<dubbo.version>2.7.6</dubbo.version>
<curator.version>4.0.1</curator.version>

<!-- Apache RocketMQ -->
Expand All @@ -100,6 +110,10 @@
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
<jacoco.version>0.8.3</jacoco.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
</properties>

<modules>
Expand Down Expand Up @@ -304,7 +318,7 @@
</goals>
<configuration>
<!-- Checkstyle rules inherited from spring-cloud-build -->
<suppressionsLocation>eclipse/checkstyle-suppressions.xml</suppressionsLocation>
<suppressionsLocation>${session.executionRootDirectory}/eclipse/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
Expand Down Expand Up @@ -411,6 +425,93 @@
</pluginRepositories>
</profile>

<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</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>
</build>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</profile>

</profiles>


Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-coverage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
109 changes: 105 additions & 4 deletions spring-cloud-alibaba-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,23 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>2.2.0.RELEASE</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>2.1.11.RELEASE</version>
<relativePath/>
</parent>

<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Spring Cloud Alibaba Dependencies</name>
<description>Spring Cloud Alibaba Dependencies</description>

<properties>
<!-- Project revision -->
<revision>2.1.2.RELEASE</revision>

<sentinel.version>1.7.1</sentinel.version>
<oss.version>3.1.0</oss.version>
<seata.version>1.1.0</seata.version>
Expand All @@ -32,7 +35,13 @@
<aliyun.java.sdk.dysmsapi>1.1.0</aliyun.java.sdk.dysmsapi>
<aliyun.sdk.mns>1.1.8.6</aliyun.sdk.mns>
<aliyun.java.sdk.dyvmsapi>1.1.1</aliyun.java.sdk.dyvmsapi>
<spring.context.support.version>1.0.5</spring.context.support.version>
<spring.context.support.version>1.0.6</spring.context.support.version>

<!-- Maven Plugin Versions -->
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -93,6 +102,12 @@
<version>${sentinel.version}</version>
</dependency>

<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-consul</artifactId>
<version>${sentinel.version}</version>
</dependency>

<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-web-servlet</artifactId>
Expand Down Expand Up @@ -318,5 +333,91 @@
</pluginRepositories>
</profile>

<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</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>
</build>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Spring Cloud Alibaba BOM 包含了它所使用的所有依赖的版本。
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ If you’re a Maven Central user, add our BOM to your pom.xml <dependencyManagem
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
7 changes: 3 additions & 4 deletions spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
<parent>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-examples</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>


<artifactId>nacos-config-example</artifactId>
<packaging>jar</packaging>
<name>Spring Cloud Starter Alibaba Nacos Config Example</name>
<description>Example demonstrating how to use nacos config</description>

<packaging>jar</packaging>

<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...a-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<parent>
<groupId>com.alibaba.cloud</groupId>
<artifactId>nacos-discovery-example</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>


<artifactId>nacos-discovery-consumer-example</artifactId>
<packaging>jar</packaging>
<name>Spring Cloud Starter Alibaba Nacos Discovery Consumer Example</name>
<description>Example demonstrating how to use nacos discovery</description>

<packaging>jar</packaging>

<dependencies>
<dependency>
Expand Down
Loading

0 comments on commit 96b5db6

Please sign in to comment.