Skip to content

Commit

Permalink
chore(dependenies): Update for many Dependencies
Browse files Browse the repository at this point in the history
* Scala:            2.13.10 => 2.13.12
* logback-classic": 1.4.7   => 1.4.11
* mongodb-driver:   2.6.3   =>  2.6.4
* micrometer-core:  1.11.0  => 1.11.5
  • Loading branch information
QuadStingray committed Oct 12, 2023
1 parent 24c6103 commit cbe9f93
Show file tree
Hide file tree
Showing 71 changed files with 26 additions and 26 deletions.
Empty file modified .github/ISSUE_TEMPLATE/01_issue.md
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/02_feature.md
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/03_questions.md
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/config.yml
100644 → 100755
Empty file.
Empty file modified .github/workflows/main_test_release.yml
100644 → 100755
Empty file.
Empty file modified .github/workflows/other_test.yml
100644 → 100755
Empty file.
Empty file modified .github/workflows/scala-steward.yml
100644 → 100755
Empty file.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .scalafmt.conf
100644 → 100755
Empty file.
Empty file modified CHANGELOG.md
100644 → 100755
Empty file.
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
8 changes: 4 additions & 4 deletions build.sbt
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ developers := List(

licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))

crossScalaVersions := Seq("2.13.10")
crossScalaVersions := Seq("2.13.12")

scalaVersion := crossScalaVersions.value.head

Expand All @@ -59,11 +59,11 @@ buildInfoOptions += BuildInfoOption.BuildTime

resolvers += "Sonatype OSS Snapshots".at("https://oss.sonatype.org/content/repositories/snapshots")

libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.4.7"
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.4.11"

libraryDependencies += "dev.mongocamp" %% "mongodb-driver" % "2.6.3"
libraryDependencies += "dev.mongocamp" %% "mongodb-driver" % "2.6.4"

libraryDependencies += "io.micrometer" % "micrometer-core" % "1.11.0"
libraryDependencies += "io.micrometer" % "micrometer-core" % "1.11.5"

libraryDependencies += "com.github.blemale" %% "scaffeine" % "5.2.1"

Expand Down
2 changes: 1 addition & 1 deletion build_docu.sbt
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import scala.sys.process._
import scala.sys.process.*

