Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scala steward updates batch 3 #6913

Merged
merged 2 commits into from
Sep 27, 2022
Merged

Scala steward updates batch 3 #6913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc8da2e
Scala sterward updates batch 3
kraefrei Sep 26, 2022
c9e4a62
Revert to AkkaHttp 10.1.15
kraefrei Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ object Dependencies {
private val kindProjectorV = "0.13.2"
private val kittensV = "2.3.2"
private val liquibaseV = "4.8.0"
private val logbackV = "1.2.10"
private val logbackV = "1.2.11"
private val lz4JavaV = "1.8.0"
private val mariadbV = "2.7.4"
/*
Expand All @@ -87,14 +87,14 @@ object Dependencies {
private val nettyV = "4.1.72.Final"
private val owlApiV = "5.1.19"
private val postgresV = "42.3.3"
private val pprintV = "0.7.1"
private val pprintV = "0.7.3"
private val rdf4jV = "3.7.1"
private val refinedV = "0.9.29"
private val rhinoV = "1.7.14"

private val scalaCollectionCompatV = "2.5.0"
private val scalaGraphV = "1.13.1"
private val scalaLoggingV = "3.9.4"
private val scalaLoggingV = "3.9.5"
private val scalaPoolV = "0.4.3"
private val scalacticV = "3.2.10"
private val scalameterV = "0.19"
Expand Down Expand Up @@ -123,7 +123,7 @@ object Dependencies {
private val sttpV = "1.7.2"
private val swaggerParserV = "1.0.56"
private val swaggerUiV = "4.5.0"
private val testContainersScalaV = "0.40.2"
private val testContainersScalaV = "0.40.10"
private val tikaV = "2.3.0"
private val typesafeConfigV = "1.4.1"
private val workbenchGoogleV = "0.21-5c9c4f6" // via: https://github.com/broadinstitute/workbench-libs/blob/develop/google/CHANGELOG.md
Expand Down
9 changes: 4 additions & 5 deletions project/GenerateRestApiDocs.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import java.time.OffsetDateTime
import java.time.format.DateTimeFormatter

import io.github.swagger2markup.Swagger2MarkupConverter
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder
import io.github.swagger2markup.markup.builder.MarkupLanguage
import io.github.swagger2markup.{MarkupLanguage, Swagger2MarkupConverter}
import org.apache.commons.lang3.{ClassUtils, StringUtils}
import sbt.Keys._
import sbt._

import java.time.OffsetDateTime
import java.time.format.DateTimeFormatter

/**
* Provides a task to generate the REST API markdown from the Swagger YAML.
*
Expand Down
2 changes: 1 addition & 1 deletion project/swagger2markup.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ val jacksonV = "2.8.4"
val javaslangV = "2.0.5"
val plexusUtilsV = "3.0.22"
val slf4jV = "1.7.21"
val swagger2markupV = "1.3.3"
val swagger2markupV = "1.3.4"

resolvers ++= List(
"JCenter" at "https://jcenter.bintray.com"
Expand Down