Skip to content

Commit 93f6f73

Browse files
adamretteradamretter
committed
[bugfix] Correct the scala version properties for the scala-maven-plugin
1 parent c09ba01 commit 93f6f73

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎csv-validator-cmd/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,20 @@
114114
</dependency>
115115
<dependency>
116116
<groupId>com.github.scopt</groupId>
117-
<artifactId>scopt_${scala.version}</artifactId>
117+
<artifactId>scopt_${scala.compat.version}</artifactId>
118118
<version>3.3.0</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>org.scalaz</groupId>
122-
<artifactId>scalaz-core_${scala.version}</artifactId>
122+
<artifactId>scalaz-core_${scala.compat.version}</artifactId>
123123
</dependency>
124124
<dependency>
125125
<groupId>com.madgag</groupId>
126-
<artifactId>scala-arm_${scala.version}</artifactId>
126+
<artifactId>scala-arm_${scala.compat.version}</artifactId>
127127
</dependency>
128128
<dependency>
129129
<groupId>com.github.scala-incubator.io</groupId>
130-
<artifactId>scala-io-file_${scala.version}</artifactId>
130+
<artifactId>scala-io-file_${scala.compat.version}</artifactId>
131131
</dependency>
132132
<dependency>
133133
<groupId>${project.groupId}</groupId>
@@ -136,22 +136,22 @@
136136
</dependency>
137137
<dependency>
138138
<groupId>org.specs2</groupId>
139-
<artifactId>specs2-core_${scala.version}</artifactId>
139+
<artifactId>specs2-core_${scala.compat.version}</artifactId>
140140
<scope>test</scope>
141141
</dependency>
142142
<dependency>
143143
<groupId>org.specs2</groupId>
144-
<artifactId>specs2-common_${scala.version}</artifactId>
144+
<artifactId>specs2-common_${scala.compat.version}</artifactId>
145145
<scope>test</scope>
146146
</dependency>
147147
<dependency>
148148
<groupId>org.specs2</groupId>
149-
<artifactId>specs2-matcher_${scala.version}</artifactId>
149+
<artifactId>specs2-matcher_${scala.compat.version}</artifactId>
150150
<scope>test</scope>
151151
</dependency>
152152
<dependency>
153153
<groupId>org.specs2</groupId>
154-
<artifactId>specs2-junit_${scala.version}</artifactId>
154+
<artifactId>specs2-junit_${scala.compat.version}</artifactId>
155155
<scope>test</scope>
156156
</dependency>
157157
<dependency>

‎csv-validator-core/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,39 +95,39 @@
9595
</dependency>
9696
<dependency>
9797
<groupId>org.scala-lang.modules</groupId>
98-
<artifactId>scala-parser-combinators_${scala.version}</artifactId>
98+
<artifactId>scala-parser-combinators_${scala.compat.version}</artifactId>
9999
<version>1.0.3</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>org.scalaz</groupId>
103-
<artifactId>scalaz-core_${scala.version}</artifactId>
103+
<artifactId>scalaz-core_${scala.compat.version}</artifactId>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.scalaz.stream</groupId>
107-
<artifactId>scalaz-stream_${scala.version}</artifactId>
107+
<artifactId>scalaz-stream_${scala.compat.version}</artifactId>
108108
<version>0.7.3a</version>
109109
</dependency>
110110
<dependency>
111111
<groupId>org.scodec</groupId>
112-
<artifactId>scodec-bits_${scala.version}</artifactId>
112+
<artifactId>scodec-bits_${scala.compat.version}</artifactId>
113113
<version>1.0.6</version>
114114
</dependency>
115115
<dependency>
116116
<groupId>org.scalaz</groupId>
117-
<artifactId>scalaz-concurrent_${scala.version}</artifactId>
117+
<artifactId>scalaz-concurrent_${scala.compat.version}</artifactId>
118118
<version>${scalaz.version}</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>com.github.scala-incubator.io</groupId>
122-
<artifactId>scala-io-file_${scala.version}</artifactId>
122+
<artifactId>scala-io-file_${scala.compat.version}</artifactId>
123123
</dependency>
124124
<dependency>
125125
<groupId>com.github.scala-incubator.io</groupId>
126-
<artifactId>scala-io-core_${scala.version}</artifactId>
126+
<artifactId>scala-io-core_${scala.compat.version}</artifactId>
127127
</dependency>
128128
<dependency>
129129
<groupId>com.madgag</groupId>
130-
<artifactId>scala-arm_${scala.version}</artifactId>
130+
<artifactId>scala-arm_${scala.compat.version}</artifactId>
131131
</dependency>
132132
<dependency>
133133
<groupId>joda-time</groupId>
@@ -141,7 +141,7 @@
141141
</dependency>
142142
<dependency>
143143
<groupId>com.gilt</groupId>
144-
<artifactId>gfc-semver_${scala.version}</artifactId>
144+
<artifactId>gfc-semver_${scala.compat.version}</artifactId>
145145
<version>0.1.0</version>
146146
</dependency>
147147
<dependency>
@@ -156,22 +156,22 @@
156156
</dependency>
157157
<dependency>
158158
<groupId>org.specs2</groupId>
159-
<artifactId>specs2-core_${scala.version}</artifactId>
159+
<artifactId>specs2-core_${scala.compat.version}</artifactId>
160160
<scope>test</scope>
161161
</dependency>
162162
<dependency>
163163
<groupId>org.specs2</groupId>
164-
<artifactId>specs2-common_${scala.version}</artifactId>
164+
<artifactId>specs2-common_${scala.compat.version}</artifactId>
165165
<scope>test</scope>
166166
</dependency>
167167
<dependency>
168168
<groupId>org.specs2</groupId>
169-
<artifactId>specs2-matcher_${scala.version}</artifactId>
169+
<artifactId>specs2-matcher_${scala.compat.version}</artifactId>
170170
<scope>test</scope>
171171
</dependency>
172172
<dependency>
173173
<groupId>org.specs2</groupId>
174-
<artifactId>specs2-junit_${scala.version}</artifactId>
174+
<artifactId>specs2-junit_${scala.compat.version}</artifactId>
175175
<scope>test</scope>
176176
</dependency>
177177
<dependency>

‎csv-validator-java-api/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@
125125
</dependency>
126126
<dependency>
127127
<groupId>org.scalaz</groupId>
128-
<artifactId>scalaz-core_${scala.version}</artifactId>
128+
<artifactId>scalaz-core_${scala.compat.version}</artifactId>
129129
</dependency>
130130
<dependency>
131131
<groupId>com.github.scala-incubator.io</groupId>
132-
<artifactId>scala-io-file_${scala.version}</artifactId>
132+
<artifactId>scala-io-file_${scala.compat.version}</artifactId>
133133
</dependency>
134134
<dependency>
135135
<groupId>${project.groupId}</groupId>

‎csv-validator-parent/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
</scm>
8282

8383
<properties>
84-
<scala.version>2.11</scala.version>
85-
<scala.lib.version>2.11.12</scala.lib.version>
84+
<scala.compat.version>2.11</scala.compat.version>
85+
<scala.version>2.11.12</scala.version>
8686
<scalaz.version>7.2.0</scalaz.version>
8787
<specs2.version>3.7.1</specs2.version>
8888
<java.version>1.7</java.version>
@@ -336,49 +336,49 @@
336336
<dependency>
337337
<groupId>org.scala-lang</groupId>
338338
<artifactId>scala-library</artifactId>
339-
<version>${scala.lib.version}</version>
339+
<version>${scala.version}</version>
340340
</dependency>
341341
<dependency>
342342
<groupId>org.scalaz</groupId>
343-
<artifactId>scalaz-core_${scala.version}</artifactId>
343+
<artifactId>scalaz-core_${scala.compat.version}</artifactId>
344344
<version>${scalaz.version}</version>
345345
</dependency>
346346
<dependency>
347347
<groupId>com.github.scala-incubator.io</groupId>
348-
<artifactId>scala-io-file_${scala.version}</artifactId>
348+
<artifactId>scala-io-file_${scala.compat.version}</artifactId>
349349
<version>0.4.3-1</version>
350350
</dependency>
351351
<dependency>
352352
<groupId>com.github.scala-incubator.io</groupId>
353-
<artifactId>scala-io-core_${scala.version}</artifactId>
353+
<artifactId>scala-io-core_${scala.compat.version}</artifactId>
354354
<version>0.4.3-1</version>
355355
</dependency>
356356
<dependency>
357357
<groupId>com.madgag</groupId>
358-
<artifactId>scala-arm_${scala.version}</artifactId>
358+
<artifactId>scala-arm_${scala.compat.version}</artifactId>
359359
<version>1.3.4</version>
360360
</dependency>
361361
<dependency>
362362
<groupId>org.specs2</groupId>
363-
<artifactId>specs2-core_${scala.version}</artifactId>
363+
<artifactId>specs2-core_${scala.compat.version}</artifactId>
364364
<version>${specs2.version}</version>
365365
<scope>test</scope>
366366
</dependency>
367367
<dependency>
368368
<groupId>org.specs2</groupId>
369-
<artifactId>specs2-common_${scala.version}</artifactId>
369+
<artifactId>specs2-common_${scala.compat.version}</artifactId>
370370
<version>${specs2.version}</version>
371371
<scope>test</scope>
372372
</dependency>
373373
<dependency>
374374
<groupId>org.specs2</groupId>
375-
<artifactId>specs2-matcher_${scala.version}</artifactId>
375+
<artifactId>specs2-matcher_${scala.compat.version}</artifactId>
376376
<version>${specs2.version}</version>
377377
<scope>test</scope>
378378
</dependency>
379379
<dependency>
380380
<groupId>org.specs2</groupId>
381-
<artifactId>specs2-junit_${scala.version}</artifactId>
381+
<artifactId>specs2-junit_${scala.compat.version}</artifactId>
382382
<version>${specs2.version}</version>
383383
<scope>test</scope>
384384
</dependency>

‎csv-validator-ui/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@
105105
</dependency>
106106
<dependency>
107107
<groupId>org.scala-lang.modules</groupId>
108-
<artifactId>scala-swing_${scala.version}</artifactId>
108+
<artifactId>scala-swing_${scala.compat.version}</artifactId>
109109
<version>2.0.0-M2</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>com.madgag</groupId>
113-
<artifactId>scala-arm_${scala.version}</artifactId>
113+
<artifactId>scala-arm_${scala.compat.version}</artifactId>
114114
</dependency>
115115
<dependency>
116116
<groupId>com.github.scala-incubator.io</groupId>
117-
<artifactId>scala-io-file_${scala.version}</artifactId>
117+
<artifactId>scala-io-file_${scala.compat.version}</artifactId>
118118
<exclusions>
119119
<exclusion>
120120
<!-- see https://github.com/jesseeichar/scala-io/issues/94 -->

0 commit comments

Comments
 (0)