You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2013/11/11 06:04:27 UTC
svn commit: r1540610 - in /cxf/trunk/rt: frontend/jaxrs/pom.xml
rs/description/pom.xml
rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/
rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
Author: ffang
Date: Mon Nov 11 05:04:27 2013
New Revision: 1540610
URL: http://svn.apache.org/r1540610
Log:
[CXF-5379]move SwaggerFeature into rt/rs/description module
Added:
cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/
- copied from r1540586, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/
cxf/trunk/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
- copied unchanged from r1540607, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
Modified:
cxf/trunk/rt/frontend/jaxrs/pom.xml
cxf/trunk/rt/rs/description/pom.xml
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1540610&r1=1540609&r2=1540610&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Mon Nov 11 05:04:27 2013
@@ -35,7 +35,6 @@
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.apache.aries*;version="${cxf.aries.version.range}",
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- com.wordnik.swagger.jaxrs*;resolution:="optional";version="[1.3.0, 1.4.0)",
javax.ws.rs.client;version="[2.0,3)",
javax.ws.rs*;version="[1.0,3)",
</cxf.osgi.import>
@@ -155,11 +154,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.10</artifactId>
- <optional>true</optional>
- </dependency>
</dependencies>
<build>
<pluginManagement>
Modified: cxf/trunk/rt/rs/description/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/description/pom.xml?rev=1540610&r1=1540609&r2=1540610&view=diff
==============================================================================
--- cxf/trunk/rt/rs/description/pom.xml (original)
+++ cxf/trunk/rt/rs/description/pom.xml Mon Nov 11 05:04:27 2013
@@ -70,6 +70,11 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-jaxrs_2.10</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<plugins>