Skip to content

Commit 0ea9767

Browse files
mandy-chessellmandy-chessell
committed
Update to 5.1-SNAPSHOT
Signed-off-by: Mandy Chessell <[email protected]>
1 parent b4a941c commit 0ea9767

File tree

22 files changed

+370
-24
lines changed

22 files changed

+370
-24
lines changed

‎.github/workflows/codeql-v5.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright Contributors to the ODPi Egeria project.
3+
#
4+
# For most projects, this workflow file will not need changing; you simply need
5+
# to commit it to your repository.
6+
#
7+
# You may wish to alter this file to override the set of languages analyzed,
8+
# or to provide custom queries or build logic.
9+
---
10+
name: "CodeQL Analysis v5"
11+
12+
on:
13+
push:
14+
branches: [main, egeria-release-5*]
15+
pull_request:
16+
# The branches below must be a subset of the branches above
17+
branches: [main, egeria-release-5*]
18+
workflow_dispatch:
19+
20+
jobs:
21+
analyze:
22+
if: ${{ github.repository == 'odpi/egeria'}}
23+
name: "CodeQL Build v5"
24+
runs-on: ubuntu-latest
25+
permissions:
26+
actions: read
27+
contents: read
28+
security-events: write
29+
30+
steps:
31+
- name: Checkout repository
32+
uses: actions/[email protected]
33+
- uses: gradle/wrapper-validation-action@v2
34+
- name: Setup Java JDK
35+
uses: actions/setup-java@v4
36+
with:
37+
distribution: 'temurin'
38+
java-version: '17'
39+
# Initializes the CodeQL tools for scanning.
40+
- name: Initialize CodeQL
41+
uses: github/codeql-action/[email protected]
42+
with:
43+
languages: java
44+
queries: security-and-quality
45+
ram: 4096
46+
- name: Build
47+
uses: gradle/gradle-build-action@v3
48+
with:
49+
# codeQL requires a full before/after build to compare results. Caching can result in action failing
50+
#cache-read-only: true
51+
cache-disabled: true
52+
arguments: -x javadoc -x test build -PskipOpenTypesFVT
53+
- name: Perform CodeQL Analysis
54+
uses: github/codeql-action/[email protected]
55+
with:
56+
ram: 4096

