Skip to content

Commit 7700acb

Browse files
fehguyfehguy
committed
merged
2 parents ef9b683 + d6ccabf commit 7700acb

File tree

13 files changed

+129
-46
lines changed

13 files changed

+129
-46
lines changed

‎modules/swagger-annotations/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
<sourceDirectory>src/main/java</sourceDirectory>
1818
<defaultGoal>install</defaultGoal>
1919
</build>
20-
</project>
20+
</project>

‎modules/swagger-jaxrs-utils/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</dependency>
4949
<dependency>
5050
<groupId>com.wordnik</groupId>
51-
<artifactId>common-utils_2.11.0</artifactId>
51+
<artifactId>common-utils_2.11</artifactId>
5252
<version>1.1.5</version>
5353
<exclusions>
5454
<exclusion>

‎modules/swagger-jaxrs/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<dependency>
4343
<groupId>org.scala-lang</groupId>
4444
<artifactId>scala-library</artifactId>
45+
<version>${scala-version}</version>
4546
<scope>compile</scope>
4647
</dependency>
4748
<dependency>

‎modules/swagger-jersey2-jaxrs/pom.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,44 @@
6565
<version>${jersey2-version}</version>
6666
</dependency>
6767
</dependencies>
68+
<profiles>
69+
<profile>
70+
<id>scala-2.10</id>
71+
<activation>
72+
<property>
73+
<name>scala-version</name>
74+
<value>2.10</value>
75+
</property>
76+
</activation>
77+
<dependencyManagement>
78+
<dependencies>
79+
<dependency>
80+
<groupId>org.scala-lang</groupId>
81+
<artifactId>scala-library</artifactId>
82+
<version>2.10.4</version>
83+
<scope>compile</scope>
84+
</dependency>
85+
</dependencies>
86+
</dependencyManagement>
87+
</profile>
88+
<profile>
89+
<id>scala-2.11</id>
90+
<activation>
91+
<property>
92+
<name>scala-version</name>
93+
<value>2.11</value>
94+
</property>
95+
</activation>
96+
<dependencyManagement>
97+
<dependencies>
98+
<dependency>
99+
<groupId>org.scala-lang</groupId>
100+
<artifactId>scala-library</artifactId>
101+
<version>2.11.1</version>
102+
<scope>compile</scope>
103+
</dependency>
104+
</dependencies>
105+
</dependencyManagement>
106+
</profile>
107+
</profiles>
68108
</project>

‎modules/swagger-play2-utils/project/Build.scala‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
import sbt._
22
import Keys._
3-
import play.Project._
3+
import play.Play.autoImport._
4+
import play.PlayScala
5+
import PlayKeys._
46

