forked from alibaba/spring-cloud-alibaba
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request alibaba#5 from spring-cloud-incubator/master
Merge
- Loading branch information
Showing
162 changed files
with
6,021 additions
and
1,527 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| version: 2 | ||
| jobs: | ||
| build: | ||
| docker: | ||
| - image: springcloud/pipeline-base | ||
| user: appuser | ||
| environment: | ||
| _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" | ||
| TERM: dumb | ||
| branches: | ||
| ignore: | ||
| - gh-pages # list of branches to ignore | ||
| resource_class: large | ||
| steps: | ||
| - checkout | ||
| - restore_cache: | ||
| key: sc-alibaba-{{ .Branch }} | ||
| - run: | ||
| name: "Download dependencies" | ||
| command: ./mvnw -Pspring -U --fail-never dependency:go-offline || true | ||
| - save_cache: | ||
| key: sc-alibaba-{{ .Branch }} | ||
| paths: | ||
| - ~/.m2 | ||
| - run: | ||
| name: "Running build" | ||
| command: ./mvnw -Pspring clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn | ||
| - run: | ||
| name: "Aggregate test results" | ||
| when: always | ||
| command: | | ||
| mkdir -p ~/junit/ | ||
| find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \; | ||
| bash <(curl -s https://codecov.io/bash) | ||
| - store_artifacts: | ||
| path: ~/junit/ | ||
| destination: artifacts | ||
| - store_test_results: | ||
| path: ~/junit/ | ||
| destination: testartifacts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,4 +28,5 @@ hs_err_pid* | |
| .project | ||
| .settings | ||
| target | ||
| .DS_Store | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,13 +8,13 @@ | |
| <parent> | ||
| <groupId>org.springframework.cloud</groupId> | ||
| <artifactId>spring-cloud-build</artifactId> | ||
| <version>2.0.0.RELEASE</version> | ||
| <version>2.0.4.RELEASE</version> | ||
| <relativePath/> | ||
| </parent> | ||
|
|
||
| <groupId>org.springframework.cloud</groupId> | ||
| <artifactId>spring-cloud-alibaba</artifactId> | ||
| <version>0.2.0</version> | ||
| <version>0.2.1.BUILD-SNAPSHOT</version> | ||
| <packaging>pom</packaging> | ||
| <name>Spring Cloud Alibaba</name> | ||
|
|
||
|
|
@@ -28,12 +28,12 @@ | |
| </licenses> | ||
|
|
||
| <scm> | ||
| <url>https://github.com/spring-cloud-incubator/spring-cloud-alibabacloud</url> | ||
| <url>https://github.com/spring-cloud-incubator/spring-cloud-alibaba</url> | ||
| <connection> | ||
| scm:git:git://github.com/spring-cloud-incubator/spring-cloud-alibabacloud.git | ||
| scm:git:git://github.com/spring-cloud-incubator/spring-cloud-alibaba.git | ||
| </connection> | ||
| <developerConnection> | ||
| scm:git:ssh://[email protected]/spring-cloud-incubator/spring-cloud-alibabacloud.git | ||
| scm:git:ssh://[email protected]/spring-cloud-incubator/spring-cloud-alibaba.git | ||
| </developerConnection> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
|
|
@@ -47,6 +47,10 @@ | |
| <name>fangjian</name> | ||
| <email>[email protected]</email> | ||
| </developer> | ||
| <developer> | ||
| <name>xiaolongzuo</name> | ||
| <email>[email protected]</email> | ||
| </developer> | ||
| <developer> | ||
| <name>hengyunabc</name> | ||
| <email>[email protected]</email> | ||
|
|
@@ -55,9 +59,9 @@ | |
|
|
||
| <properties> | ||
| <!-- Dependency Versions --> | ||
| <spring-cloud-commons.version>2.0.0.RELEASE</spring-cloud-commons.version> | ||
| <spring-cloud-netflix.version>2.0.0.RELEASE</spring-cloud-netflix.version> | ||
| <spring-cloud-openfeign.version>2.0.0.RELEASE</spring-cloud-openfeign.version> | ||
| <spring-cloud-commons.version>2.0.2.RELEASE</spring-cloud-commons.version> | ||
| <spring-cloud-netflix.version>2.0.2.RELEASE</spring-cloud-netflix.version> | ||
| <spring-cloud-openfeign.version>2.0.2.RELEASE</spring-cloud-openfeign.version> | ||
|
|
||
| <junit.version>4.12</junit.version> | ||
| <javax-servlet-api>3.0</javax-servlet-api> | ||
|
|
@@ -74,14 +78,17 @@ | |
| <modules> | ||
| <module>spring-cloud-alibaba-dependencies</module> | ||
| <module>spring-cloud-alibaba-sentinel</module> | ||
|
|
||
| <module>spring-cloud-alibaba-sentinel-datasource</module> | ||
| <module>spring-cloud-alibaba-nacos-config</module> | ||
| <module>spring-cloud-alibaba-nacos-discovery</module> | ||
| <module>spring-cloud-alibaba-examples</module> | ||
| <module>spring-cloud-alibaba-test</module> | ||
| <module>spring-cloud-starter-alibaba</module> | ||
| <module>spring-cloud-starter-alicloud</module> | ||
| <module>spring-cloud-alicloud-oss</module> | ||
| <module>spring-cloud-alicloud-context</module> | ||
| <module>spring-cloud-alicloud-acm</module> | ||
| <module>spring-cloud-alicloud-ans</module> | ||
| </modules> | ||
|
|
||
| <dependencyManagement> | ||
|
|
@@ -154,4 +161,69 @@ | |
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <id>spring</id> | ||
| <repositories> | ||
| <repository> | ||
| <id>spring-snapshots</id> | ||
| <name>Spring Snapshots</name> | ||
| <url>https://repo.spring.io/libs-snapshot-local</url> | ||
| <snapshots> | ||
| <enabled>true</enabled> | ||
| </snapshots> | ||
| <releases> | ||
| <enabled>false</enabled> | ||
| </releases> | ||
| </repository> | ||
| <repository> | ||
| <id>spring-milestones</id> | ||
| <name>Spring Milestones</name> | ||
| <url>https://repo.spring.io/libs-milestone-local</url> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </repository> | ||
| <repository> | ||
| <id>spring-releases</id> | ||
| <name>Spring Releases</name> | ||
| <url>https://repo.spring.io/release</url> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </repository> | ||
| </repositories> | ||
| <pluginRepositories> | ||
| <pluginRepository> | ||
| <id>spring-snapshots</id> | ||
| <name>Spring Snapshots</name> | ||
| <url>https://repo.spring.io/libs-snapshot-local</url> | ||
| <snapshots> | ||
| <enabled>true</enabled> | ||
| </snapshots> | ||
| <releases> | ||
| <enabled>false</enabled> | ||
| </releases> | ||
| </pluginRepository> | ||
| <pluginRepository> | ||
| <id>spring-milestones</id> | ||
| <name>Spring Milestones</name> | ||
| <url>https://repo.spring.io/libs-milestone-local</url> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </pluginRepository> | ||
| <pluginRepository> | ||
| <id>spring-releases</id> | ||
| <name>Spring Releases</name> | ||
| <url>https://repo.spring.io/libs-release-local</url> | ||
| <snapshots> | ||
| <enabled>false</enabled> | ||
| </snapshots> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
| </profile> | ||
| </profiles> | ||
|
|
||
| </project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?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"> | ||
| <parent> | ||
| <artifactId>spring-cloud-alibaba-examples</artifactId> | ||
| <groupId>org.springframework.cloud</groupId> | ||
| <version>0.2.1.BUILD-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <artifactId>acm-local-example</artifactId> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.springframework.cloud</groupId> | ||
| <artifactId>spring-cloud-starter-alicloud-acm</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-web</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-actuator</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
34 changes: 34 additions & 0 deletions
34
...xample/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AcmApplication.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright (C) 2018 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.alibaba.cloud.examples; | ||
|
|
||
| import org.springframework.boot.SpringApplication; | ||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
| import org.springframework.cloud.client.discovery.EnableDiscoveryClient; | ||
|
|
||
| /** | ||
| * @author xiaolongzuo | ||
| */ | ||
| @SpringBootApplication | ||
| @EnableDiscoveryClient | ||
| public class AcmApplication { | ||
|
|
||
| public static void main(String[] args) { | ||
| SpringApplication.run(AcmApplication.class, args); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.