Skip to content

Commit 339cd9e

Browse files
build: update plugins and repos (#14)
* build: update plugins and repos * chore: fix vulns
1 parent 53095b8 commit 339cd9e

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

.github/workflows/pr-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1515
- name: Check out code
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
ref: ${{github.event.pull_request.head.ref}}
1919
repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -24,7 +24,9 @@ jobs:
2424
with:
2525
args: build
2626
dependency-check:
27-
runs-on: ubuntu-22.04
27+
runs-on: ubuntu-24.04
2828
steps:
2929
- name: Dependency Check
30-
uses: hypertrace/github-actions/dependency-check@main
30+
uses: hypertrace/github-actions/dependency-check@main
31+
with:
32+
nvd-api-key: ${{ secrets.NVD_API_KEY }}

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88

99
jobs:
1010
publish-artifacts:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1414
- name: Check out code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818

@@ -21,6 +21,6 @@ jobs:
2121
with:
2222
args: publish
2323
env:
24-
ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }}
25-
ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }}
26-
ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }}
24+
ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }}
25+
ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }}
26+
ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }}

build.gradle.kts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import org.hypertrace.gradle.publishing.License.APACHE_2_0
22

33
plugins {
44
`java-gradle-plugin`
5-
id("org.hypertrace.repository-plugin") version "0.4.0"
6-
id("org.hypertrace.ci-utils-plugin") version "0.3.0"
7-
id("org.hypertrace.publish-plugin") version "1.0.4"
8-
id("org.owasp.dependencycheck") version "8.4.0"
5+
id("org.hypertrace.repository-plugin") version "0.5.0"
6+
id("org.hypertrace.ci-utils-plugin") version "0.4.0"
7+
id("org.hypertrace.publish-plugin") version "1.1.1"
8+
id("org.owasp.dependencycheck") version "12.1.0"
99
}
1010

1111
group = "org.hypertrace.gradle.code.style"
@@ -16,11 +16,9 @@ java {
1616
}
1717

1818
dependencies {
19-
api("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
19+
api("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
2020
constraints {
21-
implementation("com.squareup.okio:okio:3.4.0")
22-
implementation("org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r")
23-
implementation("org.eclipse.platform:org.eclipse.osgi:3.18.500")
21+
implementation("org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r")
2422
}
2523
}
2624

owasp-suppressions.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3-
<suppress>
4-
<packageUrl regex="true">^pkg:maven/org\.eclipse\.platform/org\.eclipse\.osgi@.*$</packageUrl>
5-
<cpe>cpe:/a:eclipse:equinox</cpe>
6-
</suppress>
3+
<suppress>
4+
<packageUrl regex="true">^pkg:maven/org\.eclipse\.platform/org\.eclipse\.osgi@.*$</packageUrl>
5+
<cpe>cpe:/a:eclipse:equinox</cpe>
6+
<cpe>cpe:/a:eclipse:platform</cpe>
7+
</suppress>
78
</suppressions>

settings.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ pluginManagement {
22
repositories {
33
mavenLocal()
44
gradlePluginPortal()
5-
maven {
6-
url = uri("https://hypertrace.jfrog.io/artifactory/maven")
7-
}
5+
maven("https://us-maven.pkg.dev/hypertrace-repos/maven")
86
}
97
}
108

119
plugins {
12-
id("org.hypertrace.version-settings") version "0.2.0"
10+
id("org.hypertrace.version-settings") version "0.3.0"
1311
}
1412

1513
rootProject.name = "hypertrace-gradle-code-style-plugin"

0 commit comments

Comments
 (0)