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
[formerly98d7beae50
] [formerly31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]] Former-commit-id:31d7d09c10
Former-commit-id:bcf575966b
16 lines
630 B
Text
16 lines
630 B
Text
Manifest-Version: 1.0
|
|
Bundle-ManifestVersion: 2
|
|
Bundle-Name: Utility Plug-in
|
|
Bundle-SymbolicName: com.raytheon.uf.common.util
|
|
Bundle-Version: 1.12.1174.qualifier
|
|
Bundle-Vendor: RAYTHEON
|
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
|
Require-Bundle: org.junit;bundle-version="1.0.0",
|
|
org.apache.commons.beanutils;bundle-version="1.8.3",
|
|
com.raytheon.uf.common.status;bundle-version="1.12.1174"
|
|
Export-Package: com.raytheon.uf.common.util,
|
|
com.raytheon.uf.common.util.cache,
|
|
com.raytheon.uf.common.util.header,
|
|
com.raytheon.uf.common.util.registry,
|
|
com.raytheon.uf.common.util.session
|
|
Import-Package: org.apache.commons.lang
|