Rename release packages when shade profile is active

SoftInstigate · Aug 6, 2024 · 040dc9b · 040dc9b
1 parent 3066ed9
commit 040dc9b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/core/assembly-fat.xml → core/assembly-shaded.xml b/core/assembly-fat.xml → core/assembly-shaded.xml
@@ -2,7 +2,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>fat</id>
+    <id>shaded</id>
     <formats>
         <format>tar.gz</format>
         <format>zip</format>

diff --git a/core/assembly-with-deps.xml → core/assembly.xml b/core/assembly-with-deps.xml → core/assembly.xml
diff --git a/core/pom.xml b/core/pom.xml
@@ -158,7 +158,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
@@ -187,7 +187,6 @@
           </archive>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -237,9 +236,9 @@
             </goals>
             <configuration>
               <finalName>restheart</finalName>
-              <appendAssemblyId>true</appendAssemblyId>
+              <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
-                <descriptor>assembly-with-deps.xml</descriptor>
+                <descriptor>assembly.xml</descriptor>
               </descriptors>
               <attach>false</attach>
               <tarLongFileMode>posix</tarLongFileMode>
@@ -355,16 +354,16 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
               <execution>
-                <id>fat</id>
+                <id>shaded</id>
                 <phase>package</phase>
                 <goals>
                   <goal>single</goal>
                 </goals>
                 <configuration>
                   <finalName>restheart</finalName>
-                  <appendAssemblyId>false</appendAssemblyId>
+                  <appendAssemblyId>true</appendAssemblyId>
                   <descriptors>
-                    <descriptor>assembly-fat.xml</descriptor>
+                    <descriptor>assembly-shaded.xml</descriptor>
                   </descriptors>
                   <attach>false</attach>
                   <tarLongFileMode>posix</tarLongFileMode>
@@ -521,9 +520,9 @@
           <artifactId>restheart-mongoclient-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.graalvm.js</groupId> <!-- required to override test dependency declared to fix karate test hanging due to conflict in GraalVM releases -->
-            <artifactId>js-language</artifactId>
-            <scope>runtime</scope>
+          <groupId>org.graalvm.js</groupId> <!-- required to override test dependency declared to fix karate test hanging due to conflict in GraalVM releases -->
+          <artifactId>js-language</artifactId>
+          <scope>runtime</scope>
         </dependency>
         <!-- uncomment to add test plugins to the native image -->
         <!-- <dependency>