Skip to content

Commit

Permalink
Merge pull request #7680 from planetf1/dependabotgrp1
Browse files Browse the repository at this point in the history
  • Loading branch information
planetf1 authored May 12, 2023
2 parents ff4b941 + d6dcb51 commit d818f74
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Link Checker
uses: lycheeverse/lychee-action@v1.5.4
uses: lycheeverse/lychee-action@v1.7.0
with:
# Can switch to true once we run clean
fail: false
Expand Down
40 changes: 20 additions & 20 deletions bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ext {
antlrVersion = '3.5.3'
ST4Version = '4.3.4'
avroVersion = '1.11.1'
classgraphVersion = '4.8.157'
classgraphVersion = '4.8.158'
classmateVersion = '1.5.1'
collections4Version = '4.4'
commonscodecVersion = '1.15'
Expand All @@ -34,34 +34,34 @@ ext {
commonsloggingVersion = '1.2'
commonstextVersion = '1.10.0'
commonscliVersion = '1.5.0'
elasticsearchVersion = '8.7.0'
elasticsearchVersion = '8.7.1'
findbugsVersion = '3.0.2'
glassfishVersion = '1.1.4'
// TODO: Held back for compatability
gremlinVersion = '3.5.5'
gremlinVersion = '3.5.6'
// TODO: Version 4 under new package name. 3.0.13 is held to be compat with gradle tests (fvt)
groovyVersion = '3.0.13'
groovyVersion = '3.0.15'
guavaVersion = '31.1-jre'
hamcrestVersion = '2.2'
hdrhistogramVersion = '2.1.12'
hibernatevalidatorVersion = '8.0.0.Final'
// TODO There is now a version 5 codestream of the next 2 http dependencies
httpclientVersion = '4.5.14'
httpcoreVersion = '4.4.16'
jacksonVersion = '2.14.2'
jacksonDatabindVersion = '2.14.2'
jacksonVersion = '2.15.0'
jacksonDatabindVersion = '2.15.0'
jacksonaslVersion = '1.9.14-atlassian-6'
jakartaannotationVersion = '2.1.1'
jakartapersistenceVersion = '3.1.0'
jakartavalidationVersion = '3.0.2'
janusVersion = '0.6.2'
janusVersion = '0.6.3'
javassistVersion = '3.29.2-GA'
jaxbVersion = '2.3.1'
jenaVersion = '4.7.0'
jodatimeVersion = '2.12.5'
jsonldVersion = '0.13.4'
junitVersion = '4.13.2'
junitjupiterVersion = '5.9.2'
junitjupiterVersion = '5.9.3'
junitplatformVersion = '1.9.2'
jwtVersion = '9.31'
jwtApiVersion = '0.11.5'
Expand All @@ -70,16 +70,16 @@ ext {
kafkaVersion = '3.4.0'
lang3Version = '3.12.0'
logbackVersion = '1.4.5'
lettuceVersion = '6.2.3.RELEASE'
lettuceVersion = '6.2.4.RELEASE'
// TODO: Version 9 now available
luceneVersion = '8.11.2'
openlineageVersion = '0.21.1'
openlineageVersion = '0.24.0'
ossVersion = '4.15.0'
// TODO: Held as data engine breaks
mockitoVersion = '4.11.0'
plexusVersion = '3.5.1'
nettyVersion = '4.1.91.Final'
prometheusVersion = '1.10.6'
prometheusVersion = '1.11.0'
nettyVersion = '4.1.92.Final'
quartzVersion = '2.3.2'
reflectionsVersion = '0.10.2'
sanitizerVersion = '1.2.3'
Expand All @@ -90,36 +90,36 @@ ext {
snakeyamlVersion = '2.0'
slf4jVersion = '2.0.6'
snappyVersion = '1.1.9.1'
springbootVersion = '3.0.5'
springbootVersion = '3.0.6'
spotbugsVersion = '4.7.3'
springdataVersion = '3.0.3'
springldapVersion = '3.0.1'
springsecurityVersion = '6.0.2'
springsecurityVersion = '6.0.3'
springsecurityJwtVersion = '1.1.1.RELEASE'
swaggerVersion = '2.2.9'
testngVersion = '7.7.1'
thriftVersion = '0.18.1'
springwebVersion = '6.0.6'
tinkVersion = '1.8.0'
tomcatVersion = '10.1.7'
tinkVersion = '1.9.0'
tomcatVersion = '10.1.8'
validationVersion = '2.0.1.Final'
gsonVersion = '2.10.1'
antVersion = '1.10.13'
jnrVersion = '3.1.16'
cassandraVersion = '4.1.1'
protobufVersion = '3.22.2'
protobufVersion = '3.23.0'
osgiVersion = '8.0.0'
log4jVersion = '2.20.0'
jacksonjdk8Version = '2.14.2'
jacksonjdk8Version = '2.15.0'
reactivestreamsVersion = '1.0.4'
springdocStarterVersion = '2.0.4'
springdocStarterVersion = '2.1.0'
jacocoVersion = '0.8.8'
}

dependencies {
// Only use this to bring in platforms, which are *constraints*
dependencies {
api(platform('net.openhft:chronicle-bom:2.24ea50'))
api(platform('net.openhft:chronicle-bom:2.24ea55'))
}
constraints {
api("ch.qos.logback:logback-classic:${logbackVersion}")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ filter {
includeEngines 'junit-jupiter'
}
dependencies {
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
}

testLogging {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.apache.tomcat.embed:tomcat-embed-core'
//implementation 'org.springframework.boot:spring-boot-starter-tomcat'
implementation 'org.springframework.boot:spring-boot-starter-tomcat'
implementation 'jakarta.servlet:jakarta.servlet-api'

runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright Contributors to the Egeria project

FROM docker.io/library/alpine:3.17.3
FROM docker.io/library/alpine:3.18.0
ARG version=4.1-SNAPSHOT
ARG VCS_REF=unknown
ARG VCS_ORIGIN=unknown
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ pluginManagement {
id "io.freefair.aggregate-javadoc" version "6.6.3"
id "io.freefair.lombok" version "8.0.1"
// Checks for unnecessary dependencies
id("com.autonomousapps.dependency-analysis") version "1.19.0"
id("com.autonomousapps.dependency-analysis") version "1.20.0"
// helps resolve log implementation clashes
id 'dev.jacomet.logging-capabilities' version "0.11.0"
id 'dev.jacomet.logging-capabilities' version "0.11.1"
// This plugin helps resolve jakarta/javax dev.jacomet.logging-capabilities
id 'org.gradlex.java-ecosystem-capabilities' version "1.1"
// Docs don't recommend specifying a version for checkstyle
id 'checkstyle'
id 'org.springframework.boot' version '2.7.10'
id 'org.springframework.boot' version '2.7.11'
id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'com.github.psxpaul.execfork' version '0.2.2'
}
Expand Down

0 comments on commit d818f74

Please sign in to comment.