Skip to content

Commit

Permalink
#28: Updated dependencies (#29)
Browse files Browse the repository at this point in the history
Fixes #28
  • Loading branch information
morazow committed Dec 21, 2021
1 parent ce4b9a5 commit 7566477
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
strategy:
fail-fast: false
matrix:
scala: [ 2.13.6 ]
exasol-docker-version: [ 6.2.17-d1, 7.0.13, 7.1.1 ]
scala: [ 2.13.7 ]
exasol-docker-version: [ 6.2.17-d1, 7.0.14, 7.1.3 ]

steps:
- name: Checkout the Repository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@ jobs:
java-version: adopt@1.11
- name: Assembly with SBT skipping tests
run: sbt assembly
- name: Generate sha256sum files
run: find target/scala* -maxdepth 1 -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \;
- name: Upload assets to the GitHub release draft
uses: shogo82148/actions-upload-release-asset@v1
with:
upload_url: ${{ github.event.inputs.upload_url }}
asset_path: target/scala*/stripped/*.jar

- name: Upload sha256sum files
uses: shogo82148/actions-upload-release-asset@v1
with:
upload_url: ${{ github.event.inputs.upload_url }}
asset_path: target/scala*/*.sha256
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ lazy val orgSettings = Seq(
)

lazy val buildSettings = Seq(
scalaVersion := "2.13.6"
scalaVersion := "2.13.7"
)

lazy val root =
project
.in(file("."))
.settings(moduleName := "exasol-kinesis-connector-extension")
.settings(version := "1.0.0")
.settings(version := "1.0.1")
.settings(orgSettings)
.settings(buildSettings)
.settings(Settings.projectSettings(scalaVersion))
Expand Down
1 change: 1 addition & 0 deletions doc/changes/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Releases

* [1.0.1](changes_1.0.1.md)
* [1.0.0](changes_1.0.0.md)
* [0.1.1](changes_0.1.1.md)
* [0.1.0](changes_0.1.0.md)
30 changes: 30 additions & 0 deletions doc/changes/changes_1.0.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Kinesis Connector Extension 1.0.1, released 2021-12-21

Code name: Updated dependencies

## Summary

In this release we updated dependencies.

## Refactoring

* #28: Updated dependencies

## Dependency updates

### Compile Dependency Updates

* Updated `com.amazonaws:aws-java-sdk-core:1.12.88` to `1.12.130`
* Updated `com.amazonaws:aws-java-sdk-kinesis:1.12.88` to `1.12.130`

### Test Dependency Updates

* Updated `org.mockito:mockito-core:4.0.0` to `4.2.0`
* Updated `com.exasol:exasol-testcontainers:5.1.0` to `5.1.1`
* Updated `org.testcontainers:localstack:1.16.0` to `1.16.2`

### Plugin Updates

* Updated `org.scalameta:sbt-scalafmt:2.4.3` to `2.4.5`
* Updated `org.scoverage:sbt-scoverage:1.9.1` to `1.9.2`
* Updated `org.wartremover:sbt-wartremover-contib:1.3.12` to `1.3.13`
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ object Dependencies {
// Runtime dependencies versions
private val ExasolVersion = "6.1.7"
private val ImportExportUDFVersion = "0.3.1"
private val AwsJavaSdkVersion = "1.12.88"
private val AwsJavaSdkVersion = "1.12.130"

// Test dependencies versions
private val ScalaTestVersion = "3.2.10"
private val ScalaTestPlusVersion = "1.0.0-M2"
private val MockitoCoreVersion = "4.0.0"
private val ExasolTestContainersVersion = "5.1.0"
private val MockitoCoreVersion = "4.2.0"
private val ExasolTestContainersVersion = "5.1.1"
private val ExasolTestDBBuilderVersion = "3.2.1"
private val TestContainersLocalstackVersion = "1.16.0"
private val TestContainersLocalstackVersion = "1.16.2"

val Resolvers: Seq[Resolver] = Seq(
"Confluent Maven Repo" at "https://packages.confluent.io/maven/",
"Exasol Releases" at "https://maven.exasol.com/artifactory/exasol-releases"
)

lazy val RuntimeDependencies: Seq[ModuleID] = Seq(
"com.exasol" % "exasol-script-api" % ExasolVersion,
"com.exasol" %% "import-export-udf-common-scala" % ImportExportUDFVersion,
// "com.exasol" % "exasol-script-api" % ExasolVersion,
"com.exasol" %% "import-export-udf-common-scala" % ImportExportUDFVersion
exclude ("org.apache.avro", "avro"),
"com.amazonaws" % "aws-java-sdk-core" % AwsJavaSdkVersion,
"com.amazonaws" % "aws-java-sdk-kinesis" % AwsJavaSdkVersion
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.5
sbt.version=1.5.7
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Adds a `scalafmt` sbt plugin
// https://github.com/scalameta/sbt-scalafmt
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5")

// Adds a `wartremover` a flexible Scala code linting tool
// http://github.com/puffnfresh/wartremover
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.16")

// Adds Contrib Warts
// http://github.com/wartremover/wartremover-contrib/
addSbtPlugin("org.wartremover" % "sbt-wartremover-contrib" % "1.3.12")
addSbtPlugin("org.wartremover" % "sbt-wartremover-contrib" % "1.3.13")

// Adds a `assembly` task to create a fat JAR with all of its
// dependencies
Expand All @@ -21,7 +21,7 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")

// Adds Scala Code Coverage (Scoverage) used during unit tests
// http://github.com/scoverage/sbt-scoverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")

// Adds SBT Coveralls plugin for uploading Scala code coverage to
// https://coveralls.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trait KinesisAbstractIntegrationTest extends AnyFunSuite with BeforeAndAfterAll
val JAR_NAME_PATTERN = "exasol-kinesis-connector-extension-"
val DOCKER_IP_ADDRESS = "172.17.0.1"
val TEST_SCHEMA_NAME = "kinesis_schema"
val DEFAULT_EXASOL_DOCKER_IMAGE = "7.1.1"
val LOCALSTACK_DOCKER_IMAGE = "localstack/localstack:0.12.18"
val DEFAULT_EXASOL_DOCKER_IMAGE = "7.1.3"
val LOCALSTACK_DOCKER_IMAGE = "localstack/localstack:0.13.2"

val exasolContainer = {
val c: ExasolContainer[_] = new ExasolContainer(getExasolDockerImageVersion())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ class KinesisUserProperties(val propertiesMap: Map[String, String]) extends Abst
final def getAwsAccessKey(): String =
getString(AWS_ACCESS_KEY_PROPERTY)

final def containsAwsAccessKey(): Boolean =
containsKey(AWS_ACCESS_KEY_PROPERTY)

final def getAwsSecretKey(): String =
getString(AWS_SECRET_KEY_PROPERTY)

Expand Down Expand Up @@ -83,14 +86,13 @@ class KinesisUserProperties(val propertiesMap: Map[String, String]) extends Abst
*/
final def mergeWithConnectionObject(exaMetadata: ExaMetadata): KinesisUserProperties = {
validateDoesNotContainCredentials()
val connectionParsedMap =
parseConnectionInfo(AWS_ACCESS_KEY_PROPERTY, Option(exaMetadata))
val connectionParsedMap = parseConnectionInfo(AWS_ACCESS_KEY_PROPERTY, Option(exaMetadata))
val newProperties = propertiesMap ++ connectionParsedMap
new KinesisUserProperties(newProperties)
}

private[this] def validateDoesNotContainCredentials(): Unit =
if (containsAwsSecretKey() || containsAwsSecretKey() || containsAwsSessionToken()) {
if (containsAwsAccessKey() || containsAwsSecretKey() || containsAwsSessionToken()) {
throw new KinesisConnectorException(
"E-KIN-PROP-1: Credentials as properties are not supported anymore. " +
"Please use a named connection and provide a CONNECTION_NAME property."
Expand Down

0 comments on commit 7566477

Please sign in to comment.