Improve layout of CLI distribution helidon-cli.zip (#947)

Signed-off-by: tvallin <thibault.vallin@oracle.com>
helidon-io · Jul 3, 2023 · 68327cb · 68327cb
1 parent 435691e
commit 68327cb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/cli/impl/pom.xml b/cli/impl/pom.xml
@@ -168,6 +168,25 @@
                         </manifest>
                     </archive>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>cli-distribution</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration combine.self="override">
+                            <classifier>cli</classifier>
+                            <archive>
+                                <manifest>
+                                    <addClasspath>true</addClasspath>
+                                    <mainClass>${mainClass}</mainClass>
+                                    <useUniqueVersions>false</useUniqueVersions>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/cli/impl/src/main/assembly/distribution.xml b/cli/impl/src/main/assembly/distribution.xml
@@ -28,15 +28,15 @@
     <fileSets>
         <fileSet>
             <directory>${project.build.directory}/libs</directory>
-            <outputDirectory>/lib/libs</outputDirectory>
+            <outputDirectory>/lib</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>
         </fileSet>
     </fileSets>
     <files>
         <file>
-            <source>${project.build.directory}/helidon.jar</source>
+            <source>${project.build.directory}/helidon-cli.jar</source>
             <outputDirectory>/lib</outputDirectory>
         </file>
         <file>

diff --git a/cli/impl/src/main/assembly/helidon b/cli/impl/src/main/assembly/helidon
@@ -73,7 +73,7 @@ build_command() {
         shift
     done
 
-    command="${JAVA_EXEC} ${HELIDON_JAVA_OPS} -jar ${BASEDIR}/lib/helidon.jar ${args}"
+    command="${JAVA_EXEC} ${HELIDON_JAVA_OPS} -jar ${BASEDIR}/lib/helidon-cli.jar ${args}"
 }
 
 #Append variable value

diff --git a/cli/impl/src/main/assembly/helidon.bat b/cli/impl/src/main/assembly/helidon.bat
@@ -23,7 +23,7 @@ if "%JAVACMD%"=="" set JAVACMD=java
 @REM Find script base directory
 for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 
-set JARFILE=%BASEDIR%\lib\helidon.jar
+set JARFILE=%BASEDIR%\lib\helidon-cli.jar
 set ARGS=
 
 for %%x in (%*) do (

diff --git a/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java b/cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java
@@ -76,11 +76,10 @@ void testCliContent() {
         //Ensure main directory are present
         assertThat(content, hasItems(DIST_BASE_DIR + "/bin"));
         assertThat(content, hasItems(DIST_BASE_DIR + "/lib"));
-        assertThat(content, hasItems(DIST_BASE_DIR + "/lib/libs"));
         //Ensure main files are present
         assertThat(content, hasItems(DIST_BASE_DIR + "/bin/helidon"));
         assertThat(content, hasItems(DIST_BASE_DIR + "/bin/helidon.bat"));
-        assertThat(content, hasItems(DIST_BASE_DIR + "/lib/helidon.jar"));
+        assertThat(content, hasItems(DIST_BASE_DIR + "/lib/helidon-cli.jar"));
         assertThat(content, hasItems(DIST_BASE_DIR + "/LICENSE.txt"));
     }