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/incubator-servicecomb-saga.git
commit 1a95b10273ea6e82e9afb9113645a7e32fbc51d7 Author: Willem Jiang <jiangni...@huawei.com> AuthorDate: Wed Aug 29 09:14:02 2018 +0800 SCB-868 Clean up the Alpha dependencies --- alpha/alpha-core/pom.xml | 6 +++++- alpha/alpha-server/pom.xml | 35 +++++++++++++++++++++++++++++++++++ alpha/pom.xml | 45 --------------------------------------------- saga-spring/pom.xml | 1 - 4 files changed, 40 insertions(+), 47 deletions(-) diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml index cbd2f56..57c631f 100644 --- a/alpha/alpha-core/pom.xml +++ b/alpha/alpha-core/pom.xml @@ -42,7 +42,11 @@ <groupId>javax.persistence</groupId> <artifactId>javax.persistence-api</artifactId> </dependency> - + <!-- Add the kamon annotation dependencies for tagging --> + <dependency> + <groupId>io.kamon</groupId> + <artifactId>kamon-annotation_2.12</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml index c4916ee..e26bbcb 100644 --- a/alpha/alpha-server/pom.xml +++ b/alpha/alpha-server/pom.xml @@ -110,6 +110,20 @@ <artifactId>disruptor</artifactId> </dependency> + <!-- for the performance monitor --> + <dependency> + <groupId>io.kamon</groupId> + <artifactId>kamon-core_2.12</artifactId> + </dependency> + <dependency> + <groupId>io.kamon</groupId> + <artifactId>kamon-annotation_2.12</artifactId> + </dependency> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor_2.12</artifactId> + </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> @@ -205,5 +219,26 @@ <spring.boot.version>${spring.boot2.version}</spring.boot.version> </properties> </profile> + <profile> + <id>perf</id> + <dependencies> + <dependency> + <groupId>io.kamon</groupId> + <artifactId>kamon-log-reporter_2.12</artifactId> + </dependency> + <dependency> + <groupId>io.kamon</groupId> + <artifactId>kamon-statsd_2.12</artifactId> + </dependency> + <dependency> + <groupId>io.kamon</groupId> + <artifactId>kamon-autoweave_2.12</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/alpha/pom.xml b/alpha/pom.xml index 738b956..4e58d97 100644 --- a/alpha/pom.xml +++ b/alpha/pom.xml @@ -35,21 +35,6 @@ <module>alpha-server</module> </modules> - <dependencies> - <dependency> - <groupId>io.kamon</groupId> - <artifactId>kamon-core_2.12</artifactId> - </dependency> - <dependency> - <groupId>io.kamon</groupId> - <artifactId>kamon-annotation_2.12</artifactId> - </dependency> - <dependency> - <groupId>com.typesafe.akka</groupId> - <artifactId>akka-actor_2.12</artifactId> - </dependency> - </dependencies> - <build> <plugins> <!-- TODO need to clean up the states of AlphaServer --> @@ -63,34 +48,4 @@ </plugins> </build> - <profiles> - <profile> - <id>perf</id> - <dependencies> - <dependency> - <groupId>io.kamon</groupId> - <artifactId>kamon-log-reporter_2.12</artifactId> - </dependency> - <dependency> - <groupId>io.kamon</groupId> - <artifactId>kamon-statsd_2.12</artifactId> - </dependency> - <dependency> - <groupId>io.kamon</groupId> - <artifactId>kamon-autoweave_2.12</artifactId> - <version>0.6.5</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - </dependency> - <dependency> - <groupId>io.kamon</groupId> - <artifactId>kamon-system-metrics_2.12</artifactId> - <version>${kamon.version}</version> - </dependency> - </dependencies> - </profile> - </profiles> - </project> diff --git a/saga-spring/pom.xml b/saga-spring/pom.xml index fc93b56..b996e23 100755 --- a/saga-spring/pom.xml +++ b/saga-spring/pom.xml @@ -220,7 +220,6 @@ <dependency> <groupId>io.kamon</groupId> <artifactId>kamon-autoweave_2.12</artifactId> - <version>0.6.5</version> </dependency> <dependency> <groupId>org.aspectj</groupId>