szetszwo commented on code in PR #705:
URL: https://github.com/apache/ratis/pull/705#discussion_r941611691
##########
ratis-assembly/src/main/assembly/examples-bin.xml:
##########
@@ -68,12 +68,12 @@
<fileMode>755</fileMode>
</fileSet>
<!-- Include dev support tools -->
- <fileSet>
- <directory>${project.basedir}/../dev-support</directory>
- <outputDirectory>dev-support</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
+<!-- <fileSet>-->
+<!-- <directory>${project.basedir}/../dev-support</directory>-->
+<!-- <outputDirectory>dev-support</outputDirectory>-->
+<!-- <fileMode>0644</fileMode>-->
+<!-- <directoryMode>0755</directoryMode>-->
+<!-- </fileSet>-->
Review Comment:
Why commenting all these lines? For debugging?
##########
pom.xml:
##########
@@ -176,6 +176,7 @@
<maven-stylus-skin.version>1.5</maven-stylus-skin.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+ <maven-assembly-plugin.version>3.4.1</maven-assembly-plugin.version>
Review Comment:
Sorry, I mean we should update the apache parent pom to version 27. Then,
we don't need to add maven-assembly-plugin.version here. See below:
```
+++ b/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>27</version>
<relativePath /> <!-- resolve from repository -->
</parent>
@@ -176,7 +176,6 @@
<maven-stylus-skin.version>1.5</maven-stylus-skin.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
- <maven-assembly-plugin.version>3.4.1</maven-assembly-plugin.version>
<checkstyle.version>9.3</checkstyle.version>
@@ -522,7 +522,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
<configuration>
<!--Defer to the ratis-assembly sub-module. It does all
assembly-->
<skipAssembly>true</skipAssembly>
```
##########
ratis-assembly/pom.xml:
##########
@@ -123,14 +124,42 @@
<skipAssembly>false</skipAssembly>
<appendAssemblyId>true</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/examples-bin.xml</descriptor>
- <descriptor>src/main/assembly/shell-bin.xml</descriptor>
- </descriptors>
</configuration>
+ <executions>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <finalName>apache-ratis-${project.version}-src</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-cli</id>
Review Comment:
@leo65535 , thanks for trying it. I did not know that `default-cli` is a
special id in maven so that we cannot change simply change it; see
https://maven.apache.org/guides/mini/guide-default-execution-ids.html . Let's
keep using `default-cli` then.
##########
ratis-assembly/src/main/assembly/bin.xml:
##########
@@ -77,35 +77,35 @@
<directoryMode>0755</directoryMode>
</fileSet>
<!-- Include dev support tools -->
- <fileSet>
- <directory>${project.basedir}/../dev-support</directory>
- <outputDirectory>dev-support</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../ratis-shell/target/</directory>
- <outputDirectory>ratis-shell/lib/shell</outputDirectory>
- <fileMode>755</fileMode>
- <includes>
- <include>ratis-shell-*-jar-with-dependencies.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../ratis-shell/src/main/bin</directory>
- <outputDirectory>ratis-shell/bin</outputDirectory>
- <fileMode>755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../ratis-shell/src/main/libexec</directory>
- <outputDirectory>ratis-shell/libexec</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../ratis-shell/src/main/conf</directory>
- <outputDirectory>ratis-shell/conf</outputDirectory>
- <fileMode>644</fileMode>
- </fileSet>
+<!-- <fileSet>-->
+<!-- <directory>${project.basedir}/../dev-support</directory>-->
+<!-- <outputDirectory>dev-support</outputDirectory>-->
+<!-- <fileMode>0644</fileMode>-->
+<!-- <directoryMode>0755</directoryMode>-->
+<!-- </fileSet>-->
+<!-- <fileSet>-->
+<!-- <directory>${project.basedir}/../ratis-shell/target/</directory>-->
+<!-- <outputDirectory>ratis-shell/lib/shell</outputDirectory>-->
+<!-- <fileMode>755</fileMode>-->
+<!-- <includes>-->
+<!-- <include>ratis-shell-*-jar-with-dependencies.jar</include>-->
+<!-- </includes>-->
+<!-- </fileSet>-->
+<!-- <fileSet>-->
+<!--
<directory>${project.basedir}/../ratis-shell/src/main/bin</directory>-->
+<!-- <outputDirectory>ratis-shell/bin</outputDirectory>-->
+<!-- <fileMode>755</fileMode>-->
+<!-- </fileSet>-->
+<!-- <fileSet>-->
+<!--
<directory>${project.basedir}/../ratis-shell/src/main/libexec</directory>-->
+<!-- <outputDirectory>ratis-shell/libexec</outputDirectory>-->
+<!-- <fileMode>0644</fileMode>-->
+<!-- <directoryMode>0755</directoryMode>-->
+<!-- </fileSet>-->
+<!-- <fileSet>-->
+<!--
<directory>${project.basedir}/../ratis-shell/src/main/conf</directory>-->
+<!-- <outputDirectory>ratis-shell/conf</outputDirectory>-->
+<!-- <fileMode>644</fileMode>-->
+<!-- </fileSet>-->
Review Comment:
Why commenting all these lines? For debugging?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
