Skip to content
This repository has been archived by the owner on Jun 10, 2024. It is now read-only.

Commit

Permalink
Merge pull request #550 from planetf1/main
Browse files Browse the repository at this point in the history
  • Loading branch information
planetf1 authored May 23, 2023
2 parents 37c3cec + 0501b7a commit 6b35052
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- name: check stale issues and prs
if: startsWith(github.repository,'odpi/')
uses: actions/stale@v7
uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: >
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ subprojects {

// Assign variables for any constraints
ext {
egeriaversion = '4.0-SNAPSHOT'
egeriaversion = '4.0'
atlasversion = '2.3.0'
jaxbversion = '2.3.1'
mockserverversion = '5.15.0'
Expand All @@ -69,9 +69,9 @@ subprojects {
dependencies {
implementation platform("org.odpi.egeria:egeria:${egeriaversion}")
constraints {
implementation "com.fasterxml.jackson.core:jackson-annotations"
implementation "com.fasterxml.jackson.core:jackson-core"
implementation "com.fasterxml.jackson.core:jackson-databind"
compileOnly "com.fasterxml.jackson.core:jackson-annotations"
compileOnly "com.fasterxml.jackson.core:jackson-core"
compileOnly "com.fasterxml.jackson.core:jackson-databind"
implementation "org.apache.atlas:atlas-common:${atlasversion}"
implementation "org.apache.atlas:atlas-client-v2:${atlasversion}"
implementation "org.apache.atlas:atlas-intg:${atlasversion}"
Expand Down Expand Up @@ -137,8 +137,8 @@ subprojects {
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ pluginManagement {
}
plugins {
id "io.freefair.aggregate-javadoc" version "6.6.3"
id "io.freefair.lombok" 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"
// 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.9'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'org.springframework.boot' version '3.0.6'
id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'com.github.psxpaul.execfork' version '0.2.2'
}
}
Expand Down

0 comments on commit 6b35052

Please sign in to comment.