Skip to content

oldmain2 #9

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

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
204e573
fix commons text
marc-adaptive Jul 15, 2024
fe290bd
fix other vulnerabilities
marc-adaptive Jul 15, 2024
006edd2
fix other vulnerabilities
marc-adaptive Jul 15, 2024
d8d6b0f
fix other vulnerabilities
marc-adaptive Jul 15, 2024
c95b5ba
add jackson vulnerabilites
marc-adaptive Jul 15, 2024
08b22c2
add jackson vulnerabilites
marc-adaptive Jul 15, 2024
308a6bc
add commons vulnerabilites
marc-adaptive Jul 15, 2024
5d5505e
add commons vulnerabilites
marc-adaptive Jul 15, 2024
48d167d
add commons vulnerabilites
marc-adaptive Jul 15, 2024
0e90ad7
add commons vulnerabilites
marc-adaptive Jul 15, 2024
4ad501c
add commons vulnerabilites
marc-adaptive Jul 15, 2024
2c695ac
add commons vulnerabilites
marc-adaptive Jul 15, 2024
157f664
add commons vulnerabilites
marc-adaptive Jul 15, 2024
322d2ee
add commons vulnerabilites
marc-adaptive Jul 15, 2024
f38e6b2
add commons vulnerabilites
marc-adaptive Jul 15, 2024
65d885f
add commons vulnerabilites
marc-adaptive Jul 15, 2024
d294501
hacked
Jul 15, 2024
934b6f7
add commons vulnerabilites
marc-adaptive Jul 15, 2024
33276e8
add proper workflows
marc-adaptive Jul 21, 2024
c0549fb
Merge remote-tracking branch 'origin/main'
marc-adaptive Jul 21, 2024
0446bdc
Merge branch 'refs/heads/branch'
marc-adaptive Jul 21, 2024
6b1e564
add proper workflows
marc-adaptive Jul 21, 2024
f332e05
review
marc-adaptive Jul 21, 2024
bf11d4b
Merge pull request #5 from marc-adaptive/branch2
marc-adaptive Jul 21, 2024
3957c88
add proper workflows
marc-adaptive Jul 21, 2024
8f779ba
add proper workflows
marc-adaptive Jul 21, 2024
b9469f8
advance
marc-adaptive Jul 21, 2024
11ab653
advance2
marc-adaptive Jul 21, 2024
9a021fc
advance2
marc-adaptive Jul 21, 2024
12fa697
oldmain2
marc-adaptive Jul 21, 2024
d02afe7
test1
marc-adaptive Jul 21, 2024
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
21 changes: 21 additions & 0 deletions .github/workflows/dependency-review-generate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Dependency Review (generate)

on:
pull_request:

permissions:
contents: read # 'write' permission is not available

jobs:
dependency-submission:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 8
- name: Generate and save dependency graph
uses: gradle/actions/dependency-submission@v3
with:
dependency-graph: generate-and-upload
19 changes: 19 additions & 0 deletions .github/workflows/dependency-review-upload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Dependency Review (upload)

on:
workflow_run:
workflows: ['Dependency Review (generate)']
types: [completed]

permissions:
actions: read
contents: write

jobs:
submit-dependency-graph:
runs-on: ubuntu-latest
steps:
- name: Download and submit dependency graph
uses: gradle/actions/dependency-submission@v3
with:
dependency-graph: download-and-submit
32 changes: 7 additions & 25 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,17 @@
# Submits a dependency graph and performs dependency review on every pull request
name: Dependency review for pull requests
name: Dependency Review (review)

on:
pull_request:

permissions:
contents: write
contents: read

jobs:
dependency-submission:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Set up the JDK used to run Gradle
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

- name: Generate and submit dependency graph for the PR
uses: gradle/actions/dependency-submission@v3
with:
build-scan-publish: true
build-scan-terms-of-service-url: "https://gradle.com/terms-of-service"
build-scan-terms-of-service-agree: "yes"

dependency-review:
needs: dependency-submission
runs-on: ubuntu-latest
steps:
- name: Perform dependency review
uses: actions/dependency-review-action@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
with:
retry-on-snapshot-warnings: true
retry-on-snapshot-warnings-timeout: 600
6 changes: 2 additions & 4 deletions .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Set up the JDK used to run Gradle
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

distribution: 'zulu'
java-version: '8'
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v3
with:
Expand Down
12 changes: 12 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// Constrain 'com.squareup.okio:okio' to avoid https://github.com/advisories/GHSA-w33c-445m-f8w7
buildscript {
repositories {
gradlePluginPortal()
}
dependencies {
constraints {
classpath(libs.okio)
}
}
}

plugins {
alias(libs.plugins.versions)
}
1 change: 1 addition & 0 deletions file.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hi
6 changes: 5 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format

[libraries]
commons-compress = { module = "org.apache.commons:commons-compress", version = "1.26.1" }
commons-text = { module = "org.apache.commons:commons-text", version = "1.9" }
minio = { module = "io.minio:minio", version = "8.5.8" }
minio = { module = "io.minio:minio", version = "8.5.11" }
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.10.2" }
okio = { module = "com.squareup.okio:okio", version = "3.4.0" }
jackson = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.9.9" }
spring = { module = "org.springframework.boot:spring-boot-starter-web", version = "2.5.11" }

[plugins]
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
8 changes: 8 additions & 0 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

plugins {
`java-library`
}
Expand All @@ -9,6 +10,13 @@ repositories {
dependencies {
implementation(libs.commons.text)
implementation(libs.minio)
implementation(libs.jackson)
implementation(libs.spring)

constraints {
// Force a newer version of commons-compress in transitive resolution
implementation(libs.commons.compress)
}

testImplementation(libs.junit.jupiter)
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
Expand Down
Loading