Skip to content

Commit d8a7707

Browse files
committed
support scala 2.11
1 parent 9a12063 commit d8a7707

File tree

8 files changed

+556
-8
lines changed

8 files changed

+556
-8
lines changed

pom.xml

+31-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>net.csdn</groupId>
66
<artifactId>ServiceFramework</artifactId>
7-
<version>1.3.2-SNAPSHOT-9.2.16</version>
7+
<version>1.3.2-SNAPSHOT-${scala.binary.version}</version>
88

99
<licenses>
1010
<license>
@@ -17,10 +17,32 @@
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<scala.version>2.10.3</scala.version>
20+
<scala.binary.version>2.10</scala.binary.version>
21+
<scala.jline.version>2.10.3</scala.jline.version>
2022
<!--9.2.16.v20160414/7.2.2.v20101205/8.0.4.v20111024-->
2123
<jetty.version>9.2.16.v20160414</jetty.version>
2224
</properties>
2325

26+
<profiles>
27+
28+
<profile>
29+
<id>scala-2.11</id>
30+
<properties>
31+
<scala.version>2.11.8</scala.version>
32+
<scala.binary.version>2.11</scala.binary.version>
33+
<scala.jline.version>2.11.0-M3</scala.jline.version>
34+
</properties>
35+
</profile>
36+
<profile>
37+
<id>scala-2.10</id>
38+
<properties>
39+
<scala.version>2.10.3</scala.version>
40+
<scala.binary.version>2.10</scala.binary.version>
41+
<scala.jline.version>2.10.3</scala.jline.version>
42+
</properties>
43+
44+
</profile>
45+
</profiles>
2446

2547
<dependencies>
2648
<dependency>
@@ -110,13 +132,13 @@
110132
<dependency>
111133
<groupId>org.scala-lang</groupId>
112134
<artifactId>scala-library</artifactId>
113-
<version>2.10.3</version>
135+
<version>${scala.version}</version>
114136
</dependency>
115137

116138
<dependency>
117139
<groupId>org.scala-lang</groupId>
118140
<artifactId>jline</artifactId>
119-
<version>${scala.version}</version>
141+
<version>${scala.jline.version}</version>
120142
</dependency>
121143

122144
<dependency>
@@ -210,13 +232,14 @@
210232
</build>
211233
<distributionManagement>
212234
<repository>
213-
<id>releases</id>
214-
<name>releases</name>
215-
<url>http://mvn.letv.com/nexus/content/repositories/releases/</url>
235+
<id>nexus-releases</id>
236+
<name>Nexus Release Repository</name>
237+
<url>http://nexus.dxy.net/nexus/content/repositories/releases/</url>
216238
</repository>
217239
<snapshotRepository>
218-
<id>snapshots</id>
219-
<url>http://mvn.letv.com/nexus/content/repositories/snapshots</url>
240+
<id>nexus-snapshots</id>
241+
<name>Nexus Snapshot Repository</name>
242+
<url>http://nexus.dxy.net/nexus/content/repositories/snapshots/</url>
220243
</snapshotRepository>
221244
</distributionManagement>
222245

test/.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.idea/compiler.xml

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.idea/copyright/profiles_settings.xml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.idea/misc.xml

+187
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.idea/modules.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)