Set jenkins.javaAgent in TestRuntimeMojo
#1138
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 5, 2025
basil
commented
May 5, 2025
Comment on lines
+117
to
+118
| <!-- Filled in by "maven-hpi-plugin" with "-javaagent:/path/to/mockito-core-<version>.jar" --> | ||
| <jenkins.javaAgent /> |
There was a problem hiding this comment.
Will make the failure mode softer in the future by simply skipping a Java agent in the case that, for whatever reason, maven-hpi-plugin doesn't fill in this value.
basil
commented
May 5, 2025
Comment on lines
-506
to
-516
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>properties</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> |
There was a problem hiding this comment.
This is handled via TestRuntimeMojo, which contains:
@Mojo(name = "test-runtime", requiresDependencyResolution = ResolutionScope.TEST)
basil
commented
May 5, 2025
Comment on lines
-782
to
-796
| <execution> | ||
| <id>configureJavaAgent</id> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| <phase>initialize</phase> | ||
| <configuration> | ||
| <target> | ||
| <condition else="" property="jenkins.javaAgent" value="-javaagent:${org.mockito:mockito-core:jar}"> | ||
| <isset property="org.mockito:mockito-core:jar" /> | ||
| </condition> | ||
| </target> | ||
| <exportAntProperties>true</exportAntProperties> | ||
| </configuration> | ||
| </execution> |
There was a problem hiding this comment.
Reimplemented with Java code in jenkinsci/maven-hpi-plugin#741.
MarkEWaite
approved these changes
May 5, 2025
MarkEWaite
added a commit
to MarkEWaite/configuration-as-code-plugin
that referenced
this pull request
May 6, 2025
The plugin bill of materials fails to run tests with parent pom versions 5.13 through 5.15. Details are available in jenkinsci/bom#5000 (comment) and in the related pull requests: * jenkinsci/maven-hpi-plugin#741 * jenkinsci/plugin-pom#1138
6 tasks
timja
pushed a commit
to jenkinsci/configuration-as-code-plugin
that referenced
this pull request
May 6, 2025
The plugin bill of materials fails to run tests with parent pom versions 5.13 through 5.15. Details are available in jenkinsci/bom#5000 (comment) and in the related pull requests: * jenkinsci/maven-hpi-plugin#741 * jenkinsci/plugin-pom#1138
MarkEWaite
added a commit
to MarkEWaite/pipeline-milestone-step-plugin
that referenced
this pull request
May 7, 2025
The plugin bill of materials fails to run tests with parent pom versions 5.13 through 5.15. Details are available in jenkinsci/bom#5000 (comment) and in the related pull requests: * jenkinsci/maven-hpi-plugin#741 * jenkinsci/plugin-pom#1138 Needs to be labeled `developer` so that a new release is delivered
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Downstream of jenkinsci/maven-hpi-plugin#741. Fixes jenkinsci/bom#5000 (comment) by reimplementing #1130 in
maven-hpi-plugin, thus preserving the calling convention expected by PCT.Testing done
See jenkinsci/maven-hpi-plugin#741.
Submitter checklist