Repository: syncope Updated Branches: refs/heads/master 16a67589e -> 9a10f6e99
Upgrading swagger-jaxrs Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9a10f6e9 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9a10f6e9 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9a10f6e9 Branch: refs/heads/master Commit: 9a10f6e9924bb46c6756fa00433d99f21f3eb982 Parents: 16a6758 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Mar 16 16:00:14 2016 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Mar 16 16:00:14 2016 +0100 ---------------------------------------------------------------------- core/rest-cxf/src/main/resources/restCXFContext.xml | 4 ---- fit/core-reference/src/main/resources/jboss/restCXFContext.xml | 4 ---- pom.xml | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/9a10f6e9/core/rest-cxf/src/main/resources/restCXFContext.xml ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml index c1cccb0..f7714a1 100644 --- a/core/rest-cxf/src/main/resources/restCXFContext.xml +++ b/core/rest-cxf/src/main/resources/restCXFContext.xml @@ -141,10 +141,6 @@ under the License. <jaxrs:features> <ref bean="swagger2Feature"/> </jaxrs:features> - <jaxrs:extensionMappings> - <entry key="json" value="application/json;charset=UTF-8"/> - <entry key="xml" value="application/xml;charset=UTF-8"/> - </jaxrs:extensionMappings> </jaxrs:server> </beans> http://git-wip-us.apache.org/repos/asf/syncope/blob/9a10f6e9/fit/core-reference/src/main/resources/jboss/restCXFContext.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml index 38f4d28..a31c10d 100644 --- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml +++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml @@ -150,10 +150,6 @@ under the License. <jaxrs:features> <ref bean="swagger2Feature"/> </jaxrs:features> - <jaxrs:extensionMappings> - <entry key="json" value="application/json;charset=UTF-8"/> - <entry key="xml" value="application/xml;charset=UTF-8"/> - </jaxrs:extensionMappings> </jaxrs:server> </beans> http://git-wip-us.apache.org/repos/asf/syncope/blob/9a10f6e9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3ca0ed6..8fb974b 100644 --- a/pom.xml +++ b/pom.xml @@ -372,7 +372,7 @@ under the License. <log.directory>${project.build.directory}/log</log.directory> <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory> - <swagger-core.version>1.5.7</swagger-core.version> + <swagger-core.version>1.5.8</swagger-core.version> <swagger-ui.version>2.1.4</swagger-ui.version> <jquery.version>2.2.1</jquery.version>
