diff --git a/pom.xml b/pom.xml index fabae5b..04c1a46 100644 --- a/pom.xml +++ b/pom.xml @@ -10,14 +10,8 @@ servicecomb http://maven.apache.org - - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - UTF-8 - 2.3.56 1.8 1.8 com.huawei.servicecomb.ServicecombspringmvcApplication @@ -26,9 +20,9 @@ - com.huawei.paas.cse - cse-dependency - ${cse.version} + org.apache.servicecomb + java-chassis-dependencies + 2.5.0 pom import @@ -37,33 +31,32 @@ - com.huawei.paas.cse - cse-solution-service-engine + org.apache.servicecomb + solution-basic org.apache.servicecomb - spring-boot-starter-provider + registry-service-center - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-logging - - + org.apache.servicecomb + servicestage-environment - org.springframework.boot - spring-boot-starter-log4j - 1.3.8.RELEASE + org.apache.servicecomb + registry-service-center junit junit + 4.12 test + + org.apache.servicecomb + java-chassis-spring-boot-starter-servlet + + diff --git a/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java b/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java index eb57b35..64c9aa6 100644 --- a/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java +++ b/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java @@ -1,6 +1,6 @@ package com.huawei.servicecomb; -import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot2.starter.EnableServiceComb; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/resources/META-INF/spring/cse.servicecombspringmvc.bean.xml b/src/main/resources/META-INF/spring/cse.servicecombspringmvc.bean.xml deleted file mode 100644 index 62edc2a..0000000 --- a/src/main/resources/META-INF/spring/cse.servicecombspringmvc.bean.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file