Repository: cxf Updated Branches: refs/heads/master b09959c9a -> 5fa39c845
[CXF-7316] Update the swagger version and update features.xml for OpenSAML 3.3 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5fa39c84 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5fa39c84 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5fa39c84 Branch: refs/heads/master Commit: 5fa39c84511e3a329e9e84be2f7cf333b122f375 Parents: b09959c Author: Daniel Kulp <[email protected]> Authored: Tue Aug 1 11:01:17 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Tue Aug 1 11:02:41 2017 -0400 ---------------------------------------------------------------------- osgi/karaf/features/src/main/resources/features.xml | 1 + parent/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5fa39c84/osgi/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 9d294f1..2e1aeb4 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -61,6 +61,7 @@ <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle> <bundle start-level="25" dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle> <bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.guava.version}</bundle> + <bundle start-level="25" dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cxf.dropwizard.version}</bundle> <bundle start-level="25" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle> <bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle> <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle> http://git-wip-us.apache.org/repos/asf/cxf/blob/5fa39c84/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0140373..1aa026b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -86,7 +86,7 @@ <cxf.ehcache.version>2.10.3</cxf.ehcache.version> <cxf.ehcache3.version>3.0.3</cxf.ehcache3.version> <cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version> - <cxf.guava.version>18.0</cxf.guava.version> + <cxf.guava.version>20.0</cxf.guava.version> <cxf.hazelcast.version>3.7.4</cxf.hazelcast.version> <cxf.httpcomponents.asyncclient.version>4.1.3</cxf.httpcomponents.asyncclient.version> <cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range> @@ -157,7 +157,7 @@ <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version> <cxf.spring.ldap.version>2.3.1.RELEASE</cxf.spring.ldap.version> <cxf.spring.mock>spring-test</cxf.spring.mock> - <cxf.swagger2.version>1.5.12</cxf.swagger2.version> + <cxf.swagger2.version>1.5.16</cxf.swagger2.version> <cxf.velocity.version>1.7</cxf.velocity.version> <cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
