This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch collector/instrument
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/collector/instrument by this
push:
new 6504c00 Make the agent.jar output to the /agent folder in collector
package.
6504c00 is described below
commit 6504c0001b965a087550625465991719c5f2a308
Author: wu-sheng <[email protected]>
AuthorDate: Fri Jan 5 17:31:35 2018 +0800
Make the agent.jar output to the /agent folder in collector package.
---
apm-collector/apm-collector-boot/pom.xml | 8 ++++++++
apm-collector/apm-collector-boot/src/main/assembly/assembly.xml | 7 +++++++
2 files changed, 15 insertions(+)
diff --git a/apm-collector/apm-collector-boot/pom.xml
b/apm-collector/apm-collector-boot/pom.xml
index efbe70f..c01d6d0 100644
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -177,6 +177,14 @@
<version>${project.version}</version>
</dependency>
<!-- alarm provider -->
+
+ <!-- instrument provided dependency -->
+ <dependency>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>apm-collector-instrument</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
index 28ba0f1..a029a7c 100644
--- a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
+++ b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
@@ -63,5 +63,12 @@
</includes>
<outputDirectory>/config</outputDirectory>
</fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../apm-collector-instrument/target</directory>
+ <includes>
+ <include>collector-instrument-agent.jar</include>
+ </includes>
+ <outputDirectory>/agent</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
