[incubator-pekko-connectors-kafka] branch main updated: Fix rs-api packaging.type workaround

[md...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors-kafka.git


The following commit(s) were added to refs/heads/main by this push:
     new 1b4f010a Fix rs-api packaging.type workaround
1b4f010a is described below

commit 1b4f010a77d0897dba5cd5ed67a2e9763fc28cda
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Wed Jul 26 15:51:49 2023 +0200

    Fix rs-api packaging.type workaround
---
 project/Dependencies.scala        |  3 +--
 project/PackagingTypePlugin.scala | 19 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 4de07724..8d860ffa 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -33,8 +33,7 @@ object Dependencies {
     "com.google.protobuf" % "protobuf-java" % "3.19.6", // use the same version as in scalapb
     ("io.confluent" % "kafka-avro-serializer" % confluentAvroSerializerVersion % Test).excludeAll(
       confluentLibsExclusionRules: _*),
-    // See https://github.com/sbt/sbt/issues/3618#issuecomment-448951808
-    ("javax.ws.rs" % "javax.ws.rs-api" % "2.1.1").artifacts(Artifact("javax.ws.rs-api", "jar", "jar")),
+    "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6" % Test,
     "org.testcontainers" % "kafka" % testcontainersVersion % Test,
     "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
     "io.spray" %% "spray-json" % "1.3.6" % Test,
diff --git a/project/PackagingTypePlugin.scala b/project/PackagingTypePlugin.scala
deleted file mode 100644
index a0b75dab..00000000
--- a/project/PackagingTypePlugin.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * This file is part of the Apache Pekko project, which was derived from Akka.
- */
-
-import sbt._
-
-// See https://github.com/sbt/sbt/issues/3618#issuecomment-424924293
-// for  "javax.ws.rs" % "javax.ws.rs-api" % "2.1" artifacts Artifact("javax.ws.rs-api", "jar", "jar"),
-object PackagingTypePlugin extends AutoPlugin {
-  override val buildSettings = {
-    sys.props += "packaging.type" -> "jar"
-    Nil
-  }
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org