Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update samples and scripts to use DV Maven extension 1.21 and DV API #1121

Merged
merged 6 commits into from
Apr 9, 2024
Merged

Update samples and scripts to use DV Maven extension 1.21 and DV API #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd7efe8
Update to use DV Maven extension 1.21 and DV API
runningcode Apr 5, 2024
5a64d2f
Adjust extension loaded and failed messages
runningcode Apr 5, 2024
68fed6e
Fix DV Maven extension version script
runningcode Apr 5, 2024
d47ea5e
Use `-e` flag to force older GE plugin version
runningcode Apr 5, 2024
9a748ca
Merge branch 'main' into no/update-maven-extension
runningcode Apr 8, 2024
7c37806
Disable failing workflow
runningcode Apr 9, 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
2 changes: 1 addition & 1 deletion ...en-build-caching-samples-verification.yml → ...caching-samples-verification.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
-g "verify" \
-a "-Dorg.slf4j.simpleLogger.log.gradle.goal.cache=debug -B" \
-s "https://ge.solutions-team.gradle.com" \
-f 2>&1 | tee -a /tmp/build.log
-f -e 2>&1 | tee -a /tmp/build.log
echo "hasUnknownParams=$(grep "Build caching was not enabled for this goal execution because the following parameters were not handled" /tmp/build.log | wc -l)" >> $GITHUB_OUTPUT
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/maven-data-capturing-samples-verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
name: Verification of ${{ matrix.name }}
runs-on: ubuntu-latest
env:
LOG_MSG_EXTENSION_LOADED: "Build operation 'Gradle Enterprise mojo execution' completed"
LOG_MSG_EXECUTION_FAILED: "Error executing a GradleEnterpriseListener callback"
LOG_MSG_EXTENSION_LOADED: "Build operation 'Develocity mojo execution' completed"
LOG_MSG_EXECUTION_FAILED: "Error executing a DevelocityListener callback"
strategy:
matrix:
include:
Expand Down Expand Up @@ -42,16 +42,16 @@ jobs:
- name: Provide data capture script to Maven build
run: |
# 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/gradle-enterprise-custom-user-data.groovy
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
run: |
delimiter="$(openssl rand -hex 8)"
echo "mavenOutput<<${delimiter}" >> $GITHUB_OUTPUT
echo "$(mvn -f common-develocity-maven-configuration/pom.xml -Dgradle.enterprise.url=https://ge.solutions-team.gradle.com -X -B clean validate)" >> $GITHUB_OUTPUT
echo "$(mvn -f common-develocity-maven-configuration/pom.xml -Ddevelocity.url=https://ge.solutions-team.gradle.com -X -B clean validate)" >> $GITHUB_OUTPUT
echo "${delimiter}" >> $GITHUB_OUTPUT
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
- name: Validate extension loaded
# Asserting that extension was loaded checking a log entry
run: exit 1
Expand Down
2 changes: 1 addition & 1 deletion build-caching-maven-samples/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
.mvn/.develocity/develocity-workspace-id

velocity.log
7 changes: 2 additions & 5 deletions ...-maven-samples/.mvn/gradle-enterprise.xml → ...caching-maven-samples/.mvn/develocity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<gradleEnterprise>
<develocity>
<server>
<url>https://localhost</url>
<allowUntrusted>true</allowUntrusted>
</server>
<buildScan>
<captureGoalInputFiles>true</captureGoalInputFiles>
</buildScan>
<buildCache>
<local>
<enabled>true</enabled>
Expand All @@ -14,4 +11,4 @@
<enabled>false</enabled>
</remote>
</buildCache>
</gradleEnterprise>
</develocity>
6 changes: 3 additions & 3 deletions build-caching-maven-samples/.mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<extensions>
<extension>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.20.1</version>
<artifactId>develocity-maven-extension</artifactId>
<version>1.21</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>2</version>
<version>2.0</version>
</extension>
</extensions>
6 changes: 3 additions & 3 deletions build-caching-maven-samples/animal-sniffer-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -116,7 +116,7 @@
</executions>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/antlr3-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.antlr</groupId>
Expand Down Expand Up @@ -117,7 +117,7 @@
</outputs>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/asciidoctor-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.asciidoctor</groupId>
Expand Down Expand Up @@ -174,7 +174,7 @@
</outputs>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
8 changes: 4 additions & 4 deletions build-caching-maven-samples/aspectj-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd
https://www.gradle.com/schema/gradle-enterprise-maven-project.xsd">
https://www.gradle.com/schema/develocity-maven-project.xsd">

<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -52,9 +52,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -345,7 +345,7 @@
</executions>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/avro-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.apache.avro</groupId>
Expand Down Expand Up @@ -120,7 +120,7 @@
</outputs>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
8 changes: 4 additions & 4 deletions build-caching-maven-samples/clojure-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd
https://www.gradle.com/schema/gradle-enterprise-maven-project.xsd">
https://www.gradle.com/schema/develocity-maven-project.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>clojure-project</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -57,9 +57,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>com.theoryinpractise</groupId>
Expand Down Expand Up @@ -212,7 +212,7 @@
</outputs>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/duplicate-finder-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
Expand Down Expand Up @@ -115,7 +115,7 @@
</outputs>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/enforcer-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -224,7 +224,7 @@
</executions>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/exec-yarn-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<!-- Make yarn build cacheable -->
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -174,7 +174,7 @@
</executions>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/kotlin-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down Expand Up @@ -199,7 +199,7 @@
</localState>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/pmd-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
Expand Down Expand Up @@ -295,7 +295,7 @@
</executions>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/protobuf-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>com.github.os72</groupId>
Expand Down Expand Up @@ -126,7 +126,7 @@
</outputs>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/spotbugs-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
Expand Down Expand Up @@ -154,7 +154,7 @@
</executions>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
6 changes: 3 additions & 3 deletions build-caching-maven-samples/spotless-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
Expand Down Expand Up @@ -226,7 +226,7 @@
</outputs>
</plugin>
</plugins>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>
Expand Down
Loading