Skip to content

Commit

Permalink
merged from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
fehguy committed Jan 17, 2014
1 parent 5929a6a commit 8abac0c
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<artifactId>swagger-project_2.10</artifactId>
<packaging>pom</packaging>
<name>wordnik-swagger-project</name>
<version>1.3.1</version>
<version>1.3.2</version>
<url>https://github.com/wordnik/swagger-core</url>
<scm>
<connection>scm:git:[email protected]:wordnik/swagger-core.git</connection>
Expand Down Expand Up @@ -344,10 +344,10 @@
<module>modules/swagger-annotations</module>
<module>modules/swagger-core</module>
<module>modules/swagger-jaxrs</module>
<module>modules/swagger-jaxrs-utils</module>
<module>modules/swagger-jersey-jaxrs</module>
<module>modules/swagger-jersey2-jaxrs</module>
<module>modules/swagger-servlet</module>
<module>modules/swagger-oauth2-auth-server</module>
</modules>
<reporting>
<outputDirectory>target/site</outputDirectory>
Expand Down Expand Up @@ -476,19 +476,19 @@
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey-version}</version>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>${jersey-version}</version>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>${jersey-version}</version>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>${jersey-version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -497,7 +497,7 @@
<felix-version>2.3.4</felix-version>
<servlet-api-version>2.5</servlet-api-version>
<jersey-version>1.13</jersey-version>
<jersey2-version>2.4</jersey2-version>
<jersey2-version>2.1</jersey2-version>
<jackson-version>2.1.5</jackson-version>
<jackson-scala-version>2.1.5</jackson-scala-version>
<logback-version>1.0.1</logback-version>
Expand Down

0 comments on commit 8abac0c

Please sign in to comment.