Skip to content

S
SkyWalking

月轩居士 / SkyWalking
与 Fork 源项目一致

Fork自 apache / SkyWalking

通知 4
Star 0
Fork 0
S
SkyWalking

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 7c535f86 编写于 作者: wu-sheng's avatar wu-sheng 提交者： GitHub
浏览文件
操作

Fix es7 dist not uploaded in the release process. (#4112)

上级 4ed21e1c
展开全部 隐藏空白更改
内联 并排
Showing with 129 addition and 32 deletion
apm-dist-es7/pom.xml 0 → 100644
浏览文件 @ 7c535f86
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-skywalking-apm-es7</artifactId>
<packaging>pom</packaging>
<profiles>
<profile>
<id>agent</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-agent</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>backend</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>server-starter-es7</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>ui</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-webapp</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>dist-es7</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>apache-skywalking-apm-bin-es7</finalName>
<descriptors>
<descriptor>${project.basedir}/src/main/assembly/binary-es7.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
<configuration>
<attach>true</attach>
<tarLongFileMode>posix</tarLongFileMode>
<runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>dist-es7</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz" overwrite="true" />
<copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.zip" overwrite="true" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
apm-dist/src/main/assembly/binary-es7.xml → apm-dist-es7/src/main/assembly/binary-es7.xml
浏览文件 @ 7c535f86
......@@ -27,7 +27,7 @@
</formats>
<fileSets>
<fileSet>
<directory>${project.basedir}/bin</directory>
<directory>${project.basedir}/../dist-material/bin</directory>
<outputDirectory>/bin</outputDirectory>
<includes>
<include>*.sh</include>
......@@ -36,7 +36,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>src/main/assembly</directory>
<directory>${project.basedir}/../dist-material</directory>
<outputDirectory>/config</outputDirectory>
<includes>
<include>log4j2.xml</include>
......@@ -87,7 +87,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/release-docs</directory>
<directory>${project.basedir}/../dist-material/release-docs</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
......
apm-dist/pom.xml
浏览文件 @ 7c535f86
......@@ -88,19 +88,6 @@
</descriptors>
</configuration>
</execution>
<execution>
<id>dist-es7</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>apache-skywalking-apm-bin-es7</finalName>
<descriptors>
<descriptor>${project.basedir}/src/main/assembly/binary-es7.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
<configuration>
<attach>true</attach>
......@@ -125,19 +112,6 @@
</tasks>
</configuration>
</execution>
<execution>
<id>dist-es7</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz" overwrite="true" />
<copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.zip" overwrite="true" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
......
apm-dist/src/main/assembly/binary.xml
浏览文件 @ 7c535f86
......@@ -27,7 +27,7 @@
</formats>
<fileSets>
<fileSet>
<directory>${project.basedir}/bin</directory>
<directory>${project.basedir}/../dist-material/bin</directory>
<outputDirectory>/bin</outputDirectory>
<includes>
<include>*.sh</include>
......@@ -36,7 +36,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>src/main/assembly</directory>
<directory>${project.basedir}/../dist-material</directory>
<outputDirectory>/config</outputDirectory>
<includes>
<include>log4j2.xml</include>
......@@ -87,7 +87,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/release-docs</directory>
<directory>${project.basedir}/../dist-material/release-docs</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
......
pom.xml
浏览文件 @ 7c535f86
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或