Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Hadoop, Exasol JDBC and Scala versions #13

Merged
merged 2 commits into from
Dec 13, 2018
Merged

Update Hadoop, Exasol JDBC and Scala versions #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa6372
Update dependency versions
morazow Dec 13, 2018
eb77884
Update scala version to 2.12.8 from 2.12.7
morazow Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ matrix:
scala: 2.11.12

- jdk: openjdk8
scala: 2.12.7
scala: 2.12.8

- jdk: oraclejdk8
scala: 2.12.7
scala: 2.12.8
env: RELEASE=true

script:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ lazy val orgSettings = Seq(
)

lazy val buildSettings = Seq(
scalaVersion := "2.12.7",
crossScalaVersions := Seq("2.11.12", "2.12.7")
scalaVersion := "2.12.8",
crossScalaVersions := Seq("2.11.12", "2.12.8")
)

lazy val root =
Expand Down
28 changes: 18 additions & 10 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,30 @@ import sbt._
/** A list of required dependencies */
object Dependencies {

// Versions
private val ExasolJDBCVersion = "6.0.13"
private val HadoopVersion = "2.9.2"
private val ParquetVersion = "1.8.1"
private val AzureStorageVersion = "2.2.0"
private val GoogleStorageVersion = "hadoop2-1.9.10"
private val TypesafeLoggingVersion = "3.9.0"

val Resolvers: Seq[Resolver] = Seq(
"Exasol Releases" at "https://maven.exasol.com/artifactory/exasol-releases"
)

/** Core dependencies needed for connector */
private val CoreDependencies: Seq[ModuleID] = Seq(
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
"com.exasol" % "exasol-jdbc" % "6.0.8",
"com.exasol" % "exasol-script-api" % "6.0.8",
"org.apache.hadoop" % "hadoop-aws" % "2.8.4",
"org.apache.hadoop" % "hadoop-azure" % "2.8.4",
"org.apache.hadoop" % "hadoop-common" % "2.8.4" exclude ("org.slf4j", "slf4j-log4j12"),
"org.apache.hadoop" % "hadoop-hdfs" % "2.8.4",
"org.apache.parquet" % "parquet-avro" % "1.8.1",
"com.microsoft.azure" % "azure-storage" % "2.2.0",
"com.google.cloud.bigdataoss" % "gcs-connector" % "hadoop2-1.9.10"
"com.exasol" % "exasol-jdbc" % ExasolJDBCVersion,
"com.exasol" % "exasol-script-api" % ExasolJDBCVersion,
"org.apache.hadoop" % "hadoop-aws" % HadoopVersion,
"org.apache.hadoop" % "hadoop-azure" % HadoopVersion,
"org.apache.hadoop" % "hadoop-common" % HadoopVersion exclude ("org.slf4j", "slf4j-log4j12"),
"org.apache.hadoop" % "hadoop-hdfs" % HadoopVersion,
"org.apache.parquet" % "parquet-avro" % ParquetVersion,
"com.microsoft.azure" % "azure-storage" % AzureStorageVersion,
"com.google.cloud.bigdataoss" % "gcs-connector" % GoogleStorageVersion,
"com.typesafe.scala-logging" %% "scala-logging" % TypesafeLoggingVersion
)

/** Test dependencies only required in `test` */
Expand Down
6 changes: 3 additions & 3 deletions sbtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

set -o pipefail

declare -r sbt_release_version="0.13.17"
declare -r sbt_unreleased_version="0.13.17"
declare -r sbt_release_version="0.13.18"
declare -r sbt_unreleased_version="0.13.18"

declare -r latest_213="2.13.0-M5"
declare -r latest_212="2.12.7"
declare -r latest_212="2.12.8"
declare -r latest_211="2.11.12"
declare -r latest_210="2.10.7"
declare -r latest_29="2.9.3"
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o errtrace -o nounset -o pipefail -o errexit
BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
cd "$BASE_DIR"

MAIN_SCALA_VERSION=2.12.7
MAIN_SCALA_VERSION=2.12.8

if [[ -z "${TRAVIS_SCALA_VERSION:-}" ]]; then
echo "Environment variable TRAVIS_SCALA_VERSION is not set"
Expand Down