xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cots
History
Steve Harris 3d546a3504 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java

Former-commit-id: 2ca7ead62d [formerly 5ec1c01d3a] [formerly 736bb45741] [formerly 736bb45741 [formerly 140765a43e]] [formerly 2ca7ead62d [formerly 5ec1c01d3a] [formerly 736bb45741] [formerly 736bb45741 [formerly 140765a43e]] [formerly 437a04011a [formerly 736bb45741 [formerly 140765a43e] [formerly 437a04011a [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]]]
Former-commit-id: 437a04011a
Former-commit-id: 9aca3ab74a [formerly 47c7f66f2b] [formerly 7b27767d7e] [formerly ba02abb01d1c45e71a88538e220dd9927dcb8c5a [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349] [formerly 7b27767d7e [formerly 0b48e96314]]]
Former-commit-id: e40a3275165ecb8b005fcc2df75e2c6606e37a8c [formerly c1b945c05c86c82b34cd95220cf0b30459a58dc4] [formerly ac6704c7e9 [formerly d0e61c59e8]]
Former-commit-id: ac6704c7e9
Former-commit-id: 6a3f6359d6
2013-04-01 12:19:04 -05:00
..
com.facebook.thrift 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.google.guava Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.mchange 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.opensymphony.ognl 12.11.1-1 baseline 2012-09-27 15:57:45 -05:00
com.sun.jna 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.jndi.nis 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.xml.bind 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
de.micromata.opengis.kml Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
edu.oswego 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edu.uci.ics.crawler4j 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
it.geosolutions 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
javax.activation 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.jms 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.mail 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.measure 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl.linux32 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.media.opengl.linux64 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.media.opengl.win32 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.persistence 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.vecmath 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.dods Merge branch 'development' into omaha_13.3.1 2013-02-21 15:41:39 -06:00
net.sf.cglib 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
net.sf.ehcache 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.sf.swtaddons 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.activemq 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
org.apache.batik 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.camel Issue #1802 Refactored DD transaction management 2013-03-25 15:15:38 -05:00
org.apache.commons.beanutils 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.cli 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.codec 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.collections 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.configuration 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.cxf 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.apache.commons.digester 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.lang 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.logging 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.management 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.pool 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.validator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.http 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
org.apache.log4j 12.11.1-1 baseline 2012-09-27 15:57:45 -05:00
org.apache.mina 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.qpid Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client 2013-03-21 18:21:53 -05:00
org.apache.tomcat.nativ Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
org.apache.velocity 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.apache.ws.security 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.codehaus.jackson 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.dom4j 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.eclipse.jetty Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper 2013-02-21 13:55:28 -06:00
org.geotools 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
org.hibernate 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
org.itadaki.bzip2 Issue #1804 Switch bzip2 cots package to jbzip2. 2013-03-20 13:05:54 -05:00
org.jep 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jep.linux32 Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep 2013-03-28 10:42:51 -05:00
org.jep.linux64 Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep 2013-03-28 10:42:51 -05:00
org.jep.win32 Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep 2013-03-28 10:42:51 -05:00
org.jivesoftware.openfire Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
org.junit Issue #1739 - remove reference to non-existent junit version 2013-03-01 10:26:25 -06:00
org.objectweb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.postgres Issue #1663 - PostgreSQL Upgrade 2013-03-13 14:44:05 -05:00
org.slf4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.springframework Issue #1802 Refactored DD transaction management 2013-03-25 15:15:38 -05:00
ucar.nc2 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
uk.ltd.getahead 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00