Skip to content

Commit

Permalink
Merge pull request #112 from samply/release/v7.4.3
Browse files Browse the repository at this point in the history
Release/v7.4.3
  • Loading branch information
alexanderkiel authored Dec 16, 2021
2 parents fe4dad4 + 2d04269 commit ff00e45
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 14 deletions.
49 changes: 38 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ name: Build with maven and docker
on:
push:
branches:
- '**'
- master
- develop
tags:
- 'release-*.*.*'
- 'v*.*.*'
pull_request:
branches:
- master
- develop

jobs:
build:
Expand Down Expand Up @@ -55,13 +59,6 @@ jobs:
- name: Build with Maven
run: mvn -B package -P ${{matrix.maven_profile}},ci-override

- name: Extract docker tag
id: extract_docker_tag
shell: bash
# this is needed, because tags GITHUB_REF is inconsistent for pull requests.
if: ${{ github.event_name != 'pull_request' }}
run: echo "##[set-output name=tag;]$(echo ${GITHUB_REF##*/};)"

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

Expand All @@ -74,14 +71,44 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker meta
id: docker-meta
uses: docker/metadata-action@v3
with:
images: |
samply/share-client
tags: |
type=schedule
type=ref,event=branch
type=ref,event=pr,prefix=${{matrix.project}}-pr-
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha,format=long,prefix=${{matrix.project}}-sha-
flavor: |
prefix=${{matrix.project}}-,onlatest=true
- name: Build and push
uses: docker/build-push-action@v2
if: ${{ github.event_name != 'pull_request' }}
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
build-args: |
PROJECT=${{matrix.project_context}}
push: true
tags: ${{ github.repository }}:${{matrix.project}}-${{ steps.extract_docker_tag.outputs.tag }}
tags: ${{ steps.docker-meta.outputs.tags }}
labels: ${{ steps.docker-meta.outputs.labels }}

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
image-ref: samply/share-client:${{matrix.project}}-sha-${{ github.sha }}
format: template
template: '@/contrib/sarif.tpl'
output: trivy-results.sarif

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@codeql-bundle-20211208
with:
sarif_file: trivy-results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: Sonar Analyze
on:
push:
branches:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [7.4.3 - 2021-12-16]
### Security
- log4j version 2.16.0

## [7.4.2 - 2021-12-13]
### Changed
- hapi version 5.6.1
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>share-client</artifactId>
<version>7.4.2</version>
<version>7.4.3</version>
<packaging>war</packaging>

<name>Connector</name>
Expand Down Expand Up @@ -76,7 +76,7 @@
<version.jooq>3.11.11</version.jooq>
<jta.version>1.1</jta.version>
<quartz.version>2.3.2</quartz.version>
<log4j.version>2.15.0</log4j.version>
<log4j.version>2.16.0</log4j.version>
<omnifaces.version>1.14.1</omnifaces.version>
<simple-xml.version>2.7.1</simple-xml.version>

Expand Down

0 comments on commit ff00e45

Please sign in to comment.