Merge remote-tracking branch 'unidata/unidata_18.1.1' into unidata_18.1.1-osx

This commit is contained in:
Michael James 2019-01-16 16:54:32 -07:00
commit 838d91d761
2 changed files with 5 additions and 3 deletions

View file

@ -18,7 +18,6 @@
<target name="main" depends="init, setup">
<property name="esb.directory" value="${repo.dir}/edexOsgi/deploy.edex.awips2/esb" />
<property name="site-package.directory" value="${python.root.directory}/lib/${python.version.dir}/site-packages" />
<!-- deploy esb {optionally: data, web} -->
<ant antfile="${repo.dir}/edexOsgi/deploy.edex.awips2/deploy/deploy-esb.xml" />

View file

@ -12,11 +12,14 @@ awips2-ncep.repo=awips2-ncep
awips2-cimss.repo=awips2-cimss
awips2-gsd.repo=awips2-gsd
awips2-ohd.repo=awips2-ohd
#awips2-unidata.repo=awips2-unidata
awips2-nws.repo=awips2-nws
awips2-nasa.repo=awips2-nws
awips2-goesr.repo=awips2-goesr
awips2-unidata.repo=awips2-unidata
#epdt.repo=EPDT
core.repositories=${core.repo},${core-foss.repo},${awips2-foss.repo},${awips2-ncep.repo}
optional.repositories=${awips2-cimss.repo},${awips2-gsd.repo},${awips2-ohd.repo}
optional.repositories=${awips2-cimss.repo},${awips2-gsd.repo},${awips2-ohd.repo},${awips2-nws.repo},${awips2-goesr.repo},${awips2-nasa.repo},${awips2-unidata.repo}
#,${epdt.repo}
#,${awips2-unidata.repo}
dir.01=cave