e7a0f96a9a
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
24 lines
901 B
Text
24 lines
901 B
Text
Manifest-Version: 1.0
|
|
Bundle-ManifestVersion: 2
|
|
Bundle-Name: Time Plug-in
|
|
Bundle-SymbolicName: com.raytheon.uf.common.time
|
|
Bundle-Version: 1.12.1174.qualifier
|
|
Bundle-Vendor: RAYTHEON
|
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
|
Require-Bundle: net.sf.cglib,
|
|
net.jcip;bundle-version="1.0.0",
|
|
com.raytheon.uf.common.status;bundle-version="1.12.1174"
|
|
Import-Package: com.raytheon.uf.common.serialization,
|
|
com.raytheon.uf.common.serialization.adapters,
|
|
com.raytheon.uf.common.serialization.annotations,
|
|
com.raytheon.uf.common.serialization.comm,
|
|
javax.persistence,
|
|
org.apache.commons.beanutils,
|
|
org.apache.commons.lang,
|
|
org.apache.commons.lang.builder,
|
|
org.hibernate.annotations
|
|
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
|
|
Export-Package: com.raytheon.uf.common.time,
|
|
com.raytheon.uf.common.time.adapter,
|
|
com.raytheon.uf.common.time.msgs,
|
|
com.raytheon.uf.common.time.util
|