From 8cc59d7f98fa23d365da031c94de1b7a9d2684a4 Mon Sep 17 00:00:00 2001 From: Ashish Date: Wed, 20 Oct 2021 23:58:57 -0700 Subject: [PATCH 1/8] Updated the build.sbt to make build successful --- build.sbt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index d2691f9..046a551 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ homepage := Some(url("https://github.com/metamx/druid-spark-batch")) crossScalaVersions := Seq("2.11.12", "2.10.6") releaseIgnoreUntrackedFiles := true -val druid_version = "0.12.1-rc3-SNAPSHOT" +val druid_version = "0.12.3" // This is just used here for Path, so anything that doesn't break spark should be fine val hadoop_version = "2.7.3" val spark_version = "2.1.0" @@ -120,9 +120,9 @@ assemblyMergeStrategy in assembly := { xs map { _.toLowerCase } match { - case ("manifest.mf" :: Nil) | ("index.list" :: Nil) | ("dependencies" :: Nil) => + case "manifest.mf" :: Nil | "index.list" :: Nil | "dependencies" :: Nil => MergeStrategy.discard - case ps@(x :: xs) if ps.last.endsWith(".sf") || ps.last.endsWith(".dsa") => + case ps@ x :: xs if ps.last.endsWith(".sf") || ps.last.endsWith(".dsa") => MergeStrategy.discard case "services" :: xs => MergeStrategy.filterDistinctLines @@ -142,26 +142,26 @@ resolvers += "JitPack.IO" at "https://jitpack.io" publishMavenStyle := true -//TODO: remove this before moving to druid.io -publishTo := Some("central-local" at "https://metamx.artifactoryonline.com/metamx/libs-releases-local") -pomIncludeRepository := { _ => false } +////: remove this before moving to druid.io +//publishTo := Some("central-local" at "https://metamx.artifactoryonline.com/metamx/libs-releases-local") +//pomIncludeRepository := { _ => false } -pomExtra := ( +pomExtra := - https://github.com/metamx/druid-spark-batch.git - scm:git:git@github.com:metamx/druid-spark-batch.git + https://github.com/averma111/druid-spark-batch.git + scm:git:git@https://github.com/averma111/druid-spark-batch.git - Metamarkets Open Source Team - oss@metamarkets.com - Metamarkets Group Inc. - https://www.metamarkets.com + Inside ETL Team + email@insideetl.com + Insideetl Inc + https://www.insideetl.com - ) + testOptions += Tests.Argument(TestFrameworks.JUnit, "-Duser.timezone=UTC") // WTF SBT? javaOptions in Test += "-Duser.timezone=UTC" -fork in Test := true +fork in Test := false From b0603c70401f1a506184837155e3587b084a1baa Mon Sep 17 00:00:00 2001 From: Ashish Date: Thu, 21 Oct 2021 00:08:22 -0700 Subject: [PATCH 2/8] Updated for Druid api version 0.12.3 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 36bece2..0aa7b79 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.12.1.1-SNAPSHOT" +version in ThisBuild := "0.12.3" From d815cce23020981510e0ea4fdca872afb7f74d8e Mon Sep 17 00:00:00 2001 From: averma111 <43510964+averma111@users.noreply.github.com> Date: Thu, 21 Oct 2021 00:27:43 -0700 Subject: [PATCH 3/8] Scala.yaml --- .github/workflows/scala.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/scala.yml diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml new file mode 100644 index 0000000..6814686 --- /dev/null +++ b/.github/workflows/scala.yml @@ -0,0 +1,22 @@ +name: Scala CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Run tests + run: sbt test From 0e0a8ec0f945bad378a76579f3f79839228ecf6e Mon Sep 17 00:00:00 2001 From: averma111 <43510964+averma111@users.noreply.github.com> Date: Thu, 21 Oct 2021 00:37:45 -0700 Subject: [PATCH 4/8] Update scala.yml --- .github/workflows/scala.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 6814686..eec2972 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -18,5 +18,5 @@ jobs: with: java-version: '11' distribution: 'adopt' - - name: Run tests - run: sbt test + - name: Run Package + run: sbt clean package From 4409ef0271e86c360ca4b849b9b944de32704551 Mon Sep 17 00:00:00 2001 From: averma111 Date: Thu, 21 Oct 2021 01:14:29 -0700 Subject: [PATCH 5/8] Updated travis.yml --- .travis.yml | 8 +++++++- README.md | 2 +- project/build.properties | 1 + project/plugins.sbt | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 279cf79..3785617 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,20 @@ language: scala +after_success: + - bash <(curl -s https://codecov.io/bash) scala: - 2.10.6 - 2.11.12 script: - - sbt ++$TRAVIS_SCALA_VERSION test + - sbt clean coverage test coverageReport sudo: false cache: directories: - $HOME/.m2 + + + + diff --git a/README.md b/README.md index 1172cf3..5071977 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/metamx/druid-spark-batch.svg?branch=master)](https://travis-ci.org/metamx/druid-spark-batch) +[![AppVeyor Build](https://img.shields.io/appveyor/build/averma111/druid-spark-batch?style=plastic)](https://ci.appveyor.com/project/averma111/druid-spark-batch) # druid-spark-batch Druid indexing plugin for using Spark in batch jobs diff --git a/project/build.properties b/project/build.properties index 36183c0..0421f6a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -18,3 +18,4 @@ # sbt.version = 0.13.8 +#sbt.version = 1.5.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 652b260..e4cb50a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,3 +4,4 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") From 4a5d7f42cdd7ed339085d9af56170c2e27d5f9db Mon Sep 17 00:00:00 2001 From: averma111 <43510964+averma111@users.noreply.github.com> Date: Thu, 21 Oct 2021 01:18:18 -0700 Subject: [PATCH 6/8] Update scala.yml --- .github/workflows/scala.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index eec2972..5c66e28 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -18,5 +18,5 @@ jobs: with: java-version: '11' distribution: 'adopt' - - name: Run Package - run: sbt clean package + - name: Run Test + run: sbt test From df0092eb7697c5ae9a6fb96335578b8cee390bba Mon Sep 17 00:00:00 2001 From: averma111 Date: Thu, 21 Oct 2021 01:27:17 -0700 Subject: [PATCH 7/8] Updated build.sbt file --- build.sbt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 046a551..333cfa0 100644 --- a/build.sbt +++ b/build.sbt @@ -148,15 +148,15 @@ publishMavenStyle := true pomExtra := - https://github.com/averma111/druid-spark-batch.git - scm:git:git@https://github.com/averma111/druid-spark-batch.git + https://github.com/metamx/druid-spark-batch.git + scm:git:git@github.com:metamx/druid-spark-batch.git - Inside ETL Team - email@insideetl.com - Insideetl Inc - https://www.insideetl.com + Metamarkets Open Source Team + oss@metamarkets.com + Metamarkets Group Inc + https://www.metamarkets.com From 56e5111ce653a13eae0631e5adee0e9e795b5224 Mon Sep 17 00:00:00 2001 From: averma111 <43510964+averma111@users.noreply.github.com> Date: Thu, 21 Oct 2021 01:30:13 -0700 Subject: [PATCH 8/8] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 333cfa0..c2ea4ae 100644 --- a/build.sbt +++ b/build.sbt @@ -155,7 +155,7 @@ pomExtra := Metamarkets Open Source Team oss@metamarkets.com - Metamarkets Group Inc + Metamarkets Group Inc. https://www.metamarkets.com