‎.github/workflows/merge-v5.yml

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright Contributors to the ODPi Egeria project.
3+
---
4+
name: "Merge v5"
5+
6+
# Trigger after code is merged. only on main repo
7+
# - does not run on modification (may be just text)
8+
9+
on:
10+
push:
11+
branches: [main, egeria-release-5*]
12+
13+
permissions:
14+
contents: read
15+
16+
jobs:
17+
build:
18+
permissions:
19+
# for gh-pages
20+
contents: write
21+
runs-on: ubuntu-latest
22+
name: "Merge v5"
23+
if: startsWith(github.repository,'odpi/')
24+
steps:
25+
- uses: actions/[email protected]
26+
name: Checkout source
27+
- uses: gradle/wrapper-validation-action@v2
28+
- name: Set up JDK
29+
uses: actions/setup-java@v4
30+
with:
31+
java-version: '17'
32+
distribution: 'temurin'
33+
# Build first - lombok & other pre-processing may be needed. safer...
34+
- name: build and publish to maven central
35+
if: ${{ github.ref == 'refs/heads/main'}}
36+
uses: gradle/gradle-build-action@v3
37+
with:
38+
cache-read-only: false
39+
arguments: build publish
40+
# Import secrets needed for code signing and distribution
41+
env:
42+
OSSRH_GPG_KEYID: ${{ secrets.OSSRH_GPG_KEYID }}
43+
OSSRH_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
44+
OSSRH_GPG_PRIVATE_KEY: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
45+
ORG_GRADLE_PROJECT_mavenRepoPass: ${{ secrets.OSSRH_TOKEN }}
46+
ORG_GRADLE_PROJECT_mavenRepoUser: ${{ secrets.OSSRH_USERNAME }}
47+
# In other cases just build but don't publish
48+
- name: build (no publish to maven central)
49+
if: ${{ github.ref != 'refs/heads/main'}}
50+
uses: gradle/gradle-build-action@v3
51+
with:
52+
cache-read-only: false
53+
arguments: build
54+
# Now aggregate javadoc - main only
55+
- name: build
56+
if: ${{ github.ref == 'refs/heads/main'}}
57+
uses: gradle/gradle-build-action@v3
58+
with:
59+
cache-read-only: false
60+
arguments: aggregateJavadoc
61+
- name: publish aggregate javadoc
62+
if: ${{ github.ref == 'refs/heads/main'}}
63+
uses: JamesIves/github-pages-deploy-action@v4
64+
with:
65+
branch: gh-pages
66+
folder: build/docs/javadoc
67+
- name: Set up Docker Buildx
68+
uses: docker/setup-buildx-action@v3
69+
- name: Login to container registry (Quay.io)
70+
uses: docker/login-action@v3
71+
with:
72+
registry: quay.io
73+
username: ${{ secrets.QUAY_IO_USERNAME }}
74+
password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }}
75+
- name: Login to container registry (Docker Hub)
76+
uses: docker/login-action@v3
77+
with:
78+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
79+
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
80+
# QEMU is needed for ARM64 build for egeria-configure
81+
# egeria-configure needs to install utilities
82+
- name: Set up QEMU
83+
uses: docker/setup-qemu-action@v3
84+
- name: Set Release version env variable
85+
run: |
86+
echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
87+
# Publish container images(egeria) to quay.io and docker.io
88+
- name: Copy the distribution content to be used in docker copy command
89+
run: |
90+
cp -f release.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
91+
cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data
92+
- name: Build and push(egeria) to quay.io and docker.io (tag latest only for main!)
93+
if: ${{ github.ref == 'refs/heads/main'}}
94+
uses: docker/build-push-action@v5
95+
with:
96+
push: true
97+
tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:latest, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:latest
98+
context: ./open-metadata-deployment/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
99+
platforms: linux/amd64,linux/arm64
100+
- name: Build and push(egeria) to quay.io and docker.io (no tag latest)
101+
if: ${{ github.ref != 'refs/heads/main'}}
102+
uses: docker/build-push-action@v5
103+
with:
104+
push: true
105+
tags: odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:${{ env.VERSION }}
106+
context: ./open-metadata-deployment/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
107+
platforms: linux/amd64,linux/arm64
108+
# Publish container images(egeria-configure) to quay.io and docker.io
109+
- name: Build and push(egeria-configure) to quay.io and docker.io (tag latest)
110+
if: ${{ github.ref == 'refs/heads/main'}}
111+
uses: docker/build-push-action@v5
112+
with:
113+
push: true
114+
tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:latest, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:latest
115+
context: ./open-metadata-resources/open-metadata-deployment/docker/configure
116+
platforms: linux/amd64,linux/arm64
117+
# --
118+
# Publish container images(egeria-configure) to quay.io and docker.io
119+
- name: Build and push(egeria-configure) to quay.io and docker.io (no tag latest)
120+
if: ${{ github.ref != 'refs/heads/main'}}
121+
uses: docker/build-push-action@v5
122+
with:
123+
push: true
124+
tags: odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:${{ env.VERSION }}
125+
context: ./open-metadata-resources/open-metadata-deployment/docker/configure
126+
platforms: linux/amd64,linux/arm64
127+
# --
128+
- name: Upload Log of any dependency failures
129+
uses: actions/[email protected]
130+
with:
131+
name: Dependency Analysis Report (on failure)
132+
path: build/reports/dependency-analysis/build-health-report.txt
133+
if-no-files-found: ignore
134+
# Mostly for verification - not published to the release itself for now
135+
- name: Upload assemblies
136+
uses: actions/[email protected]
137+
with:
138+
name: Assemblies
139+
path: open-metadata-distribution/omag-server-platform/build/distributions/*.gz
140+
- name: Upload Test coverage report
141+
uses: actions/[email protected]
142+
with:
143+
name: Jacoco Coverage Report
144+
path: build/reports/jacoco/codeCoverageReport
145+
if-no-files-found: ignore

‎.github/workflows/pr-v5.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright Contributors to the ODPi Egeria project.
3+
---
4+
name: "Verify PR v5"
5+
6+
on:
7+
pull_request:
8+
branches: [main, egeria-release-5*]
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
name: "Verify PR v5"
17+
if: startsWith(github.repository,'odpi/')
18+
steps:
19+
- uses: actions/[email protected]
20+
- uses: gradle/wrapper-validation-action@v2
21+
- name: Set up JDK
22+
uses: actions/setup-java@v4
23+
with:
24+
distribution: 'temurin'
25+
java-version: '17'
26+
- name: Build with Gradle
27+
uses: gradle/gradle-build-action@v3
28+
with:
29+
# Only cache for main build
30+
cache-read-only: true
31+
arguments: |
32+
build
33+
--scan
34+
- name: Upload Test coverage report
35+
uses: actions/[email protected]
36+
with:
37+
name: Jacoco Coverage Report
38+
path: build/reports/jacoco/codeCoverageReport
39+
- name: Upload Log of any dependency failures
40+
uses: actions/[email protected]
41+
with:
42+
name: Dependency Analysis Report (on failure)
43+
path: build/reports/dependency-analysis/build-health-report.txt
44+
if-no-files-found: ignore

‎.github/workflows/release-v5.yml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright Contributors to the ODPi Egeria project.
3+
---
4+
name: "Release v5"
5+
6+
# Trigger when a Release is created in github
7+
# - does not run on modification (may be just text)
8+
9+
on:
10+
# No checks for branch or repo - assuming release creation is manual, controlled
11+
release:
12+
types:
13+
- created
14+
branches: [main, egeria-release-5*]
15+
16+
workflow_dispatch:
17+
18+
permissions:
19+
contents: read
20+
21+
jobs:
22+
build:
23+
runs-on: ubuntu-latest
24+
name: "Release"
25+
if: startsWith(github.repository,'odpi/')
26+
steps:
27+
- uses: actions/[email protected]
28+
name: Checkout source
29+
- uses: gradle/wrapper-validation-action@v2
30+
# Prep for docker builds
31+
- name: Set up Docker Buildx
32+
uses: docker/setup-buildx-action@v3
33+
- name: Login to container registry (Quay.io)
34+
uses: docker/login-action@v3
35+
with:
36+
registry: quay.io
37+
username: ${{ secrets.QUAY_IO_USERNAME }}
38+
password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }}
39+
- name: Login to container registry (docker.io)
40+
uses: docker/login-action@v3
41+
with:
42+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
43+
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
44+
- name: Set up JDK 17
45+
uses: actions/setup-java@v4
46+
with:
47+
distribution: 'temurin'
48+
java-version: '17'
49+
- name: build and publish to maven central
50+
uses: gradle/gradle-build-action@v3
51+
with:
52+
cache-read-only: false
53+
arguments: build publish -Dorg.gradle.parallel=false -Dorg.gradle.caching=false
54+
# Import secrets needed for code signing and distribution
55+
env:
56+
OSSRH_GPG_KEYID: ${{ secrets.OSSRH_GPG_KEYID }}
57+
OSSRH_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
58+
OSSRH_GPG_PRIVATE_KEY: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
59+
ORG_GRADLE_PROJECT_mavenRepoUrl: https://oss.sonatype.org/service/local/staging/deploy/maven2
60+
ORG_GRADLE_PROJECT_mavenRepoPass: ${{ secrets.OSSRH_TOKEN }}
61+
ORG_GRADLE_PROJECT_mavenRepoUser: ${{ secrets.OSSRH_USERNAME }}
62+
# QEMU is needed for ARM64 build for egeria-configure
63+
# egeria-configure needs to install utilities
64+
- name: Set up QEMU
65+
uses: docker/setup-qemu-action@v3
66+
- name: Set Release version env variable
67+
run: |
68+
echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
69+
# Publish container images(egeria) to quay.io and docker.io
70+
- name: Copy the distribution content to be used in docker copy command
71+
run: |
72+
cp -f release.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
73+
cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data
74+
- name: Build and push(egeria) to quay.io and docker.io
75+
uses: docker/build-push-action@v5
76+
with:
77+
push: true
78+
tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:stable, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:stable
79+
context: ./open-metadata-deployment/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
80+
platforms: linux/amd64,linux/arm64
81+
# Publish container images(egeria-configure) to quay.io and docker.io
82+
- name: Build and push(egeria-configure) to quay.io and docker.io
83+
uses: docker/build-push-action@v5
84+
with:
85+
push: true
86+
tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:stable, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:stable
87+
context: ./open-metadata-resources/open-metadata-deployment/docker/configure
88+
platforms: linux/amd64,linux/arm64
89+
# Mostly for verification - not published to the release itself for now
90+
- name: Upload assemblies
91+
uses: actions/[email protected]
92+
with:
93+
name: Assemblies
94+
path: open-metadata-distribution/omag-server-platform/build/distributions/*.gz

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ plugins {
2929
*/
3030
allprojects {
3131
group = 'org.odpi.egeria'
32-
version = '4.4-SNAPSHOT'
32+
version = '5.1-SNAPSHOT'
3333

3434
// Signing/publish used in parent & child projects
3535
apply plugin: 'maven-publish'

‎developer-resources/License-Example-Files/License_for_POM_Files.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<artifactId>egeria</artifactId>
1212
<groupId>org.odpi.egeria</groupId>
13-
<version>4.4-SNAPSHOT</version>
13+
<version>5.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<name>Add module name here</name>

‎open-metadata-conformance-suite/docs/platform-workbench/test-cases/platform-origin-test-case.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ open metadata services are activated.
3737
"successfulAssertions" : [ "Origin descriptor retrieved from platform." ],
3838
"unsuccessfulAssertions" : [ ],
3939
"discoveredProperties" : {
40-
"Repository origin id" : "Egeria OMAG Server Platform (version 4.4-SNAPSHOT)"
40+
"Repository origin id" : "Egeria OMAG Server Platform (version 5.1-SNAPSHOT)"
4141
}
4242
}
4343
```

‎open-metadata-distribution/omag-server-platform/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,13 @@ distributions {
135135
}
136136
fileMode = 0755
137137
}
138+
into('assembly') {
139+
from(rootProject.projectDir) {
140+
include 'NOTICE'
141+
include 'LICENSE'
142+
}
143+
fileMode = 0755
144+
}
138145
into('assembly') {
139146
// Describe the deployment layout
140147
from { "$rootProject.projectDir/open-metadata-distribution/omag-server-platform/docs/assembly" }

‎open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ following:
4343

4444
```
4545
<properties>
46-
<open-metadata.version>4.4-SNAPSHOT</open-metadata.version>
46+
<open-metadata.version>5.1-SNAPSHOT</open-metadata.version>
4747
</properties>
4848
<dependencies>
4949
<dependency>

0 commit comments

Comments
 (0)