[incubator-servicecomb-saga] branch master updated: SCB-879 Added the aspectjweaver.jar into the docker image when using pref profile

[ningjiang]

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


The following commit(s) were added to refs/heads/master by this push:
     new 7bd029a  SCB-879 Added the aspectjweaver.jar into the docker image 
when using pref profile
7bd029a is described below

commit 7bd029afc7b7f0325e6da3eddb4c00ce40389c8d
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Wed Aug 29 17:49:16 2018 +0800

    SCB-879 Added the aspectjweaver.jar into the docker image when using pref 
profile
---
 alpha/alpha-server/pom.xml | 32 ++++++++++++++++++++++++++++----
 saga-spring/pom.xml        | 32 ++++++++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index e26bbcb..2a6856a 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -231,14 +231,38 @@
           <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>
+      <!-- copy the aspectj file -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>aspectj.copy</id>
+                <phase>process-test-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.aspectj</groupId>
+                      <artifactId>aspectjweaver</artifactId>
+                    </artifactItem>
+                  </artifactItems>
+                  
<outputDirectory>${project.build.directory}/saga</outputDirectory>
+                  <stripVersion>true</stripVersion>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>
 </project>
diff --git a/saga-spring/pom.xml b/saga-spring/pom.xml
index b996e23..cb71175 100755
--- a/saga-spring/pom.xml
+++ b/saga-spring/pom.xml
@@ -218,14 +218,38 @@
           <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>
+      <!-- copy the aspectj file -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>aspectj.copy</id>
+                <phase>process-test-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.aspectj</groupId>
+                      <artifactId>aspectjweaver</artifactId>
+                    </artifactItem>
+                  </artifactItems>
+                  
<outputDirectory>${project.build.directory}/saga</outputDirectory>
+                  <stripVersion>true</stripVersion>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>