Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/2.0.1 CVE 2024 21634 #276

Merged
merged 3 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Actions on pull requests
on:
pull_request:
branches:
- develop
- master

jobs:
pull-request-job:
runs-on: ubuntu-latest
steps:
- name: Step 1 - Checkout repository code
uses: actions/checkout@v4

- name: Step 2 - Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'

- name: Step 3 - Cache Docker images.
uses: ScribeMD/[email protected]
with:
key: docker-${{ runner.os }}

- name: Step 4 - Build & Test
run: mvn clean verify -ntp

- name: Step 5 - Upload coverage unittests reports to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
gcov_ignore: '!*datasafe-business*'
flags: unittests
verbose: true

- name: Step 6 - Upload coverage e2e tests reports to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
gcov_include: '*datasafe-business*'
flags: e2e_tests
verbose: true
22 changes: 0 additions & 22 deletions .github/workflows/pull-requests.yml

This file was deleted.

53 changes: 53 additions & 0 deletions .github/workflows/push-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Develop branch build
on:
push:
branches:
- develop

jobs:
develop-build-job:
runs-on: ubuntu-latest
steps:
- name: Step 1 - Checkout repository code
uses: actions/checkout@v4

- name: Step 2 - Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'

- name: Step 3 - Cache Docker images.
uses: ScribeMD/[email protected]
with:
key: docker-${{ runner.os }}

- name: Step 4 - Build & Test
run: mvn clean verify -ntp

- name: Step 5 - Deploy Snapshot
run: ./scripts/mvn_deploy.sh
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
GPG_EXECUTABLE: gpg
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}

- name: Step 6 - Upload coverage unittests reports to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
gcov_ignore: '!*datasafe-business*'
flags: unittests
verbose: true

- name: Step 7 - Upload coverage e2e tests reports to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
gcov_include: '*datasafe-business*'
flags: e2e_tests
verbose: true
37 changes: 37 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Release to Maven Central
on:
push:
tags:
- v*

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Step 1 - Checkout repository code
uses: actions/checkout@v4

- name: Step 2 - Setup JDK
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'

- name: Step 3 - Cache Docker images.
uses: ScribeMD/[email protected]
with:
key: docker-${{ runner.os }}

- name: Step 4 - Maven deploy release
run: ./scripts/mvn_deploy.sh
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
GPG_EXECUTABLE: gpg
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}

# - name: Step 4 - Push JavaDoc to GitHub Pages
# run: ./scripts/push-javadoc-to-gh-pages.sh
11 changes: 0 additions & 11 deletions .travis/codecov_bash.sh

This file was deleted.

8 changes: 0 additions & 8 deletions .travis/deploy.sh

This file was deleted.

2 changes: 1 addition & 1 deletion datasafe-business/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>

<artifactId>datasafe-cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-directory/datasafe-directory-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-directory</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-directory-api</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-directory/datasafe-directory-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-directory</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-directory-impl</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-directory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-encryption/datasafe-encryption-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-encryption</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-encryption-api</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-encryption/datasafe-encryption-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-encryption</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-encryption-impl</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-encryption/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-examples/datasafe-examples-business/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-examples</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-examples-business</artifactId>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-examples</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-examples-customize-dagger</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-examples/datasafe-examples-multidfs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-examples</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-examples-multidfs</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-examples/datasafe-examples-versioned-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-examples</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-examples-versioned-s3</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-inbox/datasafe-inbox-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-inbox</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-inbox-api</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-inbox/datasafe-inbox-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-inbox</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-inbox-impl</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-inbox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe-long-run-tests</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-long-run-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-metainfo/datasafe-metainfo-version-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-metainfo</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-metainfo-version-api</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.adorsys</groupId>
<artifactId>datasafe-metainfo</artifactId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>datasafe-metainfo-version-impl</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datasafe-metainfo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-privatestore/datasafe-privatestore-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe-privatestore</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-privatestore/datasafe-privatestore-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe-privatestore</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion datasafe-privatestore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datasafe</artifactId>
<groupId>de.adorsys</groupId>
<version>2.0.2</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading