You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by dr...@apache.org on 2022/10/10 12:10:01 UTC
[ratis] branch branch-2 updated: RATIS-1721. example-bin.xml and shell-bin.xml use incorrect LICENSE. (#759)
This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 352649914 RATIS-1721. example-bin.xml and shell-bin.xml use incorrect LICENSE. (#759)
352649914 is described below
commit 3526499146c773a30bc30d1b8ea1c1f60a279737
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Sun Oct 9 15:13:38 2022 +0800
RATIS-1721. example-bin.xml and shell-bin.xml use incorrect LICENSE. (#759)
(cherry picked from commit af9b214ab1e63e1a755c900dce3fd2524510cea9)
---
ratis-assembly/pom.xml | 2 +-
ratis-assembly/src/main/assembly/bin.xml | 8 --------
ratis-assembly/src/main/assembly/examples-bin.xml | 11 ++---------
ratis-assembly/src/main/assembly/shell-bin.xml | 11 ++---------
ratis-assembly/src/main/assembly/src.xml | 1 -
5 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/ratis-assembly/pom.xml b/ratis-assembly/pom.xml
index 0bd81aa9b..c58362a8d 100644
--- a/ratis-assembly/pom.xml
+++ b/ratis-assembly/pom.xml
@@ -148,9 +148,9 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/examples-bin.xml</descriptor>
<descriptor>src/main/assembly/shell-bin.xml</descriptor>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/bin-pkg.xml</descriptor>
</descriptors>
<finalName>apache-ratis-${project.version}-bin</finalName>
diff --git a/ratis-assembly/src/main/assembly/bin.xml b/ratis-assembly/src/main/assembly/bin.xml
index 59462c322..f9f40d93a 100644
--- a/ratis-assembly/src/main/assembly/bin.xml
+++ b/ratis-assembly/src/main/assembly/bin.xml
@@ -51,14 +51,6 @@
</moduleSet>
</moduleSets>
<fileSets>
- <fileSet>
- <directory>${project.basedir}/..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>DISCLAIMER</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>.</outputDirectory>
diff --git a/ratis-assembly/src/main/assembly/examples-bin.xml b/ratis-assembly/src/main/assembly/examples-bin.xml
index 340fd5b2c..21cc7eced 100644
--- a/ratis-assembly/src/main/assembly/examples-bin.xml
+++ b/ratis-assembly/src/main/assembly/examples-bin.xml
@@ -35,17 +35,10 @@
</dependencySets>
<fileSets>
<fileSet>
- <directory>${project.basedir}/..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>DISCLAIMER</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF/</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>.</outputDirectory>
<includes>
+ <include>README.md</include>
<include>LICENSE</include>
<include>NOTICE</include>
</includes>
diff --git a/ratis-assembly/src/main/assembly/shell-bin.xml b/ratis-assembly/src/main/assembly/shell-bin.xml
index 86424d854..470870f41 100644
--- a/ratis-assembly/src/main/assembly/shell-bin.xml
+++ b/ratis-assembly/src/main/assembly/shell-bin.xml
@@ -32,17 +32,10 @@
<outputDirectory>jars</outputDirectory>
</fileSet>
<fileSet>
- <directory>${project.basedir}/..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>DISCLAIMER</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF/</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>.</outputDirectory>
<includes>
+ <include>README.md</include>
<include>LICENSE</include>
<include>NOTICE</include>
</includes>
diff --git a/ratis-assembly/src/main/assembly/src.xml b/ratis-assembly/src/main/assembly/src.xml
index 4207472b2..b6e2e576c 100644
--- a/ratis-assembly/src/main/assembly/src.xml
+++ b/ratis-assembly/src/main/assembly/src.xml
@@ -94,7 +94,6 @@
<outputDirectory>.</outputDirectory>
<includes>
<include>BUILDING.md</include>
- <include>DISCLAIMER</include>
<include>LICENSE</include>
<include>NOTICE</include>
<include>README.md</include>