Merge branch 'main' into fix/build-errors-2

j5ik2o · web-flow · commit 9a21c219e32c · 2025-03-27T06:54:15.000+09:00
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
@@ -12,7 +12,7 @@ jobs:
   bump-version:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.7
       with:
         fetch-depth: 0
         persist-credentials: false
@@ -43,7 +43,7 @@ jobs:
         fi
     - name: Bump version and push tag
       id: tag_version
-      uses: mathieudutour/github-tag-action@v6.1
+      uses: mathieudutour/github-tag-action@v6.2
       with:
         github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         default_bump: patch
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
@@ -51,13 +51,14 @@ jobs:
       AWS_REGION: ap-northeast-1
       TEST_TIME_FACTOR: 5
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.jdk }}
           cache: 'sbt'
+      - uses: sbt/setup-sbt@v1    
       - name: sbt test
         run: sbt -v ++${{ matrix.scala }} test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.7
       with:
         fetch-depth: 0
     - uses: actions/setup-java@v3
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -16,7 +16,7 @@ jobs:
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.7
       with:
         ref: ${{ github.event.workflow_run.head_branch }}
         fetch-depth: 0
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version                                 = 3.7.14
+version                                 = 3.8.2
 runner.dialect                          = scala213
 style                                   = defaultWithAlign
 danglingParentheses.preset              = true
