You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/02/21 14:06:23 UTC
[servicecomb-pack] branch master updated: SCB-1142 Clean up the
alpha-spring-boot-starter
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new 6612126 SCB-1142 Clean up the alpha-spring-boot-starter
6612126 is described below
commit 6612126735c1ad99292b0f83ba4b57df6ec3699e
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Thu Feb 21 16:23:53 2019 +0800
SCB-1142 Clean up the alpha-spring-boot-starter
---
alpha/alpha-server/pom.xml | 32 ++++++++++++++++------
.../alpha-spring-boot-1-starter/pom.xml | 6 ++--
.../alpha-spring-boot-2-starter/pom.xml | 6 ++--
alpha/alpha-spring-boot-compatibility/pom.xml | 2 +-
pom.xml | 10 +++++++
5 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index 47ecbcb..76b1597 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -55,11 +55,6 @@
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring.cloud.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>alpha-spring-boot-starter</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -172,10 +167,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>alpha-spring-boot-starter</artifactId>
- </dependency>
</dependencies>
<build>
@@ -222,6 +213,29 @@
</build>
</profile>
<profile>
+ <id>spring-boot-2</id>
+ <!-- Specify the alpha spring boot starter with the profile-->
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb.pack</groupId>
+ <artifactId>alpha-spring-boot-starter-2</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>spring-boot-1</id>
+ <!-- Specify the alpha spring boot starter with the profile-->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb.pack</groupId>
+ <artifactId>alpha-spring-boot-starter-1</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>mysql</id>
<dependencies>
<dependency>
diff --git a/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-1-starter/pom.xml b/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-1-starter/pom.xml
index 31e890b..32bd0b8 100644
--- a/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-1-starter/pom.xml
+++ b/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-1-starter/pom.xml
@@ -20,15 +20,14 @@
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>alpha</artifactId>
+ <artifactId>alpha-spring-boot-compatibility</artifactId>
<groupId>org.apache.servicecomb.pack</groupId>
<version>0.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>alpha-spring-boot-starter</artifactId>
+ <artifactId>alpha-spring-boot-starter-1</artifactId>
<name>Pack::Alpha::Spring Boot 1.X Starter</name>
- <version>${spring.boot1.version}</version>
<dependencyManagement>
<dependencies>
@@ -51,6 +50,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- TODO need to change the dependency with different profile -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
diff --git a/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-2-starter/pom.xml b/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-2-starter/pom.xml
index d82ff98..32960be 100644
--- a/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-2-starter/pom.xml
+++ b/alpha/alpha-spring-boot-compatibility/alpha-spring-boot-2-starter/pom.xml
@@ -20,15 +20,14 @@
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>alpha</artifactId>
+ <artifactId>alpha-spring-boot-compatibility</artifactId>
<groupId>org.apache.servicecomb.pack</groupId>
<version>0.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>alpha-spring-boot-starter</artifactId>
+ <artifactId>alpha-spring-boot-starter-2</artifactId>
<name>Pack::Alpha::Spring Boot 2.X Starter</name>
- <version>${spring.boot2.version}</version>
<dependencyManagement>
<dependencies>
@@ -51,6 +50,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- TODO need to change the dependency with different profile -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
diff --git a/alpha/alpha-spring-boot-compatibility/pom.xml b/alpha/alpha-spring-boot-compatibility/pom.xml
index cbe3e33..c2bdc63 100644
--- a/alpha/alpha-spring-boot-compatibility/pom.xml
+++ b/alpha/alpha-spring-boot-compatibility/pom.xml
@@ -20,7 +20,7 @@
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>pack</artifactId>
+ <artifactId>alpha</artifactId>
<groupId>org.apache.servicecomb.pack</groupId>
<version>0.4.0-SNAPSHOT</version>
</parent>
diff --git a/pom.xml b/pom.xml
index e93c57e..60d8166 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,6 +313,16 @@
<artifactId>pack-common</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.pack</groupId>
+ <artifactId>alpha-spring-boot-starter-1</artifactId>
+ <version>0.4.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.pack</groupId>
+ <artifactId>alpha-spring-boot-starter-2</artifactId>
+ <version>0.4.0-SNAPSHOT</version>
+ </dependency>
<!-- TODO rename this artifact -->
<dependency>
<groupId>org.apache.servicecomb.pack</groupId>