kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include the agent into `dist`

This commit is contained in:
wusheng 2018-03-02 17:00:43 +08:00
parent 6ba42f364a
commit 710cce162b
15 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ target/
*~
packages/
**/dependency-reduced-pom.xml
/skywalking-agent/

0
apm-backend-dist/bin/collectorService.bat → apm-dist/bin/collectorService.bat
View File

0
apm-backend-dist/bin/collectorService.sh → apm-dist/bin/collectorService.sh
View File

0
apm-backend-dist/bin/startup.bat → apm-dist/bin/startup.bat
View File

0
apm-backend-dist/bin/startup.sh → apm-dist/bin/startup.sh
View File

0
apm-backend-dist/bin/webappService.bat → apm-dist/bin/webappService.bat
View File

0
apm-backend-dist/bin/webappService.sh → apm-dist/bin/webappService.sh
View File

9
apm-backend-dist/pom.xml → apm-dist/pom.xml
View File

@ -14,6 +14,11 @@
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-agent-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-collector-boot</artifactId>
@ -63,9 +68,9 @@
<configuration>
<tasks>
<copy file="${project.build.directory}/skywalking-backend.tar.gz"
tofile="${project.basedir}/../packages/skywalking-backend.tar.gz" overwrite="true"/>
tofile="${project.basedir}/../dist/skywalking-backend.tar.gz" overwrite="true"/>
<copy file="${project.build.directory}/skywalking-backend.zip"
tofile="${project.basedir}/../packages/skywalking-backend.zip" overwrite="true"/>
tofile="${project.basedir}/../dist/skywalking-backend.zip" overwrite="true"/>
</tasks>
</configuration>
</execution>

6
apm-backend-dist/src/main/assembly/binary.xml → apm-dist/src/main/assembly/binary.xml
View File

@ -47,6 +47,12 @@
<directory>${project.basedir}/../apm-collector/apm-collector-boot/target/skywalking-collector-assembly/skywalking-collector/libs</directory>
<outputDirectory>/collector-libs</outputDirectory>
</fileSet>
<!-- Agent repackage into the dist -->
<fileSet>
<directory>${project.basedir}/../packages/skywalking-agent</directory>
<outputDirectory>/agent</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>

10
apm-sniffer/apm-agent/pom.xml
View File

@ -108,13 +108,13 @@
</goals>
<configuration>
<tasks>
<mkdir dir="${project.basedir}/../../packages/skywalking-agent"/>
<mkdir dir="${project.basedir}/../../skywalking-agent"/>
<copy file="${project.build.directory}/skywalking-agent.jar"
tofile="${project.basedir}/../../packages/skywalking-agent/skywalking-agent.jar" overwrite="true"/>
<mkdir dir="${project.basedir}/../../packages/skywalking-agent/config"/>
<mkdir dir="${project.basedir}/../../packages/skywalking-agent/logs"/>
tofile="${project.basedir}/../../skywalking-agent/skywalking-agent.jar" overwrite="true"/>
<mkdir dir="${project.basedir}/../../skywalking-agent/config"/>
<mkdir dir="${project.basedir}/../../skywalking-agent/logs"/>
<copydir src="${project.basedir}/../config"
dest="${project.basedir}/../../packages/skywalking-agent/config" forceoverwrite="true"/>
dest="${project.basedir}/../../skywalking-agent/config" forceoverwrite="true"/>
</tasks>
</configuration>
</execution>

2
apm-sniffer/apm-sdk-plugin/pom.xml
View File

@ -69,7 +69,7 @@
<shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
<agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../packages/skywalking-agent</agent.package.dest.dir>
<agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent</agent.package.dest.dir>
<plugin.dest.dir>${agent.package.dest.dir}/plugins</plugin.dest.dir>
</properties>

4
apm-sniffer/apm-toolkit-activation/pom.xml
View File

@ -120,9 +120,9 @@
<if>
<equals arg1="${project.packaging}" arg2="jar"/>
<then>
<mkdir dir="${project.build.directory}/../../../../packages/skywalking-agent/plugins"/>
<mkdir dir="${project.build.directory}/../../../../skywalking-agent/plugins"/>
<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
tofile="${project.build.directory}/../../../../packages/skywalking-agent/activations/${project.artifactId}-${project.version}.jar" overwrite="true"/>
tofile="${project.build.directory}/../../../../skywalking-agent/activations/${project.artifactId}-${project.version}.jar" overwrite="true"/>
</then>
</if>

2
apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
View File

@ -30,7 +30,7 @@
<artifactId>optional-spring-plugins</artifactId>
<properties>
<plugin.dest.dir>${project.build.directory}/../../../../../packages/skywalking-agent/optional-plugins</plugin.dest.dir>
<plugin.dest.dir>${project.build.directory}/../../../../../skywalking-agent/optional-plugins</plugin.dest.dir>
</properties>
<modules>

2
apm-sniffer/optional-plugins/pom.xml
View File

@ -33,7 +33,7 @@
<shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
<plugin.dest.dir>${project.build.directory}/../../../../packages/skywalking-agent/optional-plugins</plugin.dest.dir>
<plugin.dest.dir>${project.build.directory}/../../../../skywalking-agent/optional-plugins</plugin.dest.dir>
</properties>
<modules>

2
pom.xml
View File

@ -64,7 +64,7 @@
<module>apm-collector</module>
<module>apm-protocol</module>
<module>apm-webapp</module>
<module>apm-backend-dist</module>
<module>apm-dist</module>
</modules>
<packaging>pom</packaging>