Forward compatibility with jenkinsci/jenkins#8503 #15
Conversation
This file contains 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
basil
commented
Sep 18, 2023
| @@ -0,0 +1,7 @@ | |||
| <extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd"> | |||
| @@ -0,0 +1,2 @@ | |||
| -Pconsume-incrementals | |||
| @@ -0,0 +1,4 @@ | |||
| buildPlugin(useContainerAgent: true, configurations: [ | |||
| @@ -5,21 +5,21 @@ | |||
| <parent> | |||
| <groupId>org.jenkins-ci.plugins</groupId> | |||
| <artifactId>plugin</artifactId> | |||
| <version>2.11</version> | |||
| <version>4.73</version> | |||
There was a problem hiding this comment.
Latest version at the time of this writing.
| <relativePath /> | ||
| </parent> | ||
|
|
||
| <name>VectorCAST Coverage</name> | ||
| <description>Display VectorCAST coverage in Jenkins</description> | ||
| <artifactId>vectorcast-coverage</artifactId> | ||
| <version>0.22-SNAPSHOT</version> | ||
| <version>${revision}${changelist}</version> |
Comment on lines
+80
to
+84
| <dependency> | ||
| <groupId>joda-time</groupId> | ||
| <artifactId>joda-time</artifactId> | ||
| <version>2.12.5</version> | ||
| </dependency> |
There was a problem hiding this comment.
A dependency consumed by this plugin but not previously declared.
pom.xml
Outdated
| @@ -70,77 +90,21 @@ | |||
| <dependency> | |||
| <groupId>org.jenkins-ci.plugins</groupId> | |||
| <artifactId>dashboard-view</artifactId> | |||
| <version>2.16</version> | |||
There was a problem hiding this comment.
Version now managed in the plugin BOM.
pom.xml
Outdated
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jenkins-ci.main</groupId> | ||
| <artifactId>maven-plugin</artifactId> | ||
| <version>2.8</version> |
There was a problem hiding this comment.
Version now managed in the plugin BOM.
pom.xml
Outdated
Comment on lines
83
to
176
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-release-plugin</artifactId> | ||
| <version>3.0.0-M1</version> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>2.3.2</version> | ||
| <configuration> | ||
| <source>1.7</source> | ||
| <target>1.7</target> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>build-helper-maven-plugin</artifactId> | ||
| <executions> | ||
|
|
||
| <!-- Attention Eclipse users: if you see an error here, you have to install the M2E buildhelper plugin.--> | ||
| <execution> | ||
| <id>add-localizer-source-folder</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>add-source</goal> | ||
| </goals> | ||
| <configuration> | ||
| <sources> | ||
| <source>${project.build.directory}/generated-sources/localizer</source> | ||
| </sources> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>findbugs-maven-plugin</artifactId> | ||
| <version>3.0.4</version> | ||
| <configuration> | ||
| <xmlOutput>true</xmlOutput> | ||
| <failOnError>${findbugs.failOnError}</failOnError> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>run-findbugs</id> | ||
| <phase>verify</phase> | ||
| <goals> | ||
| <goal>check</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| <pluginManagement> | ||
| <plugins> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
There was a problem hiding this comment.
Unnecessary; all present in the plugin parent POM.
| @@ -183,7 +183,7 @@ public void testGetResultSummary() throws Exception { | |||
| */ | |||
| static class CopyResourceToWorkspaceBuilder extends Builder { | |||
|
|
|||
| private final InputStream content; | |||
| private transient final InputStream content; | |||
There was a problem hiding this comment.
Needed to fix test failures on Java 11/17.
|
@basil: it seems we've had some upstream changes since you opened-up this PR; could you please fix the merge conflicts, then we can take a look? Thanks for your contribution! |
|
At the time this PR was submitted, there were no conflicts. I have resolved the conflicts. |
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.
Without dropping support for existing cores (where this library will simply be ignored in favor of core's copy), add forward compatibility for jenkinsci/jenkins#8503 by bundling XML Pull Parser 3rd Edition within this plugin's HPI file rather than relying on core's copy, thereby enabling us to remove this library from core.
Testing done
See jenkinsci/testng-plugin-plugin#246.