Release 0.3.10 (#334)

Changelog: * Update sbt to 1.4.7 * Create codacy-analysis.yml (#302) * Create codacy-analysis.yml * [sbt] patch updates (#307) Closes #306 , #304 , #300 , #301 , #300 , #291 , #275 * Update scalatest to 3.2.8 (#317) * Update scalactic to 3.2.8 (#316) * Update sbt-release to 1.0.15 (#308) * Update sbt-pgp to 2.1.2 (#309) * Update scalactic to 3.2.9 (#325) * Update scalatest to 3.2.9 (#326) * Update spark-core, spark-mllib, spark-sql to 2.4.8 (#327) * Update algebird-core to 0.13.8 (#330) * Update jts-core to 1.18.1 (#312) * Update sbt-scoverage to 1.8.2 (#331) * Update lucene-analyzers-common, ... to 8.8.2 (#311) * [hotfix] sbt migration (#332) * Update spatial4j to 0.8 (#313) * Update sbt to 1.5.3 (#333)
zouzias · Jun 2, 2021 · 7e89ced · 7e89ced
1 parent a92786a
commit 7e89ced
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 21 deletions.
diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
@@ -0,0 +1,49 @@
+# This workflow checks out code, performs a Codacy security scan
+# and integrates the results with the
+# GitHub Advanced Security code scanning feature.  For more information on
+# the Codacy security scan action usage and parameters, see
+# https://github.com/codacy/codacy-analysis-cli-action.
+# For more information on Codacy Analysis CLI in general, see
+# https://github.com/codacy/codacy-analysis-cli.
+
+name: Codacy Security Scan
+
+on:
+  push:
+    branches: [ master, BRANCH-0.1.x, BRANCH-0.2.x, develop ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '36 23 * * 5'
+
+jobs:
+  codacy-security-scan:
+    name: Codacy Security Scan
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the repository to the GitHub Actions runner
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
+      - name: Run Codacy Analysis CLI
+        uses: codacy/codacy-analysis-cli-action@1.1.0
+        with:
+          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
+          # You can also omit the token and run the tools that support default configurations
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          verbose: true
+          output: results.sarif
+          format: sarif
+          # Adjust severity of non-security issues
+          gh-code-scanning-compat: true
+          # Force 0 exit code to allow SARIF file generation
+          # This will handover control about PR rejection to the GitHub side
+          max-allowed-issues: 2147483647
+
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF results file
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: results.sarif
diff --git a/build.sbt b/build.sbt
@@ -61,7 +61,7 @@ publishTo := {
   }
 }
 
-publishArtifact in Test := false
+Test / publishArtifact := false
 
 pomIncludeRepository := { _ => false }
 
@@ -79,29 +79,28 @@ pomExtra := <scm>
 
 credentials += Credentials(Path.userHome / ".sbt" / ".credentials")
 
-val luceneV = "8.4.1"
-val sparkVersion = "2.4.7"
+val luceneV = "8.8.2"
+val sparkVersion = "2.4.8"
 
 
 // scalastyle:off
-val scalactic                 = "org.scalactic"                  %% "scalactic"                % "3.2.3"
-val scalatest                 = "org.scalatest"                  %% "scalatest"                % "3.2.3" % "test"
+val scalactic                 = "org.scalactic"                  %% "scalactic"                % "3.2.9"
+val scalatest                 = "org.scalatest"                  %% "scalatest"                % "3.2.9" % "test"
 
-val joda_time                 = "joda-time"                      % "joda-time"                 % "2.10.8"
-val algebird                  = "com.twitter"                    %% "algebird-core"            % "0.13.7"
+val joda_time                 = "joda-time"                      % "joda-time"                 % "2.10.10"
+val algebird                  = "com.twitter"                    %% "algebird-core"            % "0.13.8"
 val joda_convert              = "org.joda"                       % "joda-convert"              % "2.2.1"
-val spatial4j                 = "org.locationtech.spatial4j"     % "spatial4j"                 % "0.7"
+val spatial4j                 = "org.locationtech.spatial4j"     % "spatial4j"                 % "0.8"
 
 val typesafe_config           = "com.typesafe"                   % "config"                    % "1.3.4"
 
 val lucene_facet              = "org.apache.lucene"              % "lucene-facet"              % luceneV
 val lucene_analyzers          = "org.apache.lucene"              % "lucene-analyzers-common"   % luceneV
 val lucene_query_parsers      = "org.apache.lucene"              % "lucene-queryparser"        % luceneV
 val lucene_expressions        = "org.apache.lucene"              % "lucene-expressions"        % luceneV
-val lucene_spatial            = "org.apache.lucene"              % "lucene-spatial"            % luceneV
 val lucene_spatial_extras     = "org.apache.lucene"              % "lucene-spatial-extras"     % luceneV
 
-val jts                       = "org.locationtech.jts"           % "jts-core"                  % "1.17.1"
+val jts                       = "org.locationtech.jts"           % "jts-core"                  % "1.18.1"
 // scalastyle:on
 
 
@@ -112,7 +111,6 @@ libraryDependencies ++= Seq(
   lucene_expressions,
   lucene_query_parsers,
   typesafe_config,
-  lucene_spatial,
   lucene_spatial_extras,
   spatial4j,
   jts,
@@ -146,7 +144,16 @@ lazy val compileScalastyle = taskKey[Unit]("compileScalastyle")
 compileScalastyle := scalastyle.in(Compile).toTask("").value
 (compile in Compile) := ((compile in Compile) dependsOn compileScalastyle).value
 
-parallelExecution in Test := false
+Test / parallelExecution := false
 
 // Skip tests during assembly
-test in assembly := {}
+assembly / test := {}
+
+// To avoid merge issues
+assembly / assemblyMergeStrategy := {
+    case PathList("module-info.class", xs @ _*) => MergeStrategy.first
+    case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
+    case x =>
+    val oldStrategy = (assembly / assemblyMergeStrategy).value
+    oldStrategy(x)
+}
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.3
+sbt.version=1.5.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -19,18 +19,18 @@ resolvers += "bintray-spark-packages" at "https://dl.bintray.com/spark-packages/
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
diff --git a/spark-shell.sh b/spark-shell.sh
@@ -6,7 +6,7 @@ CURRENT_DIR=`pwd`
 SPARK_LUCENERDD_VERSION=`cat version.sbt | awk '{print $5}' | xargs`
 
 # You should have downloaded this spark version under your ${HOME}
-SPARK_VERSION="2.4.6"
+SPARK_VERSION="2.4.8"
 
 echo "==============================================="
 echo "Loading LuceneRDD with version ${SPARK_LUCENERDD_VERSION}"

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.3.9"
+ThisBuild / version := "0.3.10-SNAPSHOT"