Skip to content

Commit

Permalink
chore: Update build (#413)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylong authored Oct 21, 2024
1 parent fd54350 commit 842f817
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 64 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
id: jdk-8
uses: actions/setup-java@v1
- name: Set up JDK 11
id: jdk-11
uses: actions/setup-java@v4
with:
java-version: 1.8
java-version: 11
distribution: 'zulu'
- name: Build
id: build
run: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
id: jdk-8
uses: actions/setup-java@v1
- name: Set up JDK 11
id: jdk-11
uses: actions/setup-java@v4
with:
java-version: 1.8
java-version: 11
distribution: 'zulu'
- name: Build
id: build
run: |
Expand Down
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11.0
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
The dependency-check gradle plugin allows projects to monitor dependent libraries for
known, published vulnerabilities.

## 11.0.0 Upgrade Notice
- The dependency-check-gradle plugin now requires Java 11 or higher.
- The dependency-check-gradle plugin will no longer be published to Maven Central; it
will continue to be published to the Gradle plugin portal.

## 9.0.0 Upgrade Notice

**Breaking Changes** are included in the 9.0.0 release. Please see the [9.0.0 Upgrade Notice](https://github.com/jeremylong/DependencyCheck#900-upgrade-notice)
Expand Down
48 changes: 2 additions & 46 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ test {
test.onlyIf { !project.hasProperty('skipTests') }

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

javadoc {
Expand All @@ -64,37 +64,6 @@ javadoc {

publishing {
publications {
maven(MavenPublication) {
groupId = project.group
artifactId = 'dependency-check-gradle'
version = project.version
from components.java
pom {
name = 'dependency-check-gradle'
description = 'OWASP dependency-check gradle plugin is a software composition analysis tool used to find known vulnerable dependencies.'

url = 'https://jeremylong.github.io/DependencyCheck/'

licenses {
license {
name = 'The Apache License, Version 2.0'
url = 'https://github.com/dependency-check/dependency-check-gradle/blob/main/LICENSE.txt'
}
}
developers {
developer {
id = 'jlong'
name = 'Jeremy Long'
email = '[email protected]'
}
}
scm {
url = 'https://github.com/dependency-check/dependency-check-gradle'
connection = 'scm:git:https://github.com/dependency-check/dependency-check-gradle.git'
developerConnection = 'scm:git:https://github.com/dependency-check/dependency-check-gradle.git'
}
}
}
pluginPublication(MavenPublication) {
groupId = project.group
artifactId = 'dependency-check-gradle'
Expand Down Expand Up @@ -127,21 +96,8 @@ publishing {
}
}
}
repositories {
maven {
url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
credentials {
username project.findProperty('sonatypeUsername') ?: System.getenv("SONATYPE_USER")
password project.findProperty('sonatypePassword') ?: System.getenv("SONATYPE_PASSWORD")
}
}
}
}

//signing {
// sign publishing.publications.pluginPublication
//}

gradlePlugin {
website = 'http://jeremylong.github.io/DependencyCheck/dependency-check-gradle/index.html'
vcsUrl = 'https://github.com/dependency-check/dependency-check-gradle/'
Expand Down
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ spock = '2.3-groovy-3.0'
junit = '5.10.3'

[libraries]
owasp-dependencyCheck-core = { module = "org.owasp:dependency-check-core", version.ref = "odc" }
owasp-dependencyCheck-utils = { module = "org.owasp:dependency-check-utils", version.ref = "odc" }
openVuln-clients = { module = "io.github.jeremylong:open-vulnerability-clients", version = "6.1.7" }
slack-webhook = { module = "net.gpedro.integrations.slack:slack-webhook", version = "1.4.0" }
owasp-dependencyCheck-core = { module = 'org.owasp:dependency-check-core', version.ref = 'odc' }
owasp-dependencyCheck-utils = { module = 'org.owasp:dependency-check-utils', version.ref = 'odc' }
openVuln-clients = { module = 'io.github.jeremylong:open-vulnerability-clients', version = '6.1.7' }
slack-webhook = { module = 'net.gpedro.integrations.slack:slack-webhook', version = '1.4.0' }

junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api', version.ref = "junit" }
junit-jupiter-params = { module = 'org.junit.jupiter:junit-jupiter-params', version.ref = "junit" }
junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine', version.ref = "junit" }
junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api', version.ref = 'junit' }
junit-jupiter-params = { module = 'org.junit.jupiter:junit-jupiter-params', version.ref = 'junit' }
junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine', version.ref = 'junit' }

spock-core = { module = 'org.spockframework:spock-core', version.ref = "spock" }
spock-core = { module = 'org.spockframework:spock-core', version.ref = 'spock' }

[bundles]

[plugins]
gradle-plugin-publish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
gradle-plugin-publish = { id = 'com.gradle.plugin-publish', version = '1.3.0' }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 842f817

Please sign in to comment.