xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14" into omaha_14.4.1

Browse source 
Former-commit-id: f1bebc6ea0 [formerly 41f9aa07f0] [formerly 64c365e198] [formerly 64c365e198 [formerly 317548b267]] [formerly 75e8c49fba [formerly 64c365e198 [formerly 317548b267] [formerly 75e8c49fba [formerly 1a6f8e111a7f160bc50fd160356187e23c055da7]]]]
Former-commit-id: 75e8c49fba
Former-commit-id: 606fab53ed731a0ceff0d1a5500be53a28b9b9b0 [formerly 0254386f74f9b8050f091b7a4f6c9726e59763b7] [formerly 83191b8886 [formerly 0dbd0dd71d]]
Former-commit-id: 83191b8886
Former-commit-id: 630c030940
This commit is contained in:
Nate Jensen 2014-08-06 15:57:20 -05:00 • committed by Gerrit Code Review
commit 6fd13a05d5
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
View file

@ -512,11 +512,4 @@
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.xml.apis"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
View file

@ -22,7 +22,7 @@ Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1.
com.raytheon.uf.edex.auth;bundle-version="1.12.1174",
com.raytheon.uf.common.util;bundle-version="1.12.1174",
com.raytheon.uf.common.time;bundle-version="1.12.1174",
org.apache.ws.security;bundle-version="1.0.0",
org.apache.ws.security;bundle-version="1.6.14",
com.google.guava;bundle-version="1.0.0",
com.raytheon.uf.common.registry.ebxml,
com.raytheon.uf.common.stats;bundle-version="1.0.0",

2
edexOsgi/com.raytheon.uf.edex.security/META-INF/MANIFEST.MF
View file

@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.jetty;bundle-version="7.6.14",
com.raytheon.uf.common.status;bundle-version="1.12.1174",
org.apache.commons.cxf;bundle-version="2.7.11",
com.raytheon.uf.common.security;bundle-version="1.14.0",
org.apache.ws.security;bundle-version="1.0.0"
org.apache.ws.security;bundle-version="1.6.14"
Export-Package: com.raytheon.uf.edex.security