commands += Command.command("ci-deploy-docs")((state: State) => {
val lowerCaseVersion = version.value.toLowerCase
Expand Down
6 changes: 3 additions & 3 deletions build_release.sbt
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import dev.quadstingray.sbt.json.JsonFile
import sbtrelease.ReleasePlugin.autoImport.ReleaseKeys.versions
import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._
import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations.*
import sbtrelease.ReleasePlugin.runtimeVersion
import dev.quadstingray.sbt.json.JsonFile

import scala.sys.process._
import scala.sys.process.*

val gitAddAllTask = ReleaseStep(action = st => {
"git add .".!
Expand Down
Empty file modified changelog/config.js
100644 → 100755
Empty file.
Empty file modified changelog/header.hbs
100644 → 100755
Empty file.
Empty file modified docs/.vitepress/config.ts
100644 → 100755
Empty file.
Empty file modified docs/.vitepress/theme/components/DependencyGroup.vue
100644 → 100755
Empty file.
Empty file modified docs/.vitepress/theme/custom.css
100644 → 100755
Empty file.
Empty file modified docs/.vitepress/theme/index.ts
100644 → 100755
Empty file.
Empty file modified docs/changelog.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/binder/collection.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/binder/connections.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/binder/database.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/binder/index.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/binder/network.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/binder/operation.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/binder/server.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/getting-started.md
100644 → 100755
Empty file.
Empty file modified docs/documentation/registry.md
100644 → 100755
Empty file.
Empty file modified docs/external/fileloader.sh
100644 → 100755
Empty file.
Empty file modified docs/index.md
100644 → 100755
Empty file.
Empty file modified docs/public/_headers
100644 → 100755
Empty file.
Empty file modified docs/public/favicon.ico
100644 → 100755
Empty file.
Empty file modified docs/public/icons/apple-touch-icon.png
100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/public/icons/favicon-16x16.png
100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/public/icons/favicon-32x32.png
100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/public/logo_with_text_right.png
100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/public/logo_without_text.png
100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/public/mongocamp.png
100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/public/schema.png
100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/uno.config.ts
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion package.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name" : "micrometer-mongodb",
"organization" : "dev.mongocamp",
"version" : "0.6.2.snapshot",
"version" : "0.6.2",
"author" : "info@mongocamp.dev",
"license" : "Apache-2.0",
"repository" : {
Expand Down
Empty file modified project/build.properties
100644 → 100755
Empty file.
Empty file modified project/plugins.sbt
100644 → 100755
Empty file.
Empty file modified src/main/resources/reference.conf
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions src/main/scala/dev/mongocamp/micrometer/mongodb/MetricsCache.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.mongocamp.micrometer.mongodb

import com.github.blemale.scaffeine.{ Cache, Scaffeine }
import com.typesafe.config.{ Config, ConfigFactory }
import com.github.blemale.scaffeine.{Cache, Scaffeine}
import com.typesafe.config.{Config, ConfigFactory}
import org.mongodb.scala.Document

import java.util.concurrent.TimeUnit
Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/dev/mongocamp/micrometer/mongodb/binder/CollectionMetrics.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package dev.mongocamp.micrometer.mongodb.binder

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
import dev.mongocamp.micrometer.mongodb.MetricsCache
import io.micrometer.core.instrument.binder.{ BaseUnits, MeterBinder }
import io.micrometer.core.instrument.{ Gauge, MeterRegistry, Tag }
import org.mongodb.scala.{ Document, MongoDatabase }
import io.micrometer.core.instrument.binder.{BaseUnits, MeterBinder}
import io.micrometer.core.instrument.{Gauge, MeterRegistry, Tag}
import org.mongodb.scala.{Document, MongoDatabase}

import scala.jdk.CollectionConverters.IterableHasAsJava

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/dev/mongocamp/micrometer/mongodb/binder/ConnectionsMetrics.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.mongocamp.micrometer.mongodb.binder

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
import io.micrometer.core.instrument._
import io.micrometer.core.instrument.binder.BaseUnits
import org.mongodb.scala.MongoDatabase
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/dev/mongocamp/micrometer/mongodb/binder/DatabaseMetrics.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dev.mongocamp.micrometer.mongodb.binder

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
import io.micrometer.core.instrument.binder.MeterBinder
import io.micrometer.core.instrument.{ MeterRegistry, Tag }
import io.micrometer.core.instrument.{MeterRegistry, Tag}
import org.mongodb.scala.MongoDatabase

case class DatabaseMetrics(mongoDatabase: MongoDatabase, tags: List[Tag] = List.empty) extends MeterBinder {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/dev/mongocamp/micrometer/mongodb/binder/NetworkMetrics.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.mongocamp.micrometer.mongodb.binder

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
import io.micrometer.core.instrument._
import io.micrometer.core.instrument.binder.BaseUnits
import org.mongodb.scala.MongoDatabase
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/dev/mongocamp/micrometer/mongodb/binder/OperationMetrics.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.mongocamp.micrometer.mongodb.binder

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
import io.micrometer.core.instrument._
import io.micrometer.core.instrument.binder.BaseUnits
import org.mongodb.scala.MongoDatabase
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/dev/mongocamp/micrometer/mongodb/binder/ServerMetrics.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.mongocamp.micrometer.mongodb.binder

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
import io.micrometer.core.instrument._
import io.micrometer.core.instrument.binder.BaseUnits
import org.mongodb.scala.MongoDatabase
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/dev/mongocamp/micrometer/mongodb/binder/ServerMetricsBase.scala
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package dev.mongocamp.micrometer.mongodb.binder
import dev.mongocamp.driver.mongodb._
import dev.mongocamp.micrometer.mongodb.MetricsCache
import io.micrometer.core.instrument.binder.MeterBinder
import org.mongodb.scala.{ Document, MongoDatabase }
import org.mongodb.scala.{Document, MongoDatabase}
trait ServerMetricsBase extends MeterBinder {

def mongoDatabase: MongoDatabase
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/dev/mongocamp/micrometer/mongodb/registry/MongoRegistryConfig.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.mongocamp.micrometer.mongodb.registry

import com.typesafe.config.{ Config, ConfigFactory }
import com.typesafe.config.{Config, ConfigFactory}
import dev.mongocamp.driver.mongodb.MongoDAO
import dev.mongocamp.micrometer.mongodb.MetricsCache
import io.micrometer.core.instrument.step.StepRegistryConfig
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/dev/mongocamp/micrometer/mongodb/registry/MongoStepMeterRegistry.scala
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.mongocamp.micrometer.mongodb.registry

import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
import dev.mongocamp.driver.mongodb.database.{DatabaseProvider, MongoConfig}
import dev.mongocamp.micrometer.mongodb.registry.MongoStepMeterRegistry.threadFactory
import io.micrometer.common.util.StringUtils
import io.micrometer.core.instrument._
Expand Down
Empty file modified src/test/resources/application.conf
100644 → 100755
Empty file.
Empty file modified src/test/resources/json/pokedex.json
100644 → 100755
Empty file.
Empty file modified src/test/resources/json/restaurant.json
100644 → 100755
Empty file.
Empty file modified src/test/resources/logback-test.xml
100644 → 100755
Empty file.
Empty file modified src/test/scala/dev/mongocamp/micrometer/mongodb/BaseSuite.scala
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object MongoTestServer extends LazyLogging {

private var running: Boolean = false

private lazy val backend: SttpBackend[Future, AkkaStreams with capabilities.WebSockets] = AkkaHttpBackend()
private lazy val backend: SttpBackend[Future, PekkoStreams with capabilities.WebSockets] = PekkoHttpBackend()

private var mongodExecutable: Mongod = initMonoExecutable

Expand All @@ -38,7 +38,7 @@ object MongoTestServer extends LazyLogging {

private def initMonoExecutable: Mongod = {
val mongod = Mongod.builder()
.net(Start.to(classOf[Net]).providedBy(() => Net.builder().port(mongoPort).bindIp(Net.defaults().getBindIp).isIpv6(true).build()))
.net(Start.to(classOf[Net]).providedBy(() => Net.builder().port(mongoPort).bindIp(Net.defaults().getBindIp).build()))
.databaseDir(Start.to(classOf[DatabaseDir]).providedBy(() => DatabaseDir.of(tempDir.path)))
.processOutput(Start.to(classOf[ProcessOutput]).providedBy(() => ProcessOutput.silent()))
.build()
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified version.sbt
100644 → 100755
Empty file.

0 comments on commit cbe9f93

Please sign in to comment.