Skip to content

Commit

Permalink
Replace DV with Develocity
Browse files Browse the repository at this point in the history
  • Loading branch information
runningcode committed Jan 11, 2024
1 parent a9a1fb4 commit 5c3398a
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
include:
- name: 'DV Gradle plugin version'
- name: 'Develocity Gradle plugin version'
sample-file: 'capture-develocity-plugin-version/gradle-develocity-plugin-version.gradle'
- name: 'Git diffs'
sample-file: 'capture-git-diffs/gradle-git-diffs.gradle'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
include:
- name: 'DV Maven extension version'
- name: 'Develocity Maven extension version'
sample-file: 'capture-develocity-extension-version/maven-develocity-extension-version.groovy'
- name: 'OS processes'
sample-file: 'capture-os-processes/maven-os-processes.groovy'
Expand All @@ -41,7 +41,7 @@ jobs:
distribution: 'temurin'
- name: Provide data capture script to Maven build
run: |
# copy over sample script such that it gets pulled in by the DV extension
# copy over sample script such that it gets pulled in by the Develocity extension
cp build-data-capturing-maven-samples/${{ matrix.sample-file }} common-develocity-maven-configuration/.mvn/develocity-custom-user-data.groovy
- name: Run Maven build
id: mvn-build
Expand Down
2 changes: 1 addition & 1 deletion build-data-capturing-gradle-samples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tags, links, and custom values.
To learn more, see the Develocity documentation
on [Extending build scans](https://docs.gradle.com/enterprise/gradle-plugin/#extending_build_scans).

### Capture DV Plugin Version
### Capture Develocity Plugin Version

_Demonstrates: Custom values_

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ if (!buildScanApi) {

URL url = buildScanApi.class.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt")
String buildAgentVersion = url.text
buildScan.value("DV Gradle plugin version", buildAgentVersion)
buildScan.value("Develocity Gradle plugin version", buildAgentVersion)

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project.extensions.configure<GradleEnterpriseExtension>() {
buildScan {
val url = GradleEnterpriseExtension::class.java.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt")
val buildAgentVersion = url.readText()
value("DV Gradle plugin version", buildAgentVersion)
value("Develocity Gradle plugin version", buildAgentVersion)
}
}

2 changes: 1 addition & 1 deletion build-data-capturing-maven-samples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tags, links, and custom values.
To learn more, see the Develocity documentation
on [Extending build scans](https://docs.gradle.com/enterprise/maven-extension/#extending_build_scans).

### Capture DV Extension Version
### Capture Develocity Extension Version

_Demonstrates: Custom values_

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

URL url = buildScan.class.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt")
String buildAgentVersion = url.text
buildScan.value("DV Maven extension version", buildAgentVersion)
buildScan.value("Develocity Maven extension version", buildAgentVersion)
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
def isCI = System.getenv('CI') != null // adjust to your CI provider

gradleEnterprise {
server = 'https://enterprise-samples.gradle.com' // adjust to your DV server
server = 'https://enterprise-samples.gradle.com' // adjust to your Develocity server
allowUntrustedServer = false // ensure a trusted certificate is configured

buildScan {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
val isCI = !System.getenv("CI").isNullOrEmpty() // adjust to your CI provider

gradleEnterprise {
server = "https://enterprise-samples.gradle.com" // adjust to your DV server
server = "https://enterprise-samples.gradle.com" // adjust to your Develocity server
allowUntrustedServer = false // ensure a trusted certificate is configured

buildScan {
Expand All @@ -32,7 +32,7 @@ buildCache {
// This is available in all Develocity and Develocity Plugin versions.
/**
remote(HttpBuildCache::class) {
url = uri("https://enterprise-samples.gradle.com/cache/") // adjust to your DV server, and note the trailing slash
url = uri("https://enterprise-samples.gradle.com/cache/") // adjust to your Develocity server, and note the trailing slash
isAllowUntrustedServer = false // ensure a trusted certificate is configured
credentials {
username = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
<server>
<url>https://enterprise-samples.gradle.com</url> <!-- adjust to your DV server -->
<url>https://enterprise-samples.gradle.com</url> <!-- adjust to your Develocity server -->
<allowUntrusted>false</allowUntrusted> <!-- ensure a trusted certificate is configured -->
</server>
<buildScan>
Expand Down
2 changes: 1 addition & 1 deletion common-develocity-sbt-configuration/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Global / gradleEnterpriseConfiguration :=
GradleEnterpriseConfiguration(
server = Server(
url = Some(url("https://enterprise-samples.gradle.com")), // adjust to your DV server
url = Some(url("https://enterprise-samples.gradle.com")), // adjust to your Develocity server
allowUntrusted = false), // ensure a trusted certificate is configured
buildScan = BuildScan(
publishConfig = PublishConfig.Always,
Expand Down
8 changes: 4 additions & 4 deletions convention-develocity-gradle-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ This project is structured as follows:
* `gradle-2-through-4` - Applies and configures the Build Scan plugin on builds using Gradle 2.0 through Gradle 4.10.3
* `gradle-5-or-newer` - Applies and configures the Develocity plugin on builds using Gradle 5.0 or higher
* `examples` - Contains example builds that apply the convention plugin for different Gradle versions
* `gradle_2.0` - Applies the convention plugin on a Gradle 2.0 build (only the DV plugin is applied)
* `gradle_4.1` - Applies the convention plugin on a Gradle 4.1 build (the DV and CCUD plugins are applied)
* `gradle_5.1.1` - Applies the convention plugin on a Gradle 5 build (the DV and CCUD plugins are applied)
* `gradle_6.0.1` - Applies the convention plugin on a Gradle 6+ build (the DV and CCUD plugins are applied)
* `gradle_2.0` - Applies the convention plugin on a Gradle 2.0 build (only the Develocity plugin is applied)
* `gradle_4.1` - Applies the convention plugin on a Gradle 4.1 build (the Develocity and CCUD plugins are applied)
* `gradle_5.1.1` - Applies the convention plugin on a Gradle 5 build (the Develocity and CCUD plugins are applied)
* `gradle_6.0.1` - Applies the convention plugin on a Gradle 6+ build (the Develocity and CCUD plugins are applied)

### Running the example builds

Expand Down

0 comments on commit 5c3398a

Please sign in to comment.