Skip to content

Commit f29e8a8

Browse files
committed
changed scala version
1 parent e1a7978 commit f29e8a8

File tree

1 file changed

+5
-43
lines changed

1 file changed

+5
-43
lines changed

pom.xml

Lines changed: 5 additions & 43 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_${scala-version}</artifactId>
9+
<artifactId>swagger-project_2.11</artifactId>
1010
<packaging>pom</packaging>
1111
<name>wordnik-swagger-project</name>
1212
<version>1.3.8-SNAPSHOT</version>
@@ -339,44 +339,6 @@
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>
380342
</profiles>
381343
<modules>
382344
<module>modules/swagger-annotations</module>
@@ -436,7 +398,7 @@
436398
<dependencies>
437399
<dependency>
438400
<groupId>${project.groupId}</groupId>
439-
<artifactId>swagger-jaxrs_${scala-version}</artifactId>
401+
<artifactId>swagger-jaxrs_2.11</artifactId>
440402
<version>${project.version}</version>
441403
</dependency>
442404
<dependency>
@@ -469,7 +431,7 @@
469431
</dependency>
470432
<dependency>
471433
<groupId>org.scalatest</groupId>
472-
<artifactId>scalatest_${scala-version}</artifactId>
434+
<artifactId>scalatest_2.11</artifactId>
473435
<version>${scala-test-version}</version>
474436
<scope>test</scope>
475437
</dependency>
@@ -481,7 +443,7 @@
481443
</dependency>
482444
<dependency>
483445
<groupId>com.wordnik</groupId>
484-
<artifactId>swagger-core_${scala-version}</artifactId>
446+
<artifactId>swagger-core_2.11</artifactId>
485447
<version>${project.version}</version>
486448
<scope>compile</scope>
487449
<exclusions>
@@ -526,7 +488,7 @@
526488
</dependencies>
527489
</dependencyManagement>
528490
<properties>
529-
<scala-version>2.11</scala-version>
491+
<scala-version>2.10.4</scala-version>
530492
<felix-version>2.3.4</felix-version>
531493
<servlet-api-version>2.5</servlet-api-version>
532494
<jersey-version>1.13</jersey-version>

0 commit comments

Comments
 (0)