diff --git a/build.sbt b/build.sbt
@@ -237,10 +237,10 @@ val `docker-controller-scala-elasticsearch` = (project in file("docker-controlle
       scalatest.scalatest               % Test,
       logback.classic                   % Test,
       elasticsearch.restHighLevelClient % Test,
-      "co.elastic.clients"              % "elasticsearch-java" % "7.17.15" % Test,
-      "com.fasterxml.jackson.core"      % "jackson-databind"   % "2.16.0"  % Test,
-      "org.apache.logging.log4j"        % "log4j-api"          % "2.22.0"  % Test,
-      "org.apache.logging.log4j"        % "log4j-core"         % "2.22.0"  % Test
+      "co.elastic.clients"              % "elasticsearch-java" % "7.17.22" % Test,
+      "com.fasterxml.jackson.core"      % "jackson-databind"   % "2.17.2"  % Test,
+      "org.apache.logging.log4j"        % "log4j-api"          % "2.23.1"  % Test,
+      "org.apache.logging.log4j"        % "log4j-core"         % "2.23.1"  % Test
     )
   ).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -31,32 +31,32 @@ object Dependencies {
   }
 
   object amazonAws {
-    val dynamodb = "com.amazonaws" % "aws-java-sdk-dynamodb" % "1.12.584"
-    val s3       = "com.amazonaws" % "aws-java-sdk-s3"       % "1.12.584"
-    val sqs      = "com.amazonaws" % "aws-java-sdk-sqs"      % "1.12.584"
+    val dynamodb = "com.amazonaws" % "aws-java-sdk-dynamodb" % "1.12.757"
+    val s3       = "com.amazonaws" % "aws-java-sdk-s3"       % "1.12.757"
+    val sqs      = "com.amazonaws" % "aws-java-sdk-sqs"      % "1.12.757"
   }
 
   object apache {
 
     object zooKeeper {
-      val zooKeeper = "org.apache.zookeeper" % "zookeeper" % "3.9.1"
+      val zooKeeper = "org.apache.zookeeper" % "zookeeper" % "3.9.2"
     }
 
     object kafka {
-      val kafkaClients = "org.apache.kafka" % "kafka-clients" % "3.6.0"
+      val kafkaClients = "org.apache.kafka" % "kafka-clients" % "3.7.1"
     }
   }
 
   object mysql {
-    val connectorJava = "com.mysql" % "mysql-connector-j" % "8.2.0"
+    val connectorJava = "com.mysql" % "mysql-connector-j" % "8.4.0"
   }
 
   object postgresql {
-    val postgresql = "org.postgresql" % "postgresql" % "42.7.0"
+    val postgresql = "org.postgresql" % "postgresql" % "42.7.3"
   }
 
   object elasticsearch {
-    val restHighLevelClient = "org.elasticsearch.client" % "elasticsearch-rest-high-level-client" % "7.17.15"
+    val restHighLevelClient = "org.elasticsearch.client" % "elasticsearch-rest-high-level-client" % "7.17.22"
   }
 
   object dockerJava {
@@ -85,7 +85,7 @@ object Dependencies {
   }
 
   object freemarker {
-    val freemarker = "org.freemarker" % "freemarker" % "2.3.32"
+    val freemarker = "org.freemarker" % "freemarker" % "2.3.33"
 
   }
 
@@ -95,7 +95,7 @@ object Dependencies {
   }
 
   object commons {
-    val io = "commons-io" % "commons-io" % "2.15.0"
+    val io = "commons-io" % "commons-io" % "2.16.1"
   }
 
   object beachape {
@@ -112,6 +112,6 @@ object Dependencies {
   }
 
   object fasterxml {
-    val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.16.0"
+    val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.2"
   }
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.7
+sbt.version = 1.10.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,8 +2,8 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
 
 addDependencyTreePlugin

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = 3.7.14`
	`1`	`+version = 3.8.2`
`2`	`2`	`runner.dialect = scala213`
`3`	`3`	`style = defaultWithAlign`
`4`	`4`	`danglingParentheses.preset = true`
Original file line number	Diff line number	Diff line change
`@@ -31,32 +31,32 @@ object Dependencies {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`object amazonAws {`
`34`		`- val dynamodb = "com.amazonaws" % "aws-java-sdk-dynamodb" % "1.12.584"`
`35`		`- val s3 = "com.amazonaws" % "aws-java-sdk-s3" % "1.12.584"`
`36`		`- val sqs = "com.amazonaws" % "aws-java-sdk-sqs" % "1.12.584"`
	`34`	`+ val dynamodb = "com.amazonaws" % "aws-java-sdk-dynamodb" % "1.12.757"`
	`35`	`+ val s3 = "com.amazonaws" % "aws-java-sdk-s3" % "1.12.757"`
	`36`	`+ val sqs = "com.amazonaws" % "aws-java-sdk-sqs" % "1.12.757"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`object apache {`
`40`	`40`
`41`	`41`	`object zooKeeper {`
`42`		`- val zooKeeper = "org.apache.zookeeper" % "zookeeper" % "3.9.1"`
	`42`	`+ val zooKeeper = "org.apache.zookeeper" % "zookeeper" % "3.9.2"`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`object kafka {`
`46`		`- val kafkaClients = "org.apache.kafka" % "kafka-clients" % "3.6.0"`
	`46`	`+ val kafkaClients = "org.apache.kafka" % "kafka-clients" % "3.7.1"`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`object mysql {`
`51`		`- val connectorJava = "com.mysql" % "mysql-connector-j" % "8.2.0"`
	`51`	`+ val connectorJava = "com.mysql" % "mysql-connector-j" % "8.4.0"`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`object postgresql {`
`55`		`- val postgresql = "org.postgresql" % "postgresql" % "42.7.0"`
	`55`	`+ val postgresql = "org.postgresql" % "postgresql" % "42.7.3"`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`object elasticsearch {`
`59`		`- val restHighLevelClient = "org.elasticsearch.client" % "elasticsearch-rest-high-level-client" % "7.17.15"`
	`59`	`+ val restHighLevelClient = "org.elasticsearch.client" % "elasticsearch-rest-high-level-client" % "7.17.22"`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`object dockerJava {`
`@@ -85,7 +85,7 @@ object Dependencies {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`object freemarker {`
`88`		`- val freemarker = "org.freemarker" % "freemarker" % "2.3.32"`
	`88`	`+ val freemarker = "org.freemarker" % "freemarker" % "2.3.33"`
`89`	`89`
`90`	`90`	`}`
`91`	`91`
`@@ -95,7 +95,7 @@ object Dependencies {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`object commons {`
`98`		`- val io = "commons-io" % "commons-io" % "2.15.0"`
	`98`	`+ val io = "commons-io" % "commons-io" % "2.16.1"`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`object beachape {`
`@@ -112,6 +112,6 @@ object Dependencies {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`object fasterxml {`
`115`		`- val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.16.0"`
	`115`	`+ val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.2"`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version = 1.9.7`
	`1`	`+sbt.version = 1.10.0`