Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
popa-raluca authored Apr 19, 2023
2 parents ed4f85f + 29f5d28 commit f0e923d
Show file tree
Hide file tree
Showing 342 changed files with 42,125 additions and 6,107 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # tag=v2.1.2
uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # tag=v2.1.3
with:
results_file: results.sarif
results_format: sarif
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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
18 changes: 9 additions & 9 deletions bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ ext {
classmateVersion = '1.5.1'
collections4Version = '4.4'
commonscodecVersion = '1.15'
commonsconfiguration2Version = '2.8.0'
commonsconfiguration2Version = '2.9.0'
commonsconfigurationVersion = '1.10'
commonsioVersion = '2.11.0'
commonsloggingVersion = '1.2'
commonstextVersion = '1.10.0'
commonscliVersion = '1.5.0'
elasticsearchVersion = '8.6.2'
elasticsearchVersion = '8.7.0'
findbugsVersion = '3.0.2'
glassfishVersion = '1.1.4'
// TODO: Held back for compatability
Expand All @@ -58,7 +58,7 @@ ext {
javassistVersion = '3.29.2-GA'
jaxbVersion = '2.3.1'
jenaVersion = '4.7.0'
jodatimeVersion = '2.12.2'
jodatimeVersion = '2.12.5'
jsonldVersion = '0.13.4'
junitVersion = '4.13.2'
junitjupiterVersion = '5.9.2'
Expand All @@ -78,8 +78,8 @@ ext {
// TODO: Held as data engine breaks
mockitoVersion = '4.11.0'
plexusVersion = '3.5.1'
prometheusVersion = '1.10.4'
nettyVersion = '4.1.89.Final'
nettyVersion = '4.1.91.Final'
prometheusVersion = '1.10.6'
quartzVersion = '2.3.2'
reflectionsVersion = '0.10.2'
sanitizerVersion = '1.2.3'
Expand All @@ -90,13 +90,13 @@ ext {
snakeyamlVersion = '2.0'
slf4jVersion = '2.0.6'
snappyVersion = '1.1.9.1'
springbootVersion = '3.0.4'
springbootVersion = '3.0.5'
spotbugsVersion = '4.7.3'
springdataVersion = '3.0.3'
springldapVersion = '3.0.1'
springsecurityVersion = '6.0.2'
springsecurityJwtVersion = '1.1.1.RELEASE'
swaggerVersion = '2.2.8'
swaggerVersion = '2.2.9'
testngVersion = '7.7.1'
thriftVersion = '0.18.1'
springwebVersion = '6.0.6'
Expand All @@ -106,7 +106,7 @@ ext {
gsonVersion = '2.10.1'
antVersion = '1.10.13'
jnrVersion = '3.1.16'
cassandraVersion = '4.1.0'
cassandraVersion = '4.1.1'
protobufVersion = '3.22.2'
osgiVersion = '8.0.0'
log4jVersion = '2.20.0'
Expand All @@ -119,7 +119,7 @@ ext {
dependencies {
// Only use this to bring in platforms, which are *constraints*
dependencies {
api(platform('net.openhft:chronicle-bom:2.24ea45'))
api(platform('net.openhft:chronicle-bom:2.24ea50'))
}
constraints {
api("ch.qos.logback:logback-classic:${logbackVersion}")
Expand Down
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ subprojects {

// javadoc
javadoc {
options.addBooleanOption('html5', true)
options
{
addBooleanOption('html5', true)
setMemberLevel JavadocMemberLevel.PUBLIC
}
}

publishing {
Expand Down
2 changes: 1 addition & 1 deletion content-packs/OpenMetadataTypes.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ org.gradle.daemon.idletimeout=3600000
mavenRepoName=OSSRH

# Maven publish repository url
# it can be overriden by env variable ORG_GRADLE_PROJECT_mavenRepoUrl
# it can be overridden by env variable ORG_GRADLE_PROJECT_mavenRepoUrl
mavenRepoUrl=https://oss.sonatype.org/content/repositories/snapshots

# Maven publish repository user
# it can be overriden by env variable ORG_GRADLE_PROJECT_mavenRepoUser
# it can be overridden by env variable ORG_GRADLE_PROJECT_mavenRepoUser
mavenRepoUser=
# Maven publish repository password
# it can be overriden by env variable ORG_GRADLE_PROJECT_mavenRepoPass
# it can be overridden by env variable ORG_GRADLE_PROJECT_mavenRepoPass
mavenRepoPass=
Original file line number Diff line number Diff line change
Expand Up @@ -722,9 +722,11 @@ public VoidResponse updateComment(String serverName,
null,
commentGUID,
guidParameterName,
null,
commentType,
requestBody.getCommentText(),
requestBody.getIsPublic(),
true,
null,
null,
false,
Expand Down
Loading

0 comments on commit f0e923d

Please sign in to comment.