Skip to content

Commit

Permalink
merge to master (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
lumber1000 authored Aug 20, 2024
1 parent 07d3a28 commit 80cbbee
Show file tree
Hide file tree
Showing 32 changed files with 1,191 additions and 380 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/build-dev-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Build and publish dev release Docker image to Github Container Registry ghcr.io and publish dev release jar to sonatype

on: workflow_dispatch

jobs:
build:
uses: th2-net/.github/.github/workflows/compound-java.yml@main
with:
build-target: 'Sonatype,Docker'
devRelease: true
createTag: true
docker-username: ${{ github.actor }}
secrets:
docker-password: ${{ secrets.GITHUB_TOKEN }}
sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
nvd-api-key: ${{ secrets.NVD_APIKEY }}
19 changes: 19 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Build and publish release Docker image to Github Container Registry ghcr.io and publish release jar to sonatype

on: workflow_dispatch

jobs:
build:
uses: th2-net/.github/.github/workflows/compound-java.yml@main
with:
build-target: 'Sonatype,Docker'
devRelease: false
createTag: true
docker-username: ${{ github.actor }}
secrets:
docker-password: ${{ secrets.GITHUB_TOKEN }}
sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
nvd-api-key: ${{ secrets.NVD_APIKEY }}
24 changes: 24 additions & 0 deletions .github/workflows/build-sanpshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Build and publish Docker image to Github Container Registry ghcr.io and publish snapshot jar to sonatype

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: 'Sonatype,Docker'
docker-username: ${{ github.actor }}
secrets:
docker-password: ${{ secrets.GITHUB_TOKEN }}
sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
nvd-api-key: ${{ secrets.NVD_APIKEY }}
30 changes: 15 additions & 15 deletions .github/workflows/ci-unwelcome-words.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.sha }}
- name: Checkout tool
uses: actions/checkout@v2
with:
repository: exactpro-th2/ci-github-action
ref: master
token: ${{ secrets.PAT_CI_ACTION }}
path: ci-github-action
- name: Run CI action
uses: ./ci-github-action
with:
ref: ${{ github.sha }}
- uses: actions/checkout@v4
with:
ref: ${{ github.sha }}
- name: Checkout tool
uses: actions/checkout@v4
with:
repository: exactpro-th2/ci-github-action
ref: master
token: ${{ secrets.PAT_CI_ACTION }}
path: ci-github-action
- name: Run CI action
uses: ./ci-github-action
with:
ref: ${{ github.sha }}
46 changes: 0 additions & 46 deletions .github/workflows/dev-docker-publish.yml

This file was deleted.

37 changes: 0 additions & 37 deletions .github/workflows/docker-publish.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:6.8.2-jdk11 AS build
FROM gradle:8.7-jdk11 AS build
ARG release_version
COPY ./ .
RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version}
Expand Down
32 changes: 28 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Codec Xml via Xsd
# Codec Xml via Xsd (2.3.0)
![version](https://img.shields.io/badge/version-0.0.4-blue.svg)

# How it works:
Expand Down Expand Up @@ -58,12 +58,13 @@ Error from validation process can be disabled for test purposes by `dirtyValidat

* typePointer - Path to message type value for decode (null by default)
* dirtyValidation - Disable/enable error during validation phase. If disabled all errors will be only visible in log (false by default)
* expectsDeclaration - Disable/enable validation of declaration - is it exist or not (true by default)
* schemas - mapping between schema location value and a dictionary alias that should be used to load this schema

```yaml
typePointer: /root/node/node2/type
dirtyValidation: false
expectsDeclaration: false
schemas:
"test.xsd": "${dictionary_link:dict-xml}"
```
For example:
Expand All @@ -77,7 +78,6 @@ spec:
custom-config:
codecSettings:
typePointer: /root/node/node2/type
dirtyValidation: false
```
## Required pins
Expand Down Expand Up @@ -142,6 +142,30 @@ spec:

## Changelog

### v2.3.0

* Migrated to th2 gradle plugin `0.1.1` (bom: `4.6.1`)
* Updated common: `5.14.0-dev`
* Updated common-utils `2.2.3-dev`
* Updated codec `5.5.0-dev`
* Updated workflows

### v2.2.0

* Migrate to StAX parser

### v2.1.0

* th2 transport protocol support

### v0.0.4

#### Changed:
* th2-common `3.44.0`
* th2-bom `4.1.0`
* kotlin `1.6.21`
* Dependency check pipeline step

### v0.0.4

#### Feature:
Expand Down
Loading

0 comments on commit 80cbbee

Please sign in to comment.