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.

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

Dependabot 20211130a & required REST api fixes (data manager / asset owner) #6007

Merged
merged 47 commits into from
Dec 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
e9d5d74
Bump spotbugs-maven.version from 4.4.2 to 4.5.0.0
dependabot[bot] Nov 29, 2021
21e4f45
Bump spotbugs-annotations from 4.4.2 to 4.5.0
dependabot[bot] Nov 29, 2021
81b3f25
Bump spring-data-commons from 2.5.6 to 2.6.0
dependabot[bot] Nov 29, 2021
b70791b
Bump openlineage-java from 0.2.3 to 0.3.1
dependabot[bot] Nov 29, 2021
20c9ab6
Bump mockito.version from 4.0.0 to 4.1.0
dependabot[bot] Nov 29, 2021
c64e05e
Bump micrometer-registry-prometheus.version from 1.7.5 to 1.8.0
dependabot[bot] Nov 29, 2021
42465f1
Bump junit.platform.version from 1.8.1 to 1.8.2
dependabot[bot] Nov 29, 2021
92b7670
Bump dependency-check-maven from 6.4.1 to 6.5.0
dependabot[bot] Nov 29, 2021
6f0ae0e
Bump classgraph from 4.8.129 to 4.8.137
dependabot[bot] Nov 29, 2021
0860f85
Bump elasticsearch.version from 7.15.1 to 7.15.2
dependabot[bot] Nov 29, 2021
c93aa3c
Bump tomcat-embed-core from 9.0.54 to 9.0.55
dependabot[bot] Nov 29, 2021
c2da288
Bump spring-security.version from 5.5.3 to 5.6.0
dependabot[bot] Nov 29, 2021
29e5c32
Bump io.freefair.lombok from 6.2.0 to 6.3.0
dependabot[bot] Nov 29, 2021
ed0ab80
Bump tomcatVersion from 9.0.54 to 9.0.55
dependabot[bot] Nov 29, 2021
9bc3c0a
Bump spotbugs-annotations from 4.4.2 to 4.5.0
dependabot[bot] Nov 29, 2021
76727f2
Bump micrometer-registry-prometheus from 1.7.5 to 1.8.0
dependabot[bot] Nov 29, 2021
6ba27f6
Bump org.siouan.frontend-jdk11 from 4.0.1 to 6.0.0
dependabot[bot] Nov 29, 2021
2fe694e
Bump logbackVersion from 1.2.6 to 1.2.7
dependabot[bot] Nov 29, 2021
c3a13c3
Bump spring-data-commons from 2.5.6 to 2.6.0
dependabot[bot] Nov 29, 2021
038ba36
Bump logback.version from 1.2.6 to 1.2.7
dependabot[bot] Nov 29, 2021
c4d5e0d
Bump netty.version from 4.1.69.Final to 4.1.70.Final
dependabot[bot] Nov 29, 2021
8e42236
Bump springsecurityVersion from 5.5.3 to 5.6.0
dependabot[bot] Nov 29, 2021
8412f22
Bump openlineage-java from 0.2.3 to 0.3.1
dependabot[bot] Nov 29, 2021
1030808
Bump com.github.johnrengelman.shadow from 6.1.0 to 7.1.0
dependabot[bot] Nov 29, 2021
1b21aa7
Bump classgraph from 4.8.129 to 4.8.137
dependabot[bot] Nov 29, 2021
09e2449
Bump org.springframework.boot from 2.5.0 to 2.6.0
dependabot[bot] Nov 29, 2021
716ed79
Bump junit.jupiter.version from 5.8.1 to 5.8.2
dependabot[bot] Nov 29, 2021
a2b90d8
Bump junitjupiterVersion from 5.8.1 to 5.8.2
dependabot[bot] Nov 29, 2021
f9115fa
Bump springwebVersion from 5.3.12 to 5.3.13
dependabot[bot] Nov 29, 2021
ec1eb1d
Bump spring.version from 5.3.12 to 5.3.13
dependabot[bot] Nov 29, 2021
9ec3f68
Bump elasticsearchVersion from 7.15.1 to 7.15.2
dependabot[bot] Nov 29, 2021
d48cf74
Bump nettyVersion from 4.1.69.Final to 4.1.70.Final
dependabot[bot] Nov 29, 2021
10c74f4
Bump spring-boot.version from 2.5.6 to 2.6.0
dependabot[bot] Nov 29, 2021
571e404
Bump mockitoVersion from 4.0.0 to 4.1.0
dependabot[bot] Nov 29, 2021
c20b3dd
Bump luceneVersion from 8.10.1 to 8.11.0
dependabot[bot] Nov 29, 2021
8f68e1a
Bump springbootVersion from 2.5.6 to 2.6.0
dependabot[bot] Nov 29, 2021
58fdd9d
Bump actions/cache from 2.1.6 to 2.1.7
dependabot[bot] Nov 29, 2021
b373c8e
Bump library/alpine
dependabot[bot] Nov 29, 2021
b3ada02
Update jena - security advisory
planetf1 Nov 30, 2021
858e6d8
#6010 Correct FileSystemOnboardingResource REST API
planetf1 Nov 30, 2021
e001ded
#6010 fix REST API error in valid-value-sets/by-name
planetf1 Nov 30, 2021
3724de0
Merge branch 'master' of https://github.com/odpi/egeria into dependab…
planetf1 Nov 30, 2021
e85a9f4
Bump spring-boot.version from 2.5.6 to 2.6.1
dependabot[bot] Dec 1, 2021
7060cf5
Bump springbootVersion from 2.5.6 to 2.6.1
dependabot[bot] Dec 1, 2021
bc1dc81
Bump springdoc-openapi-ui from 1.5.12 to 1.5.13
dependabot[bot] Dec 1, 2021
501c13d
Bump org.springframework.boot from 2.5.0 to 2.6.1
dependabot[bot] Dec 1, 2021
8a2df32
Bump springdoc-openapi-ui from 1.5.12 to 1.5.13
dependabot[bot] Dec 1, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/pr-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
distribution: 'adopt'
java-version: '11'
- name: Cache Gradle packages
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-maven-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
distribution: 'adopt'
java-version: '16'
- name: Cache Maven packages
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: ~/.m2
key: ${{ runner.os }}-maven-java11-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-maven-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
distribution: 'adopt'
java-version: '11'
- name: Cache Maven packages
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: ~/.m2
key: ${{ runner.os }}-maven-java11-${{ hashFiles('**/pom.xml') }}
Expand Down
33 changes: 18 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ buildscript {
plugins {
//id "nebula.lint" version "16.9.0"
//id "nebula-aggregate-javadocs"
id "io.freefair.lombok" version "6.2.0"
id "io.freefair.lombok" version "6.3.0"
}

/* run './gradlew aggregateJavadocs' at top level to build all docs & output to build/docs/javadoc */
Expand Down Expand Up @@ -74,24 +74,27 @@ allprojects {
// Assign variables for any constraints where we have multiples at same version

ext {
logbackVersion = '1.2.6'
logbackVersion = '1.2.7'
jacksonVersion = '2.12.2'
luceneVersion = '8.10.1'
nettyVersion = '4.1.69.Final'
nettyVersion = '4.1.70.Final'
luceneVersion = '8.11.0'
gremlinVersion = '3.5.1'
groovyVersion = '3.0.9'
springdataVersion = '2.5.6'
springdataVersion = '2.6.0'
janusVersion = '0.6.0'
springwebVersion = '5.3.12'
springwebVersion = '5.3.13'
springldapVersion = '2.3.4.RELEASE'
springsecurityVersion = '5.5.3'
springsecurityVersion = '5.6.0'
tomcatVersion = '9.0.55'
junitjupiterVersion = '5.8.2'
mockitoVersion = '4.1.0'
mockitoVersion = '4.0.0'
tomcatVersion = '9.0.54'
junitjupiterVersion = '5.8.1'
springbootVersion = '2.5.6'
springbootVersion = '2.6.1'
httpcoreVersion = '4.4.14'
jenaVersion = '4.1.0'
elasticsearchVersion = '7.15.1'
jenaVersion = '4.2.0'
elasticsearchVersion = '7.15.2'
}

dependencies {
Expand All @@ -107,7 +110,7 @@ allprojects {
implementation("com.fasterxml:classmate:1.5.1")
implementation("com.github.jsonld-java:jsonld-java:0.13.3")
implementation("com.google.crypto.tink:tink:1.6.1")
implementation("com.github.spotbugs:spotbugs-annotations:4.4.2")
implementation("com.github.spotbugs:spotbugs-annotations:4.5.0")
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.google.guava:guava:31.0.1-jre")
implementation("com.mikesamuel:json-sanitizer:1.2.3")
Expand All @@ -116,18 +119,18 @@ allprojects {
implementation("commons-io:commons-io:2.11.0")
implementation("commons-logging:commons-logging:1.2")
implementation("org.apache.commons:commons-text:1.9")
implementation("io.github.classgraph:classgraph:4.8.129")
implementation("io.github.classgraph:classgraph:4.8.137")
implementation("io.jsonwebtoken:jjwt:0.9.1")
implementation('io.lettuce:lettuce-core:6.1.5.RELEASE')
implementation("io.micrometer:micrometer-registry-prometheus:1.7.5")
implementation("io.micrometer:micrometer-registry-prometheus:1.8.0")
implementation("io.netty:netty-handler:${nettyVersion}")
implementation("io.netty:netty-common:${nettyVersion}")
implementation("io.netty:netty-buffer:${nettyVersion}")
implementation("io.netty:netty-codec:${nettyVersion}")
implementation("io.netty:netty-all:${nettyVersion}")
implementation("io.netty:netty-transport:${nettyVersion}")
implementation("io.netty:netty-resolver:${nettyVersion}")
implementation("io.openlineage:openlineage-java:0.2.3")
implementation("io.openlineage:openlineage-java:0.3.1")
implementation("io.swagger.core.v3:swagger-annotations:2.1.11")
implementation("jakarta.annotation:jakarta.annotation-api:1.3.5")
implementation("jakarta.persistence:jakarta.persistence-api:2.2.3")
Expand Down Expand Up @@ -171,7 +174,7 @@ allprojects {
implementation("org.javassist:3.27.0-GA")
implementation("org.quartz-scheduler:quartz:2.3.2")
implementation("org.reflections:reflections:0.10.2")
implementation("org.springdoc:springdoc-openapi-ui:1.5.12")
implementation("org.springdoc:springdoc-openapi-ui:1.5.13")
implementation("org.slf4j:jcl-over-slf4j:1.7.32")
implementation("org.slf4j:slf4j-api:1.7.32")
implementation("org.springframework.boot:spring-boot-autoconfigure:${springbootVersion}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public GUIDListResponse createFolderStructureInCatalog(@PathVariable String
* PropertyServerException problem accessing property server or
* UserNotAuthorizedException security access problem.
*/
@PostMapping(path = "/file-systems/{fileSystemGUID}/folders/{fileSystemGUID}/attach")
@PostMapping(path = "/file-systems/{fileSystemGUID}/folders/{folderGUID}/attach")

public VoidResponse attachFolderToFileSystem(@PathVariable String serverName,
@PathVariable String userId,
Expand All @@ -153,7 +153,7 @@ public VoidResponse attachFolderToFileSystem(@PathVariable Stri
* PropertyServerException problem accessing property server or
* UserNotAuthorizedException security access problem.
*/
@PostMapping(path = "/file-systems/{fileSystemGUID}/folders/{fileSystemGUID}/detach")
@PostMapping(path = "/file-systems/{fileSystemGUID}/folders/{folderGUID}/detach")

public VoidResponse detachFolderFromFileSystem(@PathVariable String serverName,
@PathVariable String userId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public GUIDResponse createEnumSchemaType(@PathVariable String
* UserNotAuthorizedException the user is not authorized to issue this request
* PropertyServerException there is a problem reported in the open metadata server(s)
*/
@PostMapping(path = "/valid-value-sets/by-name}")
@PostMapping(path = "/valid-value-sets/by-name")

public ValidValueSetsResponse getValidValueSetByName(@PathVariable String serverName,
@PathVariable String userId,
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.14.2
FROM docker.io/library/alpine:3.15.0
ARG version=3.5-SNAPSHOT
ARG VCS_REF=unknown
ARG VCS_ORIGIN=unknown
Expand Down
38 changes: 19 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,33 +148,33 @@
<classmate.version>1.5.1</classmate.version>

<!-- Versions of dependent libraries -->
<junit.jupiter.version>5.8.1</junit.jupiter.version>
<junit.platform.version>1.8.1</junit.platform.version>
<junit.platform.version>1.8.2</junit.platform.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<hamcrest.version>2.2</hamcrest.version>
<junit.version>4.13.2</junit.version>
<surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
<mockito.version>4.0.0</mockito.version>
<mockito.version>4.1.0</mockito.version>
<testng.version>7.4.0</testng.version>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.6</logback.version>
<logback.version>1.2.7</logback.version>
<jackson.version>2.13.0</jackson.version>
<jackson.databind.version>2.10.0</jackson.databind.version>
<kafka.version>3.0.0</kafka.version>
<tomcat.version>9.0.54</tomcat.version>
<spring-boot.version>2.5.6</spring-boot.version>
<netty.version>4.1.69.Final</netty.version>
<tomcat.version>9.0.55</tomcat.version>
<netty.version>4.1.70.Final</netty.version>
<spring-boot.version>2.6.1</spring-boot.version>
<janus.version>0.6.0</janus.version>
<spring.ldap.core>2.3.4.RELEASE</spring.ldap.core>
<gremlin.version>3.5.1</gremlin.version>
<spring-security.version>5.5.3</spring-security.version>
<spring-data.version>2.5.6</spring-data.version>
<springdoc.version>1.5.12</springdoc.version>
<spring.version>5.3.12</spring.version>
<spring-data.version>2.6.0</spring-data.version>
<spring-security.version>5.6.0</spring-security.version>
<spring.version>5.3.13</spring.version>
<springdoc.version>1.5.13</springdoc.version>
<springdoc-plugin.version>1.3</springdoc-plugin.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-text.version>1.9</commons-text.version>
<commons-collections4.version>4.4</commons-collections4.version>
<jena.version>4.1.0</jena.version>
<jena.version>4.2.0</jena.version>
<commons-lang.version>3.12.0</commons-lang.version>
<jwt.version>0.9.1</jwt.version>
<jakarta.persistence.version>2.2.3</jakarta.persistence.version>
Expand All @@ -196,17 +196,17 @@
<json-sanitizer.version>1.2.3</json-sanitizer.version>
<googlefindbugs.version>3.0.2</googlefindbugs.version>
<oss.version>4.13.0</oss.version>
<spotbugs-annotations.version>4.4.2</spotbugs-annotations.version>
<spotbugs-annotations.version>4.5.0</spotbugs-annotations.version>
<sleepycat.version>18.3.12</sleepycat.version>
<joda.version>2.10.13</joda.version>
<jackson-asl.version>1.9.14-atlassian-6</jackson-asl.version>
<antlr.version>3.5.2</antlr.version>
<snappy.version>1.1.8.4</snappy.version>
<swagger.version>2.1.11</swagger.version>
<classgraph.version>4.8.129</classgraph.version>
<classgraph.version>4.8.137</classgraph.version>
<snakeyaml.version>1.29</snakeyaml.version>
<groovy.version>3.0.9</groovy.version>
<micrometer-registry-prometheus.version>1.7.5</micrometer-registry-prometheus.version>
<micrometer-registry-prometheus.version>1.8.0</micrometer-registry-prometheus.version>
<jcl-over-slf4j.version>1.7.32</jcl-over-slf4j.version>
<reflections.version>0.10.2</reflections.version>
<HdrHistogram.version>2.1.12</HdrHistogram.version>
Expand All @@ -221,7 +221,7 @@
<lombok-plugin.version>1.18.20.0</lombok-plugin.version>
<javax.servlet.version>4.0.1</javax.servlet.version>
<thrift.version>0.15.0</thrift.version>
<elasticsearch.version>7.15.1</elasticsearch.version>
<elasticsearch.version>7.15.2</elasticsearch.version>
<hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
<!-- Versions of plugins -->
<enunciate-maven-plugin.version>2.10.1</enunciate-maven-plugin.version>
Expand All @@ -233,9 +233,9 @@
<maven-install.version>3.0.0-M1</maven-install.version>
<maven-compiler.version>3.8.1</maven-compiler.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<owasp.version>6.4.1</owasp.version>
<owasp.version>6.5.0</owasp.version>
<maven-pmd.version>3.15.0</maven-pmd.version>
<spotbugs-maven.version>4.4.2</spotbugs-maven.version>
<spotbugs-maven.version>4.5.0.0</spotbugs-maven.version>
<maven-download.version>1.6.7</maven-download.version>
<maven-antrun.version>3.0.0</maven-antrun.version>
<spotify-docker-plugin.version>1.4.13</spotify-docker-plugin.version>
Expand All @@ -258,7 +258,7 @@
<process-exec-plugin.version>0.9</process-exec-plugin.version>
<groovy-plugin.version>2.1.1</groovy-plugin.version>
<properties.plugin.version>1.0.0</properties.plugin.version>
<openlineage.version>0.2.3</openlineage.version>
<openlineage.version>0.3.1</openlineage.version>

<!-- Configuration of sonar code scanning-->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
pluginManagement {
plugins {
//id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'org.springframework.boot' version '2.5.0'
id 'org.springframework.boot' version '2.6.1'
id 'gradle-aggregate-javadocs-plugin' version '3.0.1'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'org.siouan.frontend-jdk11' version '4.0.1'
id 'org.siouan.frontend-jdk11' version '6.0.0'
id 'com.github.johnrengelman.shadow' version '7.1.0'
id 'com.github.psxpaul.execfork' version '0.1.15'


Expand Down