From 379f6ae14891014dc8afb38752e0552bb07168f1 Mon Sep 17 00:00:00 2001 From: Nikita Smirnov <46124551+Nikita-Smirnov-Exactpro@users.noreply.github.com> Date: Wed, 6 Mar 2024 19:13:22 +0400 Subject: [PATCH] [Th2-5165] Cradle API uses page day cache (#98) * Updated github workflow --- .github/workflows/build-dev-release.yml | 14 +++++++++ .github/workflows/build-release.yml | 14 +++++++++ .github/workflows/build-sanpshot.yml | 19 ++++++++++++ .../dev-java-publish-sonatype-and-docker.yml | 30 ------------------- ...lease-java-publish-sonatype-and-docker.yml | 22 -------------- .../java-publish-sonatype-and-docker.yml | 24 --------------- README.md | 7 ++++- build.gradle | 10 +++---- gradle.properties | 4 +-- 9 files changed, 60 insertions(+), 84 deletions(-) create mode 100644 .github/workflows/build-dev-release.yml create mode 100644 .github/workflows/build-release.yml create mode 100644 .github/workflows/build-sanpshot.yml delete mode 100644 .github/workflows/dev-java-publish-sonatype-and-docker.yml delete mode 100644 .github/workflows/dev-release-java-publish-sonatype-and-docker.yml delete mode 100644 .github/workflows/java-publish-sonatype-and-docker.yml diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml new file mode 100644 index 0000000..59d4309 --- /dev/null +++ b/.github/workflows/build-dev-release.yml @@ -0,0 +1,14 @@ +name: Build and publish dev release Docker image to Github Container Registry ghcr.io + +on: workflow_dispatch + +jobs: + build: + uses: th2-net/.github/.github/workflows/compound-java.yml@main + with: + build-target: 'Docker' + devRelease: true + createTag: true + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 0000000..8f35742 --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,14 @@ +name: Build and publish release Docker image to Github Container Registry ghcr.io + +on: workflow_dispatch + +jobs: + build: + uses: th2-net/.github/.github/workflows/compound-java.yml@main + with: + build-target: 'Docker' + devRelease: false + createTag: true + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/build-sanpshot.yml b/.github/workflows/build-sanpshot.yml new file mode 100644 index 0000000..1618698 --- /dev/null +++ b/.github/workflows/build-sanpshot.yml @@ -0,0 +1,19 @@ +name: Build and publish Docker image to Github Container Registry ghcr.io + +on: + push: + branches-ignore: + - master + - version-* + - dependabot** + paths-ignore: + - README.md + +jobs: + build-job: + uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main + with: + build-target: 'Docker' + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/dev-java-publish-sonatype-and-docker.yml b/.github/workflows/dev-java-publish-sonatype-and-docker.yml deleted file mode 100644 index a9816d9..0000000 --- a/.github/workflows/dev-java-publish-sonatype-and-docker.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Dev build and publish Java distributions to sonatype snapshot repository - -on: - push: - branches-ignore: - - master - - version-* - - dependabot* - paths-ignore: - - README.md - # paths: - # - gradle.properties - -jobs: - build-job: - uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main - with: - build-target: 'Sonatype,Docker' - runsOn: ubuntu-latest - gradleVersion: '7' - docker-username: ${{ github.actor }} - secrets: - sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} - sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} - docker-password: ${{ secrets.GITHUB_TOKEN }} - - - diff --git a/.github/workflows/dev-release-java-publish-sonatype-and-docker.yml b/.github/workflows/dev-release-java-publish-sonatype-and-docker.yml deleted file mode 100644 index 9947758..0000000 --- a/.github/workflows/dev-release-java-publish-sonatype-and-docker.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Build and release Java distributions to sonatype. - -on: - push: - tags: - - \d+.\d+.\d+-dev - -jobs: - build: - uses: th2-net/.github/.github/workflows/compound-java.yml@main - with: - build-target: 'Sonatype,Docker' - runsOn: ubuntu-latest - gradleVersion: '7' - docker-username: ${{ github.actor }} - devRelease: true - secrets: - sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} - sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} - docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/java-publish-sonatype-and-docker.yml b/.github/workflows/java-publish-sonatype-and-docker.yml deleted file mode 100644 index 630b559..0000000 --- a/.github/workflows/java-publish-sonatype-and-docker.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build and release Java distributions to sonatype. - -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties - -jobs: - build: - uses: th2-net/.github/.github/workflows/compound-java.yml@main - with: - build-target: 'Sonatype,Docker' - runsOn: ubuntu-latest - gradleVersion: '7' - docker-username: ${{ github.actor }} - secrets: - sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} - sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} - docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 0878fa6..f3df952 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Overview (5.3.0) +# Overview (5.4.0) Event store (estore) is an important th2 component responsible for storing events into Cradle. Please refer to [Cradle repository] (https://github.com/th2-net/cradleapi/blob/master/README.md) for more details. This component has a pin for listening events via MQ. @@ -73,6 +73,11 @@ Please see more details about this feature via [link](https://github.com/th2-net # Changes +## 5.4.0 + +* Updated cradle api: `5.2.0-dev` +* Updated common: `5.8.0-dev` + ## 5.3.0 * Estore persists event with aggregated statistics about internal errors into cradle periodically diff --git a/build.gradle b/build.gradle index f724e83..000d0b8 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ plugins { } ext { - cradleVersion = '5.1.4-dev' + cradleVersion = '5.2.0-dev' } group = 'com.exactpro.th2' @@ -162,7 +162,7 @@ signing { dependencies { api platform('com.exactpro.th2:bom:4.5.0') - implementation 'com.exactpro.th2:common:5.6.0-dev' + implementation 'com.exactpro.th2:common:5.8.0-dev' implementation("com.exactpro.th2:common-utils:2.2.2-dev") { because("executor service utils is used") } @@ -179,12 +179,12 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation('com.fasterxml.jackson.datatype:jackson-datatype-jsr310') { - because("Error collector serialise Intant values") + because("Error collector serialise Instant values") } testImplementation 'org.apache.commons:commons-lang3' - testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0' - testImplementation 'org.mockito:mockito-junit-jupiter:5.4.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' + testImplementation 'org.mockito:mockito-junit-jupiter:5.10.0' } test { diff --git a/gradle.properties b/gradle.properties index 194ab6e..e39e19b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -release_version=5.3.0 +release_version=5.4.0 description='th2 estore component' -vcs_url=https://github.com/th2-net/th2-estore \ No newline at end of file +vcs_url=https://github.com/th2-net/th2-estore