57
object ApplicationBuild extends Build {
68
val appName = "swagger-play2-utils"
79
val appVersion = "1.3.8-SNAPSHOT"
810

11+
scalaVersion := "2.11.1"
12+
913
val appDependencies: Seq[sbt.ModuleID] = Seq(
1014
"org.slf4j" % "slf4j-api" % "1.6.4",
1115
"com.wordnik" % "swagger-core_2.11" % "1.3.8-SNAPSHOT",
1216
"com.wordnik" % "common-utils_2.11.0" % "1.1.5",
1317
"javax.ws.rs" % "jsr311-api" % "1.1.1")
1418

15-
val main = play.Project(appName, appVersion, appDependencies).settings(
19+
val main = Project(appName, file(".")).enablePlugins(PlayScala).settings(
20+
crossScalaVersions := Seq("2.10.4", "2.11.1"),
21+
scalaVersion := "2.11.1",
22+
version := appVersion,
23+
libraryDependencies ++= appDependencies,
1624
publishTo <<= version { (v: String) =>
1725
val nexus = "https://oss.sonatype.org/"
1826
if (v.trim.endsWith("SNAPSHOT"))

‎modules/swagger-play2-utils/project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.0
1+
sbt.version=0.13.5

‎modules/swagger-play2-utils/project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ resolvers ++= Seq(
1111

1212
resolvers += "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots/"
1313

14-
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")
14+
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.0")
1515

1616
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")

‎modules/swagger-play2/project/Build.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ object ApplicationBuild extends Build {
1414

1515
val appDependencies = Seq(
1616
"org.slf4j" % "slf4j-api" % "1.6.4",
17-
"com.wordnik" % "swagger-jaxrs_2.11" % "1.3.8-SNAPSHOT",
17+
"com.wordnik" %% "swagger-jaxrs" % "1.3.8-SNAPSHOT",
1818
"javax.ws.rs" % "jsr311-api" % "1.1.1",
1919
"org.mockito" % "mockito-core" % "1.9.5" % "test")
2020

2121
val main = Project(appName, file(".")).enablePlugins(PlayScala).settings(
22+
crossScalaVersions := Seq("2.10.4", "2.11.1"),
2223
scalaVersion := "2.11.1",
2324
version := appVersion,
2425
libraryDependencies ++= appDependencies,

‎modules/swagger-servlet/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<dependency>
4343
<groupId>org.scala-lang</groupId>
4444
<artifactId>scala-library</artifactId>
45+
<version>${scala-version}</version>
4546
<scope>compile</scope>
4647
</dependency>
4748
<dependency>

‎pom.xml‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>com.wordnik</groupId>
9-
<artifactId>swagger-project_2.11</artifactId>
9+
<artifactId>swagger-project_${scala-version}</artifactId>
1010
<packaging>pom</packaging>
1111
<name>wordnik-swagger-project</name>
1212
<version>1.3.8-SNAPSHOT</version>
@@ -339,6 +339,44 @@
339339
<module>samples/scala-jaxrs-apm</module>
340340
</modules>
341341
</profile>
342+
<profile>
343+
<id>scala-2.10</id>
344+
<activation>
345+
<property>
346+
<name>scala-version</name>
347+
<value>2.10</value>
348+
</property>
349+
</activation>
350+
<dependencyManagement>
351+
<dependencies>
352+
<dependency>
353+
<groupId>org.scala-lang</groupId>
354+
<artifactId>scala-library</artifactId>
355+
<version>2.10.4</version>
356+
<scope>compile</scope>
357+
</dependency>
358+
</dependencies>
359+
</dependencyManagement>
360+
</profile>
361+
<profile>
362+
<id>scala-2.11</id>
363+
<activation>
364+
<property>
365+
<name>scala-version</name>
366+
<value>2.11</value>
367+
</property>
368+
</activation>
369+
<dependencyManagement>
370+
<dependencies>
371+
<dependency>
372+
<groupId>org.scala-lang</groupId>
373+
<artifactId>scala-library</artifactId>
374+
<version>2.11.1</version>
375+
<scope>compile</scope>
376+
</dependency>
377+
</dependencies>
378+
</dependencyManagement>
379+
</profile>
342380
</profiles>
343381
<modules>
344382
<module>modules/swagger-annotations</module>
@@ -398,7 +436,7 @@
398436
<dependencies>
399437
<dependency>
400438
<groupId>${project.groupId}</groupId>
401-
<artifactId>swagger-jaxrs_2.11</artifactId>
439+
<artifactId>swagger-jaxrs_${scala-version}</artifactId>
402440
<version>${project.version}</version>
403441
</dependency>
404442
<dependency>
@@ -428,16 +466,10 @@
428466
<artifactId>commons-lang</artifactId>
429467
<version>${commons-lang-version}</version>
430468
<scope>compile</scope>
431-
</dependency>
432-
<dependency>
433-
<groupId>org.scala-lang</groupId>
434-
<artifactId>scala-library</artifactId>
435-
<version>${scala-version}</version>
436-
<scope>compile</scope>
437-
</dependency>
469+
</dependency>
438470
<dependency>
439471
<groupId>org.scalatest</groupId>
440-
<artifactId>scalatest_2.11</artifactId>
472+
<artifactId>scalatest_${scala-version}</artifactId>
441473
<version>${scala-test-version}</version>
442474
<scope>test</scope>
443475
</dependency>
@@ -449,7 +481,7 @@
449481
</dependency>
450482
<dependency>
451483
<groupId>com.wordnik</groupId>
452-
<artifactId>swagger-core_2.11</artifactId>
484+
<artifactId>swagger-core_${scala-version}</artifactId>
453485
<version>${project.version}</version>
454486
<scope>compile</scope>
455487
<exclusions>
@@ -494,7 +526,7 @@
494526
</dependencies>
495527
</dependencyManagement>
496528
<properties>
497-
<scala-version>2.11.1</scala-version>
529+
<scala-version>2.11</scala-version>
498530
<felix-version>2.3.4</felix-version>
499531
<servlet-api-version>2.5</servlet-api-version>
500532
<jersey-version>1.13</jersey-version>
@@ -512,5 +544,5 @@
512544
<jetty-version>8.1.11.v20130520</jetty-version>
513545
<servlet-api-version>2.5</servlet-api-version>
514546
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
515-
</properties>
547+
</properties>
516548
</project>

0 commit comments

Comments
 (0)