OZ-196: Move assembly.xml into base directory

ozone-his · Dec 15, 2023 · fb608e8 · fb608e8
1 parent d6f6fbb
commit fb608e8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/main/assembly/assembly.xml → assembly.xml b/src/main/assembly/assembly.xml → assembly.xml
diff --git a/distro/src/main/assembly/assembly.xml → distro/assembly.xml b/distro/src/main/assembly/assembly.xml → distro/assembly.xml
@@ -13,7 +13,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory>.</outputDirectory>
       <directory>${project.build.directory}/${project.artifactId}-${project.version}</directory>
     </fileSet>
   </fileSets>

diff --git a/distro/pom.xml b/distro/pom.xml
@@ -370,7 +370,7 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor>
+                <descriptor>assembly.xml</descriptor>
               </descriptors>
             </configuration>
           </execution>
@@ -443,6 +443,7 @@
       </snapshots>
     </repository>
   </repositories>
+
   <pluginRepositories>
     <pluginRepository>
       <id>openmrs-repo</id>

diff --git a/pom.xml b/pom.xml
@@ -141,7 +141,7 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor>
+                <descriptor>assembly.xml</descriptor>
               </descriptors>
             </configuration>
           </execution>