[GitHub] [ratis] szetszwo commented on a diff in pull request #705: RATIS-1660. Fix wrong ratis package

[GitBox <gi...@apache.org>]

szetszwo commented on code in PR #705:
URL: https://github.com/apache/ratis/pull/705#discussion_r940894649


##########
ratis-assembly/src/main/assembly/pkg.xml:
##########
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  <id>pkg</id>

Review Comment:
   Let's call it `bin-pkg`.



##########
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.3.0</maven-assembly-plugin.version>

Review Comment:
   Let's update apache pom version to 27 (the latest) and use the inherited version (i.e. 3.4.1) of `maven-assembly-plugin`.
   ```
   +++ 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>
   ```



##########
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:
   Let's use `bin` instead of `default-cli`.



-- 
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: issues-unsubscribe@ratis.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org