Modifying pom.xml files to move back to Scala 2.10 for development.

bigdatagenomics · May 6, 2016 · 15e648e · 15e648e
1 parent f47c278
commit 15e648e
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 68 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,10 @@
 # UTILS #
 
+### Version plugin] prepare release 0.2.6 ###
+
+### Version 0.2.6 ###
+* ISSUE [72](https://github.com/bigdatagenomics/bdg-utils/pull/72): Remove dependency on Spark internal Logging
+
 ### Version 0.2.5 ###
 * ISSUE [67](https://github.com/bigdatagenomics/bdg-utils/pull/67): Modifying pom.xml files to move back to Scala 2.10 for development.
 

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bdgenomics.utils</groupId>
-  <artifactId>utils-parent_2.11</artifactId>
+  <artifactId>utils-parent_2.10</artifactId>
   <version>0.2.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>utils</name>
@@ -64,8 +64,8 @@
   </issueManagement>
 
   <build>
-    <outputDirectory>target/scala-2.11.4/classes</outputDirectory>
-    <testOutputDirectory>target/scala-2.11.4/test-classes</testOutputDirectory>
+    <outputDirectory>target/scala-2.10.4/classes</outputDirectory>
+    <testOutputDirectory>target/scala-2.10.4/test-classes</testOutputDirectory>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -81,7 +81,7 @@
             <mavenExecutorId>forked-path</mavenExecutorId>
             <useReleaseProfile>false</useReleaseProfile>
             <arguments>-Psonatype-oss-release</arguments>
-            <tagNameFormat>utils-parent_2.11-${project.version}</tagNameFormat>
+            <tagNameFormat>utils-parent_2.10-${project.version}</tagNameFormat>
           </configuration>
         </plugin>
         <plugin>
@@ -229,7 +229,7 @@
           </execution>
         </executions>
         <configuration>
-          <scalaVersion>2.11.4</scalaVersion>
+          <scalaVersion>2.10.4</scalaVersion>
           <useZincServer>true</useZincServer>
           <args>
             <arg>-unchecked</arg>
@@ -279,24 +279,24 @@
       </dependency>
       <dependency>
         <groupId>org.bdgenomics.utils</groupId>
-        <artifactId>utils-misc_2.11</artifactId>
+        <artifactId>utils-misc_2.10</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bdgenomics.utils</groupId>
-        <artifactId>utils-misc_2.11</artifactId>
+        <artifactId>utils-misc_2.10</artifactId>
         <version>${project.version}</version>
         <scope>test</scope>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.bdgenomics.utils</groupId>
-        <artifactId>utils-io_2.11</artifactId>
+        <artifactId>utils-io_2.10</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bdgenomics.utils</groupId>
-        <artifactId>utils-metrics_2.11</artifactId>
+        <artifactId>utils-metrics_2.10</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -306,19 +306,19 @@
       </dependency>
       <dependency>
         <groupId>org.scalatest</groupId>
-        <artifactId>scalatest_2.11</artifactId>
+        <artifactId>scalatest_2.10</artifactId>
         <version>2.2.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.scoverage</groupId>
-        <artifactId>scalac-scoverage-plugin_2.11</artifactId>
+        <artifactId>scalac-scoverage-plugin_2.10</artifactId>
         <version>${scoverage.version}</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>2.11.4</version>
+        <version>2.10.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -354,7 +354,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
-        <artifactId>spark-core_2.11</artifactId>
+        <artifactId>spark-core_2.10</artifactId>
         <version>${spark.version}</version>
         <scope>provided</scope>
         <exclusions>
@@ -364,7 +364,7 @@
           </exclusion>
           <exclusion>
             <groupId>org.twitter</groupId>
-            <artifactId>chill_2.11</artifactId>
+            <artifactId>chill_2.10</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.apache.hadoop</groupId>
@@ -374,7 +374,7 @@
       </dependency>
       <dependency>
         <groupId>org.scalanlp</groupId>
-        <artifactId>breeze_2.11</artifactId>
+        <artifactId>breeze_2.10</artifactId>
         <version>0.10</version>
       </dependency>
       <dependency>
@@ -395,7 +395,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
-        <artifactId>spark-mllib_2.11</artifactId>
+        <artifactId>spark-mllib_2.10</artifactId>
         <version>${spark.version}</version>
         <scope>provided</scope>
       </dependency>
@@ -453,7 +453,7 @@
               </execution>
             </executions>
             <configuration>
-              <scalaVersion>2.11.4</scalaVersion>
+              <scalaVersion>2.10.4</scalaVersion>
               <useZincServer>true</useZincServer>
               <args>
                 <arg>-unchecked</arg>
@@ -475,7 +475,7 @@
               <compilerPlugins>
                 <compilerPlugin>
                   <groupId>org.scoverage</groupId>
-                  <artifactId>scalac-scoverage-plugin_2.11</artifactId>
+                  <artifactId>scalac-scoverage-plugin_2.10</artifactId>
                   <version>${scoverage.version}</version>
                 </compilerPlugin>
               </compilerPlugins>

diff --git a/utils-cli/pom.xml b/utils-cli/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.utils</groupId>
-    <artifactId>utils-parent_2.11</artifactId>
+    <artifactId>utils-parent_2.10</artifactId>
     <version>0.2.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>utils-cli_2.11</artifactId>
+  <artifactId>utils-cli_2.10</artifactId>
   <packaging>jar</packaging>
-  <name>utils-cli_2.11: utilities for building command line applications</name>
+  <name>utils-cli_2.10: utilities for building command line applications</name>
   <build>
     <plugins>
       <!-- disable surefire -->
@@ -66,15 +66,15 @@
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.11</artifactId>
+      <artifactId>spark-core_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-misc_2.11</artifactId>
+      <artifactId>utils-misc_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-metrics_2.11</artifactId>
+      <artifactId>utils-metrics_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>

diff --git a/utils-io/pom.xml b/utils-io/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.utils</groupId>
-    <artifactId>utils-parent_2.11</artifactId>
+    <artifactId>utils-parent_2.10</artifactId>
     <version>0.2.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>utils-io_2.11</artifactId>
+  <artifactId>utils-io_2.10</artifactId>
   <packaging>jar</packaging>
-  <name>utils-io_2.11: I/O utils</name>
+  <name>utils-io_2.10: I/O utils</name>
   <build>
     <plugins>
       <!-- disable surefire -->
@@ -90,17 +90,17 @@
   <dependencies>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-misc_2.11</artifactId>
+      <artifactId>utils-misc_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-misc_2.11</artifactId>
+      <artifactId>utils-misc_2.10</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-metrics_2.11</artifactId>
+      <artifactId>utils-metrics_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
@@ -112,11 +112,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.11</artifactId>
+      <artifactId>spark-core_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.11</artifactId>
+      <artifactId>scalatest_2.10</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/utils-metrics/pom.xml b/utils-metrics/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.utils</groupId>
-    <artifactId>utils-parent_2.11</artifactId>
+    <artifactId>utils-parent_2.10</artifactId>
     <version>0.2.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>utils-metrics_2.11</artifactId>
+  <artifactId>utils-metrics_2.10</artifactId>
   <packaging>jar</packaging>
-  <name>utils-metrics_2.11: tools for collecting metrics on top of RDDs</name>
+  <name>utils-metrics_2.10: tools for collecting metrics on top of RDDs</name>
   <build>
     <plugins>
       <!-- disable surefire -->
@@ -90,13 +90,13 @@
   <dependencies>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-misc_2.11</artifactId>
+      <artifactId>utils-misc_2.10</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-misc_2.11</artifactId>
+      <artifactId>utils-misc_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>com.netflix.servo</groupId>
@@ -112,11 +112,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.11</artifactId>
+      <artifactId>spark-core_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.11</artifactId>
+      <artifactId>scalatest_2.10</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/utils-minhash/pom.xml b/utils-minhash/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.utils</groupId>
-    <artifactId>utils-parent_2.11</artifactId>
+    <artifactId>utils-parent_2.10</artifactId>
     <version>0.2.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>utils-minhash_2.11</artifactId>
+  <artifactId>utils-minhash_2.10</artifactId>
   <packaging>jar</packaging>
-  <name>utils-minhash_2.11: MinHash-based Jaccard similarity estimator</name>
+  <name>utils-minhash_2.10: MinHash-based Jaccard similarity estimator</name>
   <build>
     <plugins>
       <!-- disable surefire -->
@@ -90,13 +90,13 @@
   <dependencies>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-misc_2.11</artifactId>
+      <artifactId>utils-misc_2.10</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
       <groupId>org.bdgenomics.utils</groupId>
-      <artifactId>utils-misc_2.11</artifactId>
+      <artifactId>utils-misc_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
@@ -108,16 +108,16 @@
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.11</artifactId>
+      <artifactId>spark-core_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.11</artifactId>
+      <artifactId>scalatest_2.10</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-mllib_2.11</artifactId>
+      <artifactId>spark-mllib_2.10</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/utils-misc/pom.xml b/utils-misc/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.utils</groupId>
-    <artifactId>utils-parent_2.11</artifactId>
+    <artifactId>utils-parent_2.10</artifactId>
     <version>0.2.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>utils-misc_2.11</artifactId>
+  <artifactId>utils-misc_2.10</artifactId>
   <packaging>jar</packaging>
-  <name>utils-misc_2.11: Miscellaneous Spark helper code</name>
+  <name>utils-misc_2.10: Miscellaneous Spark helper code</name>
   <build>
     <plugins>
       <!-- disable surefire -->
@@ -98,11 +98,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.11</artifactId>
+      <artifactId>spark-core_2.10</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.11</artifactId>
+      <artifactId>scalatest_2.10</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>