Skip to content

Commit

Permalink
Merge branch 'main' into update/google-cloud-pubsub-1.134.2
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Dec 16, 2024
2 parents ef95188 + 6981eaa commit a0403ab
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ lazy val docs = project
// Pekko gRPC
"pekko-grpc.version" -> Dependencies.PekkoGrpcBinaryVersion,
"extref.pekko-grpc.base_url" -> s"https://pekko.apache.org/docs/pekko-grpc/${Dependencies.PekkoGrpcBinaryVersion}/%s",
"scaladoc.org.apache.pekko.gprc.base_url" -> s"https://pekko.apache.org/api/pekko-grpc/${Dependencies.PekkoGrpcBinaryVersion}/",
"scaladoc.org.apache.pekko.gprc.base_url" -> s"https://pekko.apache.org/api/pekko-grpc/${Dependencies.PekkoGrpcBinaryVersion}/org/apache/pekko/gprc",
// Couchbase
"couchbase.version" -> Dependencies.CouchbaseVersion,
"extref.couchbase.base_url" -> s"https://docs.couchbase.com/java-sdk/${Dependencies.CouchbaseVersionForDocs}/%s",
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/azure-storage-queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The Azure Storage Queue connector provides an Apache Pekko Stream Source and Sinks for Azure Storage Queue integration.

Azure Storage Queue is a queuing service similar to Amazon's SQS. It is designed mostly for long-running and non-time-critical tasks. For more information on Azure Storage Queue see the [Azure docs](https://azure.microsoft.com/en-us/services/storage/queues/).
Azure Storage Queue is a queuing service similar to Amazon's SQS. It is designed mostly for long-running and non-time-critical tasks. For more information on Azure Storage Queue see the [Azure docs](https://azure.microsoft.com/en-us/products/storage/queues).

@@project-info{ projectId="azure-storage-queue" }

Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/other-docs/versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Apache Pekko Connectors publishes

* regular releases to [Maven Central](https://search.maven.org/search?q=g:org.pekko%20pekko-connectors-)
* milestone and release candidates (of major versions) to Maven Central
* @ref:[snapshots](snapshots.md) to [Sonatype](https://oss.sonatype.org/content/repositories/snapshots/org/pekko/)
* @ref:[snapshots](snapshots.md) to [repository.apache.org](https://repository.apache.org/content/groups/snapshots/org/apache/pekko/)

### Compatibility

Expand Down
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object Dependencies {
val InfluxDBJavaVersion = "2.23"

val AvroVersion = "1.11.4"
val AwsSdk2Version = "2.29.23"
val AwsSdk2Version = "2.29.34"
val NettyVersion = "4.1.115.Final"
// Sync with plugins.sbt
val PekkoGrpcBinaryVersion = "1.1"
Expand Down Expand Up @@ -64,7 +64,7 @@ object Dependencies {
val Couchbase3Version = "3.6.0"
val CouchbaseVersionForDocs = "2.7"

val GoogleAuthVersion = "1.30.0"
val GoogleAuthVersion = "1.30.1"
val JwtScalaVersion = "10.0.1"
val Log4jVersion = "2.23.1"

Expand Down Expand Up @@ -126,7 +126,7 @@ object Dependencies {

val Amqp = Seq(
libraryDependencies ++= Seq(
"com.rabbitmq" % "amqp-client" % "5.23.0",
"com.rabbitmq" % "amqp-client" % "5.24.0",
"org.scalatestplus" %% scalaTestScalaCheckArtifact % scalaTestScalaCheckVersion % Test) ++ Mockito)

val AwsSpiPekkoHttp = Seq(
Expand Down Expand Up @@ -219,7 +219,7 @@ object Dependencies {

val AvroParquet = Seq(
libraryDependencies ++= Seq(
"org.apache.parquet" % "parquet-avro" % "1.14.4",
"org.apache.parquet" % "parquet-avro" % "1.15.0",
"org.apache.avro" % "avro" % AvroVersion,
("org.apache.hadoop" % "hadoop-client" % "3.3.6" % Test).exclude("log4j", "log4j"),
("org.apache.hadoop" % "hadoop-common" % "3.3.6" % Test).exclude("log4j", "log4j"),
Expand All @@ -246,7 +246,7 @@ object Dependencies {
Seq(
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % JacksonVersion,
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % JacksonVersion,
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.24.2" % Test,
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.24.3" % Test,
"org.slf4j" % "slf4j-api" % Slf4jVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Test) ++ JacksonDatabindDependencies ++
(if (isScala3.value)
Expand Down Expand Up @@ -278,7 +278,7 @@ object Dependencies {
// see Pekko gRPC version in plugins.sbt
libraryDependencies ++= Seq(
// https://github.com/googleapis/java-bigquerystorage/tree/master/proto-google-cloud-bigquerystorage-v1
"com.google.api.grpc" % "proto-google-cloud-bigquerystorage-v1" % "3.10.3" % "protobuf-src",
"com.google.api.grpc" % "proto-google-cloud-bigquerystorage-v1" % "3.11.0" % "protobuf-src",
"org.apache.avro" % "avro" % AvroVersion % "provided",
"org.apache.arrow" % "arrow-vector" % ArrowVersion % "provided",
"io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion,
Expand All @@ -302,7 +302,7 @@ object Dependencies {
// see Pekko gRPC version in plugins.sbt
libraryDependencies ++= Seq(
// https://github.com/googleapis/java-pubsub/tree/master/proto-google-cloud-pubsub-v1/
"com.google.cloud" % "google-cloud-pubsub" % "1.134.2" % "protobuf-src",
"com.google.cloud" % "google-cloud-pubsub" % "1.135.0" % "protobuf-src",
"io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion,
"com.google.auth" % "google-auth-library-oauth2-http" % GoogleAuthVersion,
"com.google.protobuf" % "protobuf-java" % protobufJavaVersion % Runtime,
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.1.1")
// templating
addSbtPlugin("com.github.sbt" % "sbt-boilerplate" % "0.7.0")
// Run JUnit 5 tests with sbt
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.13.2")
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.13.3")
12 changes: 10 additions & 2 deletions scripts/link-validator.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// config for https://github.com/ennru/site-link-validator/
site-link-validator {
root-dir = "./docs/target/site/"
root-dir = "docs/target/site/"
# relative to `root-dir`
start-file = "docs/pekko-connectors/snapshot/index.html"

Expand All @@ -23,7 +23,7 @@ site-link-validator {

ignore-files = [
# This file is generated, we can't do much about the invalid links here
"license-report.html"
"docs/pekko-connectors/snapshot/license-report.html"
]

ignore-prefixes = [
Expand All @@ -39,10 +39,18 @@ site-link-validator {
"https://mvnrepository.com/artifact/"
# Errors in Scaladoc from Google Common header `X-Upload-Content-Type`
"https://doc.akka.io/api/akka-http/10.2.9/akka/http/impl/util/"
# Invalid links generated in Google Common Connector scaladoc
"https://pekko.apache.org/api/pekko-http/"
# Invalid links generated in Google Pubsub Connector scaladoc
"https://pekko.apache.org/api/pekko-grpc/"
]

non-https-whitelist = [
# generated by @apidoc
"http://pravega.io/"
# no https support
"http://reactivemongo.org"
# need to investigate why scaladoc links are http
"http://www.scala-lang.org/api"
]
}

0 comments on commit a0403ab

Please sign in to comment.