Merge commit 'd813c36e83936cd74275ebb85fd3520651ccab7d' into 14.2.1

SANDAG · Nov 13, 2020 · 073a36b · 073a36b
2 parents e3d448c + d813c36
commit 073a36b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -293,7 +293,10 @@
                         </goals>
                         <configuration>
                             <encoding>${encoding.type}</encoding>
+                            <!--
                             <outputDirectory>${release.root}/conf/${project.activeProfiles[0].id}</outputDirectory>
+                            -->
+                            <outputDirectory>${release.root}/common/conf/</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>

diff --git a/src/main/resources/create_scenario.cmd b/src/main/resources/create_scenario.cmd
@@ -31,7 +31,8 @@ xcopy /Y/E .\common\python\"*.*" %SCENARIO_FOLDER%\python
 xcopy /Y/E .\common\sql\"*.*" %SCENARIO_FOLDER%\sql
 xcopy /Y .\common\uec\"*.*" %SCENARIO_FOLDER%\uec
 xcopy /Y .\common\bin\"*.*" %SCENARIO_FOLDER%\bin
-xcopy /Y .\conf\%YEAR%\"*.*" %SCENARIO_FOLDER%\conf
+rem xcopy /Y .\conf\%YEAR%\"*.*" %SCENARIO_FOLDER%\conf
+xcopy /Y .\common\conf\"*.*" %SCENARIO_FOLDER%\conf
 xcopy /Y .\common\output\"*.*" %SCENARIO_FOLDER%\output
 xcopy /s/Y .\common\visualizer %SCENARIO_FOLDER%\visualizer
 xcopy /s/Y .\dependencies.* %SCENARIO_FOLDER%\visualizer