Skip to content

Commit 15e648e

Browse files
fnothaftfnothaft
committed
Modifying pom.xml files to move back to Scala 2.10 for development.
1 parent f47c278 commit 15e648e

File tree

9 files changed

+73
-68
lines changed

9 files changed

+73
-68
lines changed

‎CHANGES.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# UTILS #
22

3+
### Version plugin] prepare release 0.2.6 ###
4+
5+
### Version 0.2.6 ###
6+
* ISSUE [72](https://github.com/bigdatagenomics/bdg-utils/pull/72): Remove dependency on Spark internal Logging
7+
38
### Version 0.2.5 ###
49
* ISSUE [67](https://github.com/bigdatagenomics/bdg-utils/pull/67): Modifying pom.xml files to move back to Scala 2.10 for development.
510

‎pom.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<modelVersion>4.0.0</modelVersion>
1111
<groupId>org.bdgenomics.utils</groupId>
12-
<artifactId>utils-parent_2.11</artifactId>
12+
<artifactId>utils-parent_2.10</artifactId>
1313
<version>0.2.7-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515
<name>utils</name>
@@ -64,8 +64,8 @@
6464
</issueManagement>
6565

6666
<build>
67-
<outputDirectory>target/scala-2.11.4/classes</outputDirectory>
68-
<testOutputDirectory>target/scala-2.11.4/test-classes</testOutputDirectory>
67+
<outputDirectory>target/scala-2.10.4/classes</outputDirectory>
68+
<testOutputDirectory>target/scala-2.10.4/test-classes</testOutputDirectory>
6969
<pluginManagement>
7070
<plugins>
7171
<plugin>
@@ -81,7 +81,7 @@
8181
<mavenExecutorId>forked-path</mavenExecutorId>
8282
<useReleaseProfile>false</useReleaseProfile>
8383
<arguments>-Psonatype-oss-release</arguments>
84-
<tagNameFormat>utils-parent_2.11-${project.version}</tagNameFormat>
84+
<tagNameFormat>utils-parent_2.10-${project.version}</tagNameFormat>
8585
</configuration>
8686
</plugin>
8787
<plugin>
@@ -229,7 +229,7 @@
229229
</execution>
230230
</executions>
231231
<configuration>
232-
<scalaVersion>2.11.4</scalaVersion>
232+
<scalaVersion>2.10.4</scalaVersion>
233233
<useZincServer>true</useZincServer>
234234
<args>
235235
<arg>-unchecked</arg>
@@ -279,24 +279,24 @@
279279
</dependency>
280280
<dependency>
281281
<groupId>org.bdgenomics.utils</groupId>
282-
<artifactId>utils-misc_2.11</artifactId>
282+
<artifactId>utils-misc_2.10</artifactId>
283283
<version>${project.version}</version>
284284
</dependency>
285285
<dependency>
286286
<groupId>org.bdgenomics.utils</groupId>
287-
<artifactId>utils-misc_2.11</artifactId>
287+
<artifactId>utils-misc_2.10</artifactId>
288288
<version>${project.version}</version>
289289
<scope>test</scope>
290290
<type>test-jar</type>
291291
</dependency>
292292
<dependency>
293293
<groupId>org.bdgenomics.utils</groupId>
294-
<artifactId>utils-io_2.11</artifactId>
294+
<artifactId>utils-io_2.10</artifactId>
295295
<version>${project.version}</version>
296296
</dependency>
297297
<dependency>
298298
<groupId>org.bdgenomics.utils</groupId>
299-
<artifactId>utils-metrics_2.11</artifactId>
299+
<artifactId>utils-metrics_2.10</artifactId>
300300
<version>${project.version}</version>
301301
</dependency>
302302
<dependency>
@@ -306,19 +306,19 @@
306306
</dependency>
307307
<dependency>
308308
<groupId>org.scalatest</groupId>
309-
<artifactId>scalatest_2.11</artifactId>
309+
<artifactId>scalatest_2.10</artifactId>
310310
<version>2.2.5</version>
311311
<scope>test</scope>
312312
</dependency>
313313
<dependency>
314314
<groupId>org.scoverage</groupId>
315-
<artifactId>scalac-scoverage-plugin_2.11</artifactId>
315+
<artifactId>scalac-scoverage-plugin_2.10</artifactId>
316316
<version>${scoverage.version}</version>
317317
</dependency>
318318
<dependency>
319319
<groupId>org.scala-lang</groupId>
320320
<artifactId>scala-library</artifactId>
321-
<version>2.11.4</version>
321+
<version>2.10.4</version>
322322
</dependency>
323323
<dependency>
324324
<groupId>org.apache.hadoop</groupId>
@@ -354,7 +354,7 @@
354354
</dependency>
355355
<dependency>
356356
<groupId>org.apache.spark</groupId>
357-
<artifactId>spark-core_2.11</artifactId>
357+
<artifactId>spark-core_2.10</artifactId>
358358
<version>${spark.version}</version>
359359
<scope>provided</scope>
360360
<exclusions>
@@ -364,7 +364,7 @@
364364
</exclusion>
365365
<exclusion>
366366
<groupId>org.twitter</groupId>
367-
<artifactId>chill_2.11</artifactId>
367+
<artifactId>chill_2.10</artifactId>
368368
</exclusion>
369369
<exclusion>
370370
<groupId>org.apache.hadoop</groupId>
@@ -374,7 +374,7 @@
374374
</dependency>
375375
<dependency>
376376
<groupId>org.scalanlp</groupId>
377-
<artifactId>breeze_2.11</artifactId>
377+
<artifactId>breeze_2.10</artifactId>
378378
<version>0.10</version>
379379
</dependency>
380380
<dependency>
@@ -395,7 +395,7 @@
395395
</dependency>
396396
<dependency>
397397
<groupId>org.apache.spark</groupId>
398-
<artifactId>spark-mllib_2.11</artifactId>
398+
<artifactId>spark-mllib_2.10</artifactId>
399399
<version>${spark.version}</version>
400400
<scope>provided</scope>
401401
</dependency>
@@ -453,7 +453,7 @@
453453
</execution>
454454
</executions>
455455
<configuration>
456-
<scalaVersion>2.11.4</scalaVersion>
456+
<scalaVersion>2.10.4</scalaVersion>
457457
<useZincServer>true</useZincServer>
458458
<args>
459459
<arg>-unchecked</arg>
@@ -475,7 +475,7 @@
475475
<compilerPlugins>
476476
<compilerPlugin>
477477
<groupId>org.scoverage</groupId>
478-
<artifactId>scalac-scoverage-plugin_2.11</artifactId>
478+
<artifactId>scalac-scoverage-plugin_2.10</artifactId>
479479
<version>${scoverage.version}</version>
480480
</compilerPlugin>
481481
</compilerPlugins>

‎utils-cli/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.bdgenomics.utils</groupId>
6-
<artifactId>utils-parent_2.11</artifactId>
6+
<artifactId>utils-parent_2.10</artifactId>
77
<version>0.2.7-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

11-
<artifactId>utils-cli_2.11</artifactId>
11+
<artifactId>utils-cli_2.10</artifactId>
1212
<packaging>jar</packaging>
13-
<name>utils-cli_2.11: utilities for building command line applications</name>
13+
<name>utils-cli_2.10: utilities for building command line applications</name>
1414
<build>
1515
<plugins>
1616
<!-- disable surefire -->
@@ -66,15 +66,15 @@
6666
</dependency>
6767
<dependency>
6868
<groupId>org.apache.spark</groupId>
69-
<artifactId>spark-core_2.11</artifactId>
69+
<artifactId>spark-core_2.10</artifactId>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.bdgenomics.utils</groupId>
73-
<artifactId>utils-misc_2.11</artifactId>
73+
<artifactId>utils-misc_2.10</artifactId>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.bdgenomics.utils</groupId>
77-
<artifactId>utils-metrics_2.11</artifactId>
77+
<artifactId>utils-metrics_2.10</artifactId>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.scala-lang</groupId>

‎utils-io/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.bdgenomics.utils</groupId>
6-
<artifactId>utils-parent_2.11</artifactId>
6+
<artifactId>utils-parent_2.10</artifactId>
77
<version>0.2.7-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
10-
<artifactId>utils-io_2.11</artifactId>
10+
<artifactId>utils-io_2.10</artifactId>
1111
<packaging>jar</packaging>
12-
<name>utils-io_2.11: I/O utils</name>
12+
<name>utils-io_2.10: I/O utils</name>
1313
<build>
1414
<plugins>
1515
<!-- disable surefire -->
@@ -90,17 +90,17 @@
9090
<dependencies>
9191
<dependency>
9292
<groupId>org.bdgenomics.utils</groupId>
93-
<artifactId>utils-misc_2.11</artifactId>
93+
<artifactId>utils-misc_2.10</artifactId>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.bdgenomics.utils</groupId>
97-
<artifactId>utils-misc_2.11</artifactId>
97+
<artifactId>utils-misc_2.10</artifactId>
9898
<scope>test</scope>
9999
<type>test-jar</type>
100100
</dependency>
101101
<dependency>
102102
<groupId>org.bdgenomics.utils</groupId>
103-
<artifactId>utils-metrics_2.11</artifactId>
103+
<artifactId>utils-metrics_2.10</artifactId>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.scala-lang</groupId>
@@ -112,11 +112,11 @@
112112
</dependency>
113113
<dependency>
114114
<groupId>org.apache.spark</groupId>
115-
<artifactId>spark-core_2.11</artifactId>
115+
<artifactId>spark-core_2.10</artifactId>
116116
</dependency>
117117
<dependency>
118118
<groupId>org.scalatest</groupId>
119-
<artifactId>scalatest_2.11</artifactId>
119+
<artifactId>scalatest_2.10</artifactId>
120120
<scope>test</scope>
121121
</dependency>
122122
<dependency>

‎utils-metrics/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.bdgenomics.utils</groupId>
6-
<artifactId>utils-parent_2.11</artifactId>
6+
<artifactId>utils-parent_2.10</artifactId>
77
<version>0.2.7-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
10-
<artifactId>utils-metrics_2.11</artifactId>
10+
<artifactId>utils-metrics_2.10</artifactId>
1111
<packaging>jar</packaging>
12-
<name>utils-metrics_2.11: tools for collecting metrics on top of RDDs</name>
12+
<name>utils-metrics_2.10: tools for collecting metrics on top of RDDs</name>
1313
<build>
1414
<plugins>
1515
<!-- disable surefire -->
@@ -90,13 +90,13 @@
9090
<dependencies>
9191
<dependency>
9292
<groupId>org.bdgenomics.utils</groupId>
93-
<artifactId>utils-misc_2.11</artifactId>
93+
<artifactId>utils-misc_2.10</artifactId>
9494
<scope>test</scope>
9595
<type>test-jar</type>
9696
</dependency>
9797
<dependency>
9898
<groupId>org.bdgenomics.utils</groupId>
99-
<artifactId>utils-misc_2.11</artifactId>
99+
<artifactId>utils-misc_2.10</artifactId>
100100
</dependency>
101101
<dependency>
102102
<groupId>com.netflix.servo</groupId>
@@ -112,11 +112,11 @@
112112
</dependency>
113113
<dependency>
114114
<groupId>org.apache.spark</groupId>
115-
<artifactId>spark-core_2.11</artifactId>
115+
<artifactId>spark-core_2.10</artifactId>
116116
</dependency>
117117
<dependency>
118118
<groupId>org.scalatest</groupId>
119-
<artifactId>scalatest_2.11</artifactId>
119+
<artifactId>scalatest_2.10</artifactId>
120120
<scope>test</scope>
121121
</dependency>
122122
<dependency>

‎utils-minhash/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.bdgenomics.utils</groupId>
6-
<artifactId>utils-parent_2.11</artifactId>
6+
<artifactId>utils-parent_2.10</artifactId>
77
<version>0.2.7-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
10-
<artifactId>utils-minhash_2.11</artifactId>
10+
<artifactId>utils-minhash_2.10</artifactId>
1111
<packaging>jar</packaging>
12-
<name>utils-minhash_2.11: MinHash-based Jaccard similarity estimator</name>
12+
<name>utils-minhash_2.10: MinHash-based Jaccard similarity estimator</name>
1313
<build>
1414
<plugins>
1515
<!-- disable surefire -->
@@ -90,13 +90,13 @@
9090
<dependencies>
9191
<dependency>
9292
<groupId>org.bdgenomics.utils</groupId>
93-
<artifactId>utils-misc_2.11</artifactId>
93+
<artifactId>utils-misc_2.10</artifactId>
9494
<scope>test</scope>
9595
<type>test-jar</type>
9696
</dependency>
9797
<dependency>
9898
<groupId>org.bdgenomics.utils</groupId>
99-
<artifactId>utils-misc_2.11</artifactId>
99+
<artifactId>utils-misc_2.10</artifactId>
100100
</dependency>
101101
<dependency>
102102
<groupId>org.scala-lang</groupId>
@@ -108,16 +108,16 @@
108108
</dependency>
109109
<dependency>
110110
<groupId>org.apache.spark</groupId>
111-
<artifactId>spark-core_2.11</artifactId>
111+
<artifactId>spark-core_2.10</artifactId>
112112
</dependency>
113113
<dependency>
114114
<groupId>org.scalatest</groupId>
115-
<artifactId>scalatest_2.11</artifactId>
115+
<artifactId>scalatest_2.10</artifactId>
116116
<scope>test</scope>
117117
</dependency>
118118
<dependency>
119119
<groupId>org.apache.spark</groupId>
120-
<artifactId>spark-mllib_2.11</artifactId>
120+
<artifactId>spark-mllib_2.10</artifactId>
121121
</dependency>
122122
</dependencies>
123123

‎utils-misc/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.bdgenomics.utils</groupId>
6-
<artifactId>utils-parent_2.11</artifactId>
6+
<artifactId>utils-parent_2.10</artifactId>
77
<version>0.2.7-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
10-
<artifactId>utils-misc_2.11</artifactId>
10+
<artifactId>utils-misc_2.10</artifactId>
1111
<packaging>jar</packaging>
12-
<name>utils-misc_2.11: Miscellaneous Spark helper code</name>
12+
<name>utils-misc_2.10: Miscellaneous Spark helper code</name>
1313
<build>
1414
<plugins>
1515
<!-- disable surefire -->
@@ -98,11 +98,11 @@
9898
</dependency>
9999
<dependency>
100100
<groupId>org.apache.spark</groupId>
101-
<artifactId>spark-core_2.11</artifactId>
101+
<artifactId>spark-core_2.10</artifactId>
102102
</dependency>
103103
<dependency>
104104
<groupId>org.scalatest</groupId>
105-
<artifactId>scalatest_2.11</artifactId>
105+
<artifactId>scalatest_2.10</artifactId>
106106
<scope>test</scope>
107107
</dependency>
108108
</dependencies>

0 commit comments

Comments
 (0)