This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-692 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 15420827e6e383ca8568dcec6de738211f46fcc9 Author: Willem Jiang <[email protected]> AuthorDate: Sun Jul 22 10:34:40 2018 +0800 SCB-692 WIP Upgrade the version of java-chassis --- pom.xml | 3 ++- saga-core/pom.xml | 2 ++ .../apache/servicecomb/saga/demo/car/rental/CarRentalApplication.java | 2 +- .../apache/servicecomb/saga/demo/car/rental/CarRentalController.java | 4 ++-- .../saga/demo/flight/booking/FlightBookingApplication.java | 2 +- .../servicecomb/saga/demo/flight/booking/FlightBookingController.java | 4 ++-- .../saga/demo/hotel/reservation/HotelReservationApplication.java | 2 +- .../saga/demo/hotel/reservation/HotelReservationController.java | 4 ++-- .../org/apache/servicecomb/saga/demo/payment/PaymentApplication.java | 2 +- .../org/apache/servicecomb/saga/demo/payment/PaymentController.java | 4 ++-- saga-discovery/saga-discovery-servicecenter/pom.xml | 2 +- .../saga/discovery/service/center/ServiceCenterDiscoveryConfig.java | 4 ++-- .../saga-discovery-servicecenter/src/main/resources/microservice.yaml | 1 + .../servicecomb/saga/discovery/service/center/DummyController.java | 2 +- .../discovery/service/center/ServiceCenterDiscoveryApplication.java | 2 +- .../service/center/ServiceCenterDiscoveryRestTransportTest.java | 4 ++-- .../main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java | 2 +- 17 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 5ce27f6..e99b71e 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,8 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> <kamon.version>0.6.7</kamon.version> - <log4j.version>2.6.2</log4j.version> + <!-- using log4j 2.7 with Spring Boot 1.x --> + <log4j.version>2.7</log4j.version> <dubbo.version>2.6.1</dubbo.version> <spring.boot.version>1.5.14.RELEASE</spring.boot.version> <spring.boot2.version>2.0.3.RELEASE</spring.boot2.version> diff --git a/saga-core/pom.xml b/saga-core/pom.xml index 1cc1c61..68fe949 100644 --- a/saga-core/pom.xml +++ b/saga-core/pom.xml @@ -85,6 +85,8 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <!-- need to use this version of running the test --> + <version>1.10.19</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalApplication.java b/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalApplication.java index d3e0e95..ae9e5e5 100644 --- a/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalApplication.java +++ b/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalApplication.java @@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.demo.car.rental; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import io.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @SpringBootApplication @EnableServiceComb diff --git a/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalController.java b/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalController.java index 4a98141..68580e2 100644 --- a/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalController.java +++ b/saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalController.java @@ -38,8 +38,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import io.servicecomb.provider.rest.common.RestSchema; -import io.servicecomb.swagger.invocation.exception.InvocationException; +import org.apache.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.swagger.invocation.exception.InvocationException; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingApplication.java b/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingApplication.java index 5bee98d..d4a514c 100644 --- a/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingApplication.java +++ b/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingApplication.java @@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.demo.flight.booking; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import io.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @SpringBootApplication @EnableServiceComb diff --git a/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingController.java b/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingController.java index 37184ac..beb37df 100644 --- a/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingController.java +++ b/saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingController.java @@ -32,8 +32,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import io.servicecomb.provider.rest.common.RestSchema; -import io.servicecomb.swagger.invocation.exception.InvocationException; +import org.apache.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.swagger.invocation.exception.InvocationException; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationApplication.java b/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationApplication.java index b6d3c01..174e339 100644 --- a/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationApplication.java +++ b/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationApplication.java @@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.demo.hotel.reservation; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import io.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @SpringBootApplication @EnableServiceComb diff --git a/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationController.java b/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationController.java index dfe00d8..1342c6d 100644 --- a/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationController.java +++ b/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationController.java @@ -32,8 +32,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import io.servicecomb.provider.rest.common.RestSchema; -import io.servicecomb.swagger.invocation.exception.InvocationException; +import org.apache.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.swagger.invocation.exception.InvocationException; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentApplication.java b/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentApplication.java index 4395c22..450bd0c 100644 --- a/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentApplication.java +++ b/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentApplication.java @@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.demo.payment; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import io.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @SpringBootApplication @EnableServiceComb diff --git a/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentController.java b/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentController.java index cf1e774..6ed24a3 100644 --- a/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentController.java +++ b/saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentController.java @@ -29,8 +29,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import io.servicecomb.provider.rest.common.RestSchema; -import io.servicecomb.swagger.invocation.exception.InvocationException; +import org.apache.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.swagger.invocation.exception.InvocationException; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/saga-discovery/saga-discovery-servicecenter/pom.xml b/saga-discovery/saga-discovery-servicecenter/pom.xml index a4f5f35..595ef18 100644 --- a/saga-discovery/saga-discovery-servicecenter/pom.xml +++ b/saga-discovery/saga-discovery-servicecenter/pom.xml @@ -95,7 +95,7 @@ </exclusion> </exclusions> </dependency> - + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> diff --git a/saga-discovery/saga-discovery-servicecenter/src/main/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryConfig.java b/saga-discovery/saga-discovery-servicecenter/src/main/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryConfig.java index 11110ef..dcb48cb 100644 --- a/saga-discovery/saga-discovery-servicecenter/src/main/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryConfig.java +++ b/saga-discovery/saga-discovery-servicecenter/src/main/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryConfig.java @@ -22,11 +22,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import io.servicecomb.provider.springmvc.reference.RestTemplateBuilder; +import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder; import org.apache.servicecomb.saga.transports.HttpClientTransportConfig; import org.apache.servicecomb.saga.transports.RestTransport; import org.apache.servicecomb.saga.transports.resttemplate.RestTemplateTransport; -import io.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @EnableServiceComb @Profile("servicecomb") diff --git a/saga-discovery/saga-discovery-servicecenter/src/main/resources/microservice.yaml b/saga-discovery/saga-discovery-servicecenter/src/main/resources/microservice.yaml index c183fc9..c375a64 100644 --- a/saga-discovery/saga-discovery-servicecenter/src/main/resources/microservice.yaml +++ b/saga-discovery/saga-discovery-servicecenter/src/main/resources/microservice.yaml @@ -18,6 +18,7 @@ APPLICATION_ID: saga service_description: name: saga-service version: 0.0.1 + environment: development cse: service: registry: diff --git a/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/DummyController.java b/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/DummyController.java index 710806d..edde45d 100644 --- a/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/DummyController.java +++ b/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/DummyController.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import io.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.provider.rest.common.RestSchema; @Controller @RequestMapping("/rest") diff --git a/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryApplication.java b/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryApplication.java index 027b441..579335f 100644 --- a/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryApplication.java +++ b/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryApplication.java @@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.discovery.service.center; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import io.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @SpringBootApplication @EnableServiceComb diff --git a/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryRestTransportTest.java b/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryRestTransportTest.java index 6bfa7ae..15ffc02 100644 --- a/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryRestTransportTest.java +++ b/saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryRestTransportTest.java @@ -18,7 +18,7 @@ package org.apache.servicecomb.saga.discovery.service.center; import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing; -import static io.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY; +import static org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.hamcrest.CoreMatchers.containsString; @@ -40,7 +40,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import io.servicecomb.provider.springmvc.reference.RestTemplateBuilder; +import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder; import org.apache.servicecomb.saga.core.TransportFailedException; diff --git a/saga-web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java b/saga-web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java index a095d68..cc2098f 100644 --- a/saga-web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java +++ b/saga-web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.zuul.EnableZuulProxy; -import io.servicecomb.springboot.starter.provider.EnableServiceComb; +import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb; @SpringBootApplication @EnableZuulProxy
