cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [01/14] cxf-fediz git commit: [FEDIZ-174] Updating to CXF 3.1.8-SNAPSHOT
Date Tue, 08 Nov 2016 14:56:28 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes [created] 1d904eda8


[FEDIZ-174] Updating to CXF 3.1.8-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6b29a87d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6b29a87d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6b29a87d

Branch: refs/heads/1.3.x-fixes
Commit: 6b29a87dd101f15d195fb59b220e67c7f25ec0e9
Parents: b4ac287
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Sep 14 11:41:23 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Nov 8 14:42:51 2016 +0000

----------------------------------------------------------------------
 pom.xml                                         | 2 +-
 services/idp/pom.xml                            | 5 -----
 services/idp/src/main/resources/restContext.xml | 8 +++++---
 3 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index beea523..2a07571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <commons.logging.version>1.2</commons.logging.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.validator.version>1.5.1</commons.validator.version>
-        <cxf.version>3.1.7</cxf.version>
+        <cxf.version>3.1.8-SNAPSHOT</cxf.version>
         <cxf.build-utils.version>3.2.0</cxf.build-utils.version>
         <easymock.version>3.4</easymock.version>
         <ecj.version>4.5.1</ecj.version>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index f7f8824..b7e918f 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -259,11 +259,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-jaxrs</artifactId>
-            <version>1.5.6</version>
-        </dependency>
-        <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
             <version>${commons.validator.version}</version>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/services/idp/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/restContext.xml b/services/idp/src/main/resources/restContext.xml
index 6e3aaaf..1d6f446 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -55,7 +55,10 @@
 
     <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider"
/>
     
-     <!-- CXF Swagger2Feature -->
+    <!-- CXF Swagger2Feature -->
+    <bean id="swagger2Serializers" class="org.apache.cxf.jaxrs.swagger.DefaultSwagger2Serializers">
+        <property name="replaceTags" value="true" />
+    </bean> 
     <bean id="swagger2Feature" class="org.apache.cxf.jaxrs.swagger.Swagger2Feature">
         <property name="title" value="Apache Fediz IDP" />
         <property name="version" value="${project.version}" />
@@ -65,8 +68,7 @@
         <property name="resourcePackage" value="org.apache.cxf.fediz.service.idp.rest"
/>
         <property name="scanAllResources" value="true" />
 
-        <property name="dynamicBasePath" value="true" />
-        <property name="replaceTags" value="true" />
+        <property name="swagger2Serializers" ref="swagger2Serializers" />
         <property name="prettyPrint" value="true" />
     </bean>
     


Mime
View raw message