Skip to content

fix(deps): bump io.javaoperatorsdk:operator-framework from 4.9.1 to 4.9.2 #520

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

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
108 changes: 108 additions & 0 deletions .github/trivy/license-policy.rego
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
package trivy
import data.lib.trivy

default ignore := false

# permissive licenses from export of backend definition in Fossa,
# see policy-backend-fossa for reference
default permissive := {
"0BSD",
"AFL-3.0", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"android-sdk",
"Apache-1.1", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"Apache-2.0", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"Artistic-1.0", # Safe if code isn’t modified and notice requirements are followed. Otherwise, you must state and disclose the source code of modifications/derivative works.
"BouncyCastle",
"BSD-1-Clause", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"BSD-2-Clause", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"BSD-3-Clause", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"BSD-3-Clause-No-Nuclear-Warranty",
"BSD-4-Clause", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"CC-BY-2.5",
"CC-BY-3.0",
"CC0-1.0",
"CDDL-1.0", # Safe if code isn’t modified and notice requirements are followed. Otherwise, you must state and disclose the source code of modifications/derivative works.
"CDDL-1.1",
"CPL-1.0",
"EPL-1.0",
"EPL-2.0",
"GPL-2.0-with-classpath-exception", # Safe to include or link in an executable provided that source availability/attribution requirements are followed.
"ICU",
"ISC", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"JSON",
"LGPL-2.0-only", # Requires you to (effectively) disclose your source code if the library is statically linked to your project. Not triggered if dynamically linked or a separate process.
"LGPL-2.0-or-later", # Requires you to (effectively) disclose your source code if the library is statically linked to your project. Not triggered if dynamically linked or a separate process.
"LGPL-2.1-only", # Requires you to (effectively) disclose your source code if the library is statically linked to your project. Not triggered if dynamically linked or a separate process.
"LGPL-2.1-or-later", # Requires you to (effectively) disclose your source code if the library is statically linked to your project. Not triggered if dynamically linked or a separate process.
"LGPL-3.0-only", # Requires you to (effectively) disclose your source code ifthe library is statically linked to your project. Not triggered if dynamically linked or a separate process.
"LGPL-3.0-or-later", # Requires you to (effectively) disclose your source code ifthe library is statically linked to your project. Not triggered if dynamically linked or a separate process.
"MIT", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"MPL-1.1", # Safe if code isn’t modified and notice requirements are followed. Otherwise, you must state and disclose the source code of modifications/derivative works.
"MPL-2.0", # Safe if code isn’t modified and notice requirements are followed. Otherwise, you must state and disclose thesource code of modifications/derivative works.
"OpenSSL",
"public-domain",
"SAX-PD",
"Unlicense",
"W3C", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"WTFPL", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
"X11",
"Zlib", # Permissive license which is perfectly safe to use provided proper attribution is given and retained.
}

# mapping of licenses identified by cyclonedx to known license keys
default licenseMapping := {
"Bouncy Castle Licence": "BouncyCastle",
"Apache 2 License": "Apache-2.0",
"GNU General Public License, version 2 with the GNU Classpath Exception": "GPL-2.0-with-classpath-exception",
"Eclipse Public License (EPL) 2.0": "EPL-2.0",
}

# default: allow everything defined in the list of permissive licenses
ignore {
input.Name == permissive[_]
}

# allow licenses that are only named different due to the used tooling
ignore {
licenseMapping[input.Name] == permissive[_]
}

# ch.qos.logback:logback-classic is dual licensed as LGPL 2.1 or Eclipse Public License v1.0
# see https://github.com/qos-ch/logback/blob/master/LICENSE.txt
# cyclonedx identifies GNU Lesser General Public License
ignore {
input.PkgName == "ch.qos.logback:logback-classic"
input.Name == "GNU Lesser General Public License"
}

# ch.qos.logback:logback-core is dual licensed as LGPL 2.1 or Eclipse Public License v1.0
# see https://github.com/qos-ch/logback/blob/master/LICENSE.txt
# cyclonedx identifies GNU Lesser General Public License
ignore {
input.PkgName == "ch.qos.logback:logback-core"
input.Name == "GNU Lesser General Public License"
}

# ch.qos.logback.contrib:logback-jackson is dual licensed as LGPL 2.1 or Eclipse Public License v1.0
# see https://github.com/qos-ch/logback-contrib/blob/master/license-template.txt
# cyclonedx identifies GNU Lesser General Public License
ignore {
input.PkgName == "ch.qos.logback.contrib:logback-jackson"
input.Name == "GNU Lesser General Public License"
}

# ch.qos.logback.contrib:logback-json-classic is dual licensed as LGPL 2.1 or Eclipse Public License v1.0
# see https://github.com/qos-ch/logback-contrib/blob/master/license-template.txt
# cyclonedx identifies GNU Lesser General Public License
ignore {
input.PkgName == "ch.qos.logback.contrib:logback-json-classic"
input.Name == "GNU Lesser General Public License"
}

# ch.qos.logback.contrib:logback-json-core is dual licensed as LGPL 2.1 or Eclipse Public License v1.0
# see https://github.com/qos-ch/logback-contrib/blob/master/license-template.txt
# cyclonedx identifies GNU Lesser General Public License
ignore {
input.PkgName == "ch.qos.logback.contrib:logback-json-core"
input.Name == "GNU Lesser General Public License"
}
87 changes: 0 additions & 87 deletions .github/workflows/fossa.yml

This file was deleted.

72 changes: 72 additions & 0 deletions .github/workflows/license-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: License Check

# This check can be executed locally as follows:
#
# Install Trivy, see https://aquasecurity.github.io/trivy/v0.18.3/installation/
# $ brew install aquasecurity/trivy/trivy
#
# Lock dependencies
# $ ./gradlew clean cyclonedxBom
#
# Check for licenses
# $ trivy sbom --scanners license --format table --ignore-policy .github/trivy/license-policy.rego build/reports/bom.json

on:
pull_request: {}
release:
types:
- created

jobs:
trivy-license-check:
timeout-minutes: 30
runs-on: ubuntu-latest
steps:

- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Set up JDK 21
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: 'temurin'
java-version: 21
cache: 'gradle'

- name: Create SBOM
run: ./gradlew clean cyclonedxBom

- name: Attach SBOM to Release
if: github.event.release
env:
GITHUB_TOKEN: ${{ github.token }}
run: |
gh release upload "${{ github.event.release.tag_name }}" "./build/reports/bom.json#CycloneDX generated JSON SBOM"
gh release upload "${{ github.event.release.tag_name }}" "./build/reports/bom.xml#CycloneDX generated XML SBOM"

- name: Check for forbidden licenses
if: github.event.pull_request
run: >
docker run --rm
-v "${PWD}:/project"
aquasec/trivy:0.51.1
sbom --scanners license
--format json
--ignore-policy /project/.github/trivy/license-policy.rego
--exit-code 1
/project/build/reports/bom.json
>> trivy-licenses.json
- name: Add failure Job summary
if: failure() && github.event.pull_request
run: |
echo "| Dependency | License | Category | Severity |" > trivy-licenses.md
echo "|------------|---------|----------|----------|" >> trivy-licenses.md
cat trivy-licenses.json | jq --raw-output '.Results[] | select(.Licenses) | .Licenses[] | "| \(.PkgName) | \(.Name) | \(.Category) | \(.Severity) |"' >> trivy-licenses.md
echo '**License violations or unknown licenses found in dependencies:**' >> $GITHUB_STEP_SUMMARY
echo '' >> $GITHUB_STEP_SUMMARY
cat trivy-licenses.md >> $GITHUB_STEP_SUMMARY

- name: Add success Job summary
if: success() && github.event.pull_request
run: |
echo 'All dependencies have allowed licenses.' >> $GITHUB_STEP_SUMMARY
10 changes: 0 additions & 10 deletions .github/workflows/workflow-trigger.yml

This file was deleted.

11 changes: 6 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
id 'org.sonarqube' version '5.1.0.4882'
id "com.diffplug.spotless" version "6.25.0"
id "com.google.cloud.tools.jib" version "3.4.3"
id 'org.cyclonedx.bom' version '1.9.0'
}

repositories {
Expand Down Expand Up @@ -46,8 +47,8 @@ jib {
project.ext {
mongoDbDriverVersion = "5.1.2"
slf4jVersion = "2.0.13"
operatorFrameworkVersion = "4.9.1"
kubernetesServerMockVersion = "6.12.1" // align with transitive dependency of operator framework
operatorFrameworkVersion = "4.9.2"
kubernetesServerMockVersion = "6.13.1" // align with transitive dependency of operator framework
mockitoVersion = "5.2.0"
jacksonVersion = "2.17.2"
logbackContribVersion = "0.1.5"
Expand Down Expand Up @@ -77,9 +78,9 @@ dependencies {
implementation "org.mongodb:mongodb-driver-sync:${mongoDbDriverVersion}"

implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
implementation 'jakarta.el:jakarta.el-api:6.0.0'
implementation 'jakarta.el:jakarta.el-api:6.0.1'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
implementation "io.javalin:javalin:6.1.6", {
implementation "io.javalin:javalin:6.2.0", {
// self managed to avoid conflicts
exclude group: "org.slf4j"
// conflict with Kotlin version in Okio 3.9.0
Expand Down Expand Up @@ -112,7 +113,7 @@ dependencies {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
}
// try to replace local commons-compress management on update!
testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo:4.16.0', {
testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo:4.16.1', {
exclude group: "org.slf4j", module: "slf4j-api"
// CVE-2024-25710 + CVE-2024-26308 in transitive version 1.25.0
exclude group: "org.apache.commons", module: "commons-compress"
Expand Down
Loading