Merge pull request #1958 from TexasDigitalLibrary/yml-file-references

fix file extension for references to application.yml
TexasDigitalLibrary · Sep 25, 2024 · 6a28bd9 · 6a28bd9
2 parents ec609fd + 455a325
commit 6a28bd9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/assembly.xml b/assembly.xml
@@ -22,7 +22,7 @@
       <directory>./src/main/resources</directory>
       <outputDirectory>config</outputDirectory>
       <includes>
-        <include>application.yaml</include>
+        <include>application.yml</include>
       </includes>
       <filtered>true</filtered>
     </fileSet>

diff --git a/pom.xml b/pom.xml
@@ -385,7 +385,7 @@
               <directory>src/main/resources</directory>
               <targetPath>WEB-INF/classes</targetPath>
               <includes>
-                <include>application.yaml</include>
+                <include>application.yml</include>
               </includes>
             </webResource>
             <webResource>
@@ -395,7 +395,7 @@
               <includes>
                 <include>*/**</include>
               </includes>
-              <exclude>application.yaml</exclude>
+              <exclude>application.yml</exclude>
             </webResource>
             <webResource>
               <directory>dist</directory>

diff --git a/src/main/resources/config/.gitkeep b/src/main/resources/config/.gitkeep
@@ -1 +1 @@
-# keep config directory for deployment override of application.yaml
+# keep config directory for deployment override of application.yml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		# keep config directory for deployment override of application.yaml
		# keep config directory for deployment override of application.yml