Commit graph

18 commits

Author SHA1 Message Date
Brad Gonzales
4cbc3b1b05 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: a24cbcfa77 [formerly 0e3dc17872] [formerly a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]
Former-commit-id: dea17a19da
Former-commit-id: 4ba60d8a6f [formerly 78d35d4033]
Former-commit-id: c4064160ec
2014-03-06 16:29:37 -06:00
Richard Peter
705339a320 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 2c753c427c [formerly 79bdd34f4f] [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: b4aac09ff4 [formerly 96b4944b41]
Former-commit-id: e2a16fd876
2013-11-14 14:40:23 -06:00
Bryan Kowal
cfb3717a61 Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: b2272ad695 [formerly a51231058a] [formerly b2272ad695 [formerly a51231058a] [formerly e3639da703 [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]
Former-commit-id: e3639da703
Former-commit-id: b2c63727ba [formerly 48d5d8c3a1]
Former-commit-id: a575f41589
2013-11-12 19:57:25 -06:00
Bryan Kowal
f5bb76a01e Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
2013-10-31 15:34:46 -05:00
Bryan Kowal
731efe0fb6 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	nativeLib/files.native/files.native.ecl
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.cots.g2clib/.project
	nativeLib/rary.cots.g2clib/g2_unpack3.c
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1

Former-commit-id: 4d7a4aefec [formerly 665911b033] [formerly 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: 7a83214b1c [formerly 0954490a5a]
Former-commit-id: 6e08dc72c0
2013-10-31 15:23:08 -05:00
Steve Harris
da4589ec2b 14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Steve Harris
472c0a1a5e 14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
2013-10-28 10:46:02 -04:00
Bryan Kowal
15cb18c19f Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 2ad7db4f5d [formerly b7b11dc747] [formerly 2ad7db4f5d [formerly b7b11dc747] [formerly 9a472e1bbe [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: b1bdf0dbc5 [formerly f892849313]
Former-commit-id: 83c0c7e365
2013-10-16 12:54:58 -05:00
Bryan Kowal
a249b45111 Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: efd377f12f [formerly 61527c0b80] [formerly efd377f12f [formerly 61527c0b80] [formerly 87087a5ea4 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]
Former-commit-id: 87087a5ea4
Former-commit-id: af4b729522 [formerly fe4e9ca3f8]
Former-commit-id: 297ee050ca
2013-10-02 18:41:11 -05:00
Bryan Kowal
3daf51dacf Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
- Amend: restore mpe changes
- Amend: attempt rebase

Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90

Conflicts:

	nativeLib/edex_com/.cproject
	nativeLib/edex_notify/.cproject


Former-commit-id: 5bcf751c50 [formerly 9db548db3e] [formerly 5bcf751c50 [formerly 9db548db3e] [formerly 326cae8be4 [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]]
Former-commit-id: 326cae8be4
Former-commit-id: 98e4f44a7d [formerly 573aeaa238]
Former-commit-id: 929e30a520
2013-09-04 10:08:21 -05:00
Steve Harris
6c258a0b7c 13.5.1-18 baseline
Former-commit-id: d931b80e70 [formerly afb34814dd] [formerly d931b80e70 [formerly afb34814dd] [formerly 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 261b1da9d6 [formerly 2f9aa87a9f]
Former-commit-id: cde7f2a59c
2013-08-22 09:12:43 -04:00
Bryan Kowal
f61b437746 Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: 2b4faafed7 [formerly e3e596eb5d] [formerly 2b4faafed7 [formerly e3e596eb5d] [formerly be011d3b92 [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]]
Former-commit-id: be011d3b92
Former-commit-id: 6561efe457 [formerly 7b1615ba80]
Former-commit-id: 8331e2a16a
2013-08-15 15:24:11 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Steve Harris
c28f3aeb02 13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
2013-03-12 08:35:45 -05:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00