From fbdad72c08701e2f02b9e117f20a80ce8978f329 Mon Sep 17 00:00:00 2001 From: Pasha Finkelshteyn Date: Tue, 24 May 2022 14:08:41 +0300 Subject: [PATCH 1/6] Removes allure (cherry picked from commit 041dff401a4cf1920812e6ca50b3c641ac5c7b75) --- jupyter/pom.xml | 6 ------ kotlin-spark-api/3.2/pom_2.12.xml | 14 -------------- .../jetbrains/kotlinx/spark/api/ProjectConfig.kt | 2 -- pom.xml | 7 ------- scala-tuples-in-kotlin/pom_2.12.xml | 6 ------ 5 files changed, 35 deletions(-) diff --git a/jupyter/pom.xml b/jupyter/pom.xml index 92c2b038..4eddd507 100644 --- a/jupyter/pom.xml +++ b/jupyter/pom.xml @@ -79,12 +79,6 @@ ${kotest.version} test - - io.kotest.extensions - kotest-extensions-allure - ${kotest-extensions-allure.version} - test - org.jetbrains.kotlinx kotlin-jupyter-test-kit diff --git a/kotlin-spark-api/3.2/pom_2.12.xml b/kotlin-spark-api/3.2/pom_2.12.xml index ee48d1cc..834a444c 100644 --- a/kotlin-spark-api/3.2/pom_2.12.xml +++ b/kotlin-spark-api/3.2/pom_2.12.xml @@ -67,12 +67,6 @@ ${kotest.version} test - - io.kotest.extensions - kotest-extensions-allure - ${kotest-extensions-allure.version} - test - io.kotest.extensions kotest-extensions-testcontainers @@ -167,14 +161,6 @@ - - io.qameta.allure - allure-maven - - ${project.basedir}/allure-results/${scala.compat.version} - - - org.jacoco jacoco-maven-plugin diff --git a/kotlin-spark-api/3.2/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ProjectConfig.kt b/kotlin-spark-api/3.2/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ProjectConfig.kt index f450f65d..63b1251c 100644 --- a/kotlin-spark-api/3.2/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ProjectConfig.kt +++ b/kotlin-spark-api/3.2/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ProjectConfig.kt @@ -20,10 +20,8 @@ package org.jetbrains.kotlinx.spark.api import io.kotest.core.config.AbstractProjectConfig -import io.kotest.extensions.allure.AllureTestReporter @Suppress("unused") object ProjectConfig : AbstractProjectConfig() { - override fun extensions() = super.extensions() + AllureTestReporter(true) } diff --git a/pom.xml b/pom.xml index f4a488db..d6e94b90 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,6 @@ 1.6.10 3.1.0 3.3.1 - 1.1.0 1.3.1 5.2.3 0.11.0-95 @@ -23,7 +22,6 @@ 3.2.1 - 2.10.0 0.8.7 5.5 official @@ -73,11 +71,6 @@ nexus-staging-maven-plugin ${nexus-staging-plugin.version} - - io.qameta.allure - allure-maven - ${allure-maven.version} - org.jacoco jacoco-maven-plugin diff --git a/scala-tuples-in-kotlin/pom_2.12.xml b/scala-tuples-in-kotlin/pom_2.12.xml index 8f4c4881..5d8b51a5 100644 --- a/scala-tuples-in-kotlin/pom_2.12.xml +++ b/scala-tuples-in-kotlin/pom_2.12.xml @@ -31,12 +31,6 @@ ${kotest.version} test - - io.kotest.extensions - kotest-extensions-allure - ${kotest-extensions-allure.version} - test - com.beust klaxon From 39f43d037ebdfe7a099869f82c3f2bc9993e54f6 Mon Sep 17 00:00:00 2001 From: Jolanrensen Date: Wed, 25 May 2022 14:10:56 +0200 Subject: [PATCH 2/6] updated link to jupyter wiki --- dummy/pom.xml | 2 +- kotlin-spark-api/3.2/pom_2.12.xml | 2 +- pom_2.12.xml | 2 +- scala-tuples-in-kotlin/pom_2.12.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dummy/pom.xml b/dummy/pom.xml index 79e476c4..529f0c61 100644 --- a/dummy/pom.xml +++ b/dummy/pom.xml @@ -9,7 +9,7 @@ 4.0.0 Kotlin API for Apache Spark: not-needed Module to workaround https://issues.sonatype.org/browse/NEXUS-9138 - dummy + dummy-3.2 scala-2.12 diff --git a/kotlin-spark-api/3.2/pom_2.12.xml b/kotlin-spark-api/3.2/pom_2.12.xml index 834a444c..b67bd0a3 100644 --- a/kotlin-spark-api/3.2/pom_2.12.xml +++ b/kotlin-spark-api/3.2/pom_2.12.xml @@ -31,7 +31,7 @@ org.jetbrains.kotlinx.spark - scala-tuples-in-kotlin + scala-tuples-in-kotlin-3.2 diff --git a/pom_2.12.xml b/pom_2.12.xml index b66a4774..bf9d4194 100644 --- a/pom_2.12.xml +++ b/pom_2.12.xml @@ -36,7 +36,7 @@ org.jetbrains.kotlinx.spark - scala-tuples-in-kotlin + scala-tuples-in-kotlin-3.2 ${project.version} diff --git a/scala-tuples-in-kotlin/pom_2.12.xml b/scala-tuples-in-kotlin/pom_2.12.xml index 5d8b51a5..95ed15a3 100644 --- a/scala-tuples-in-kotlin/pom_2.12.xml +++ b/scala-tuples-in-kotlin/pom_2.12.xml @@ -4,7 +4,7 @@ Kotlin Spark API: Scala Tuples in Kotlin Scala Tuple helper functions for kotlin - scala-tuples-in-kotlin + scala-tuples-in-kotlin-3.2 org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 From cb8fbb3ef949dfafb45a4573be68ccc7ab730fee Mon Sep 17 00:00:00 2001 From: Pasha Finkelshteyn Date: Wed, 25 May 2022 16:29:46 +0300 Subject: [PATCH 3/6] [maven-release-plugin] prepare release 3.2-1.1.0 --- core/3.2/pom_2.12.xml | 5 ++--- dummy/pom.xml | 2 +- examples/pom-3.2_2.12.xml | 5 ++--- jupyter/pom.xml | 6 ++---- kotlin-spark-api/3.2/pom_2.12.xml | 5 ++--- pom.xml | 4 ++-- pom_2.12.xml | 2 +- scala-tuples-in-kotlin/pom_2.12.xml | 2 +- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/core/3.2/pom_2.12.xml b/core/3.2/pom_2.12.xml index fac961e3..a4cdaa49 100644 --- a/core/3.2/pom_2.12.xml +++ b/core/3.2/pom_2.12.xml @@ -1,6 +1,5 @@ - + 4.0.0 Kotlin Spark API: Scala core for Spark 3.2+ (Scala 2.12) @@ -9,7 +8,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.0.4-SNAPSHOT + 1.1.0 ../../pom_2.12.xml diff --git a/dummy/pom.xml b/dummy/pom.xml index 529f0c61..bd731253 100644 --- a/dummy/pom.xml +++ b/dummy/pom.xml @@ -3,7 +3,7 @@ kotlin-spark-api-parent-3.2 org.jetbrains.kotlinx.spark - 1.0.4-SNAPSHOT + 1.1.0 pom 4.0.0 diff --git a/examples/pom-3.2_2.12.xml b/examples/pom-3.2_2.12.xml index 6379a482..a9db2d15 100644 --- a/examples/pom-3.2_2.12.xml +++ b/examples/pom-3.2_2.12.xml @@ -1,6 +1,5 @@ - + 4.0.0 @@ -10,7 +9,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.0.4-SNAPSHOT + 1.1.0 ../pom_2.12.xml diff --git a/jupyter/pom.xml b/jupyter/pom.xml index 4eddd507..7814a49d 100644 --- a/jupyter/pom.xml +++ b/jupyter/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 @@ -11,7 +9,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.0.4-SNAPSHOT + 1.1.0 ../pom_2.12.xml jar diff --git a/kotlin-spark-api/3.2/pom_2.12.xml b/kotlin-spark-api/3.2/pom_2.12.xml index b67bd0a3..95dd8700 100644 --- a/kotlin-spark-api/3.2/pom_2.12.xml +++ b/kotlin-spark-api/3.2/pom_2.12.xml @@ -1,6 +1,5 @@ - + 4.0.0 @@ -10,7 +9,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.0.4-SNAPSHOT + 1.1.0 ../../pom_2.12.xml jar diff --git a/pom.xml b/pom.xml index d6e94b90..8c11775a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ Parent project for Kotlin for Apache Spark org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2 - 1.0.4-SNAPSHOT + 1.1.0 pom @@ -267,7 +267,7 @@ scm:git:https://github.com/JetBrains/kotlin-spark-api.git https://github.com/JetBrains/kotlin-spark-api - HEAD + 3.2-1.1.0 diff --git a/pom_2.12.xml b/pom_2.12.xml index bf9d4194..81e4c286 100644 --- a/pom_2.12.xml +++ b/pom_2.12.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2 - 1.0.4-SNAPSHOT + 1.1.0 pom.xml pom diff --git a/scala-tuples-in-kotlin/pom_2.12.xml b/scala-tuples-in-kotlin/pom_2.12.xml index 95ed15a3..a4769924 100644 --- a/scala-tuples-in-kotlin/pom_2.12.xml +++ b/scala-tuples-in-kotlin/pom_2.12.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.0.4-SNAPSHOT + 1.1.0 ../pom_2.12.xml From bd491013ccae524a8527b53af549a8e849e3527f Mon Sep 17 00:00:00 2001 From: Pasha Finkelshteyn Date: Wed, 25 May 2022 16:29:46 +0300 Subject: [PATCH 4/6] [maven-release-plugin] prepare for next development iteration --- core/3.2/pom_2.12.xml | 2 +- dummy/pom.xml | 2 +- examples/pom-3.2_2.12.xml | 2 +- jupyter/pom.xml | 2 +- kotlin-spark-api/3.2/pom_2.12.xml | 2 +- pom.xml | 4 ++-- pom_2.12.xml | 2 +- scala-tuples-in-kotlin/pom_2.12.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/3.2/pom_2.12.xml b/core/3.2/pom_2.12.xml index a4cdaa49..807c2c81 100644 --- a/core/3.2/pom_2.12.xml +++ b/core/3.2/pom_2.12.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.1.0 + 1.1.1-SNAPSHOT ../../pom_2.12.xml diff --git a/dummy/pom.xml b/dummy/pom.xml index bd731253..1614d4bd 100644 --- a/dummy/pom.xml +++ b/dummy/pom.xml @@ -3,7 +3,7 @@ kotlin-spark-api-parent-3.2 org.jetbrains.kotlinx.spark - 1.1.0 + 1.1.1-SNAPSHOT pom 4.0.0 diff --git a/examples/pom-3.2_2.12.xml b/examples/pom-3.2_2.12.xml index a9db2d15..181a2f73 100644 --- a/examples/pom-3.2_2.12.xml +++ b/examples/pom-3.2_2.12.xml @@ -9,7 +9,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.1.0 + 1.1.1-SNAPSHOT ../pom_2.12.xml diff --git a/jupyter/pom.xml b/jupyter/pom.xml index 7814a49d..cde0c15d 100644 --- a/jupyter/pom.xml +++ b/jupyter/pom.xml @@ -9,7 +9,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.1.0 + 1.1.1-SNAPSHOT ../pom_2.12.xml jar diff --git a/kotlin-spark-api/3.2/pom_2.12.xml b/kotlin-spark-api/3.2/pom_2.12.xml index 95dd8700..22721fa4 100644 --- a/kotlin-spark-api/3.2/pom_2.12.xml +++ b/kotlin-spark-api/3.2/pom_2.12.xml @@ -9,7 +9,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.1.0 + 1.1.1-SNAPSHOT ../../pom_2.12.xml jar diff --git a/pom.xml b/pom.xml index 8c11775a..c05d8899 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ Parent project for Kotlin for Apache Spark org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2 - 1.1.0 + 1.1.1-SNAPSHOT pom @@ -267,7 +267,7 @@ scm:git:https://github.com/JetBrains/kotlin-spark-api.git https://github.com/JetBrains/kotlin-spark-api - 3.2-1.1.0 + HEAD diff --git a/pom_2.12.xml b/pom_2.12.xml index 81e4c286..f569bbb7 100644 --- a/pom_2.12.xml +++ b/pom_2.12.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2 - 1.1.0 + 1.1.1-SNAPSHOT pom.xml pom diff --git a/scala-tuples-in-kotlin/pom_2.12.xml b/scala-tuples-in-kotlin/pom_2.12.xml index a4769924..a5169fbb 100644 --- a/scala-tuples-in-kotlin/pom_2.12.xml +++ b/scala-tuples-in-kotlin/pom_2.12.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlinx.spark kotlin-spark-api-parent-3.2_2.12 - 1.1.0 + 1.1.1-SNAPSHOT ../pom_2.12.xml From 78f6d9e604f1a6dde6da3377ffeb764090c89bf5 Mon Sep 17 00:00:00 2001 From: Egor Tolstoy Date: Thu, 26 May 2022 10:48:11 +0300 Subject: [PATCH 5/6] Updated README stability badge --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a3a7b3b7..3337f9b3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ -# Kotlin for Apache® Spark™ [![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api-parent-3.2.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:org.jetbrains.kotlinx.spark%20AND%20v:1.1.0) [![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) [![Join the chat at https://gitter.im/JetBrains/kotlin-spark-api](https://badges.gitter.im/JetBrains/kotlin-spark-api.svg)](https://gitter.im/JetBrains/kotlin-spark-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +# Kotlin for Apache® Spark™ +[![Kotlin Stable](https://kotl.in/badges/stable.svg)](https://kotlinlang.org/docs/components-stability.html) +[![JetBrains official project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) +[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api-parent-3.2.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:org.jetbrains.kotlinx.spark%20AND%20v:1.1.0) +[![Join the chat at https://gitter.im/JetBrains/kotlin-spark-api](https://badges.gitter.im/JetBrains/kotlin-spark-api.svg)](https://gitter.im/JetBrains/kotlin-spark-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Your next API to work with [Apache Spark](https://spark.apache.org/). From e2d0f2058fb38551add9f2767325ba143dc646c3 Mon Sep 17 00:00:00 2001 From: Pasha Finkelshteyn Date: Thu, 26 May 2022 12:34:49 +0300 Subject: [PATCH 6/6] Change repo from Jetbrains/ to Kotlin/ --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c05d8899..1b51d8d4 100644 --- a/pom.xml +++ b/pom.xml @@ -277,7 +277,7 @@ github GitHub JetBrains Apache Maven Packages - https://maven.pkg.github.com/JetBrains/kotlin-spark-api + https://maven.pkg.github.com/Kotlin/kotlin-spark-api