Commit graph

6 commits

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

Former-commit-id: a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]
Former-commit-id: dea17a19da
Former-commit-id: 78d35d4033
2014-03-06 16:29:37 -06:00
Bryan Kowal
0f825df590 Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: bb5acf7c11 [formerly c125b5b053] [formerly 9829477ced [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]
Former-commit-id: 9829477ced
Former-commit-id: ef789bf912
2013-09-30 18:00:31 -05:00
Bryan Kowal
53124c5e02 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: 683d7e5b19 [formerly c1dab22fdb] [formerly 94eacfc460 [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]
Former-commit-id: 94eacfc460
Former-commit-id: 75c6d4ebf6
2013-08-15 15:30:05 -05:00
Bryan Kowal
588503289a Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: f484a47d43 [formerly 63345a298b] [formerly 9f632d9e2d [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]
Former-commit-id: 9f632d9e2d
Former-commit-id: 4a492c0059
2013-07-03 15:35:12 -05:00
Steve Harris
82a1ed77a4 13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
2013-01-06 14:55:11 -06:00
Steve Harris
f376a4b4db 12.10.1-3 baseline
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
2012-09-11 16:00:38 -05:00