Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/odpi/egeria into issue7324
Browse files Browse the repository at this point in the history
  • Loading branch information
planetf1 committed Mar 7, 2023
2 parents 9eabccd + eab9551 commit 73f6c1e
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-v4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ jobs:
uses: docker/build-push-action@v4
with:
push: true
tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:latest, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:latest
tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:stable, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:stable
context: ./open-metadata-resources/open-metadata-deployment/docker/egeria
platforms: linux/amd64,linux/arm64
# Publish container images(egeria-configure) to quay.io and docker.io
- name: Build and push(egeria-configure) to quay.io and docker.io
uses: docker/build-push-action@v4
with:
push: true
tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:latest, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:latest
tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:stable, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:stable
context: ./open-metadata-resources/open-metadata-deployment/docker/configure
platforms: linux/amd64,linux/arm64
# Mostly for verification - not published to the release itself for now
Expand Down
14 changes: 13 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ plugins {
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"
id 'checkstyle'
}


Expand All @@ -29,6 +30,7 @@ allprojects {
version = '4.0-SNAPSHOT'

// Mostly java, so default to this for now
apply plugin: 'checkstyle'
apply plugin: 'java'
apply plugin: 'jacoco'
apply plugin: 'org.gradlex.java-ecosystem-capabilities'
Expand Down Expand Up @@ -109,7 +111,7 @@ allprojects {
mockitoVersion = '4.11.0'
plexusVersion = '3.5.0'
prometheusVersion = '1.10.4'
nettyVersion = '4.1.87.Final'
nettyVersion = '4.1.89.Final'
quartzVersion = '2.3.2'
reflectionsVersion = '0.10.2'
sanitizerVersion = '1.2.3'
Expand Down Expand Up @@ -423,6 +425,14 @@ allprojects {
task printSubDependencies(type: DependencyReportTask) {}
task findDependency(type: DependencyInsightReportTask) {}

// Checking of headers etc
checkstyle {
toolVersion = '10.7.0'
// Whilst initially adding, soft warnings only, as there are fixes needed
ignoreFailures = true
showViolations = true
}

} // end of allProjects

// Whilst all modules have their own javadoc, we only build
Expand Down Expand Up @@ -524,5 +534,7 @@ dependencyAnalysis {
}
}



// Always run dependency check for every regular build
build.dependsOn("buildHealth")
17 changes: 17 additions & 0 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="TreeWalker">


<module name="Regexp">
<property name="format" value="/\*[ ]{1,}SPDX-License-Identifier: Apache-2\.0"/>
</module>

<module name="Regexp">
<property name="format" value="/\*[ ]{1,}Copyright Contributors to the( ODPi)? Egeria project"/>
</module>
</module>
</module>
2 changes: 2 additions & 0 deletions config/checkstyle/java.header
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
^/* SPDX-License-Identifier: Apache-2.0 */$
^/* Copyright Contributors to the ODPi Egeria project. */$
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ authentication.mode=token
#
# Below is the default configuration for the two COCO_PHARMA roles we use for demo:

role.visibleComponents.COCO_PHARMA_USER=about,asset-catalog,asset-lineage,end-to-end,vertical-lineage
role.visibleComponents.COCO_PHARMA_ADMIN=*
role.visibleComponents.COCO_PHARMA_USER=about,asset-catalog,asset-details,asset-details-print,asset-lineage,asset-lineage-print,end-to-end,ultimate-source,ultimate-destination,vertical-lineage,glossary,repository-explorer
role.visibleComponents.COCO_PHARMA_ADMIN=about,type-explorer

# omas server connection details
omas.server.name=cocoMDS1
Expand Down

0 comments on commit 73f6c1e

Please sign in to comment.