From d5fdd3976dc2a536f16d0db2861531049df760de Mon Sep 17 00:00:00 2001
From: Tanmay Rustagi <88379306+tanmay-db@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:47:18 +0530
Subject: [PATCH] Release fix for 2.12 (#28)
* use 2.12
* version bump
* remove relative path
* upd
* disable 2.13
* hack
---
.github/ISSUE_TEMPLATE/sdk-issue.md | 2 +-
.github/workflows/pr.yaml | 2 +-
.github/workflows/release.yml | 2 +-
README.md | 2 +-
databricks-dbutils-scala/pom.xml | 16 ++++++++--------
examples/pom.xml | 10 +++++-----
pom.xml | 4 ++--
release/pom.xml | 6 +++---
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/sdk-issue.md b/.github/ISSUE_TEMPLATE/sdk-issue.md
index 82977df..dbf3566 100644
--- a/.github/ISSUE_TEMPLATE/sdk-issue.md
+++ b/.github/ISSUE_TEMPLATE/sdk-issue.md
@@ -21,7 +21,7 @@ The SDK logs helpful debugging information when debug logging is enabled. Set th
**Other Information**
- OS: [e.g. macOS]
- - Version of the SDK: [e.g. 0.1.3]
+ - Version of the SDK: [e.g. 0.1.4]
**Additional context**
Add any other context about the problem here.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index ab524ba..d00fa2f 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -57,4 +57,4 @@ jobs:
restore-keys: ${{ runner.os }}-m2
- name: Run tests
- run: mvn --errors --no-transfer-progress test -P${{ matrix.profile }}
+ run: mvn --errors --no-transfer-progress test -Pscala-2.12
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dc4bc89..ccfeeb5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
matrix:
profile:
- scala-2.12
- - scala-2.13
+# - scala-2.13
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/README.md b/README.md
index a78c8c0..b995637 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ You can install Databricks Utilities for Scala by adding the following to your `
com.databricks
databricks-sdk-dbutils
- 0.1.3
+ 0.1.4
```
diff --git a/databricks-dbutils-scala/pom.xml b/databricks-dbutils-scala/pom.xml
index 54028e1..457927c 100644
--- a/databricks-dbutils-scala/pom.xml
+++ b/databricks-dbutils-scala/pom.xml
@@ -4,17 +4,17 @@
4.0.0
com.databricks
- databricks-dbutils-scala-parent_${scala.major}.${scala.minor}
- 0.1.3
+ databricks-dbutils-scala-parent_2.12
+ 0.1.4
../pom.xml
- databricks-dbutils-scala_${scala.major}.${scala.minor}
+ databricks-dbutils-scala_2.12
org.scala-lang
scala-library
- ${scala.major}.${scala.minor}.${scala.patch}
+ 2.12.10
@@ -46,12 +46,12 @@
org.scalactic
- scalactic_${scala.major}.${scala.minor}
+ scalactic_2.12
test
org.scalatest
- scalatest_${scala.major}.${scala.minor}
+ scalatest_2.12
test
@@ -76,11 +76,11 @@
scala-maven-plugin
4.4.0
- ${scala.major}.${scala.minor}.${scala.patch}
+ 2.12.10
com.artima.supersafe
- supersafe_${scala.major}.${scala.minor}.${scala.patch}
+ supersafe_2.12.10
1.1.12
diff --git a/examples/pom.xml b/examples/pom.xml
index ce50278..cb7bc6c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,8 +4,8 @@
4.0.0
com.databricks
- databricks-dbutils-scala-parent_${scala.major}.${scala.minor}
- 0.1.3
+ databricks-dbutils-scala-parent_2.12
+ 0.1.4
../pom.xml
databricks-dbutils-scala-examples
@@ -23,8 +23,8 @@
com.databricks
- databricks-dbutils-scala_${scala.major}.${scala.minor}
- 0.1.3
+ databricks-dbutils-scala_2.12
+ 0.1.4
@@ -34,7 +34,7 @@
scala-maven-plugin
4.4.0
- ${scala.major}.${scala.minor}.${scala.patch}
+ 2.12.10
diff --git a/pom.xml b/pom.xml
index 2a3d375..d8b43ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
4.0.0
com.databricks
- databricks-dbutils-scala-parent_${scala.major}.${scala.minor}
- 0.1.3
+ databricks-dbutils-scala-parent_2.12
+ 0.1.4
pom
DBUtils for Scala
DBUtils for Scala simplifies interacting with various components of Databricks, such as the Databricks File
diff --git a/release/pom.xml b/release/pom.xml
index b09ee84..da6d7ed 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -4,11 +4,11 @@
4.0.0
com.databricks
- databricks-dbutils-scala-parent_${scala.major}.${scala.minor}
- 0.1.3
+ databricks-dbutils-scala-parent_2.12
+ 0.1.4
../pom.xml
- release-${scala.major}.${scala.minor}
+ release-2.12
Release Module
Module purely for releasing using Nexus staging plugin