Upgrade build toolchain #6432

basil · 2022-04-02T05:43:11Z

Upgrades the build toolchain to the latest releases of the parent POM, test harness, and Maven HPI plugin. With all of the above, JenkinsLogRecordsTest now runs on Java 17.

Proposed changelog entries

N/A

Proposed upgrade guidelines

N/A

Submitter checklist

(If applicable) Jira issue is well described
Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change) and are in the imperative mood. Examples
- Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
Appropriate autotests or explanation to why this change has no tests
New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadoc, as appropriate.
For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

There are at least 2 approvals for the pull request and no outstanding requests for change
Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
Changelog entries in the PR title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood
Proper changelog labels are set so that the changelog can be generated automatically
If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

basil · 2022-04-02T05:43:36Z

pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jenkins-ci</groupId>
    <artifactId>jenkins</artifactId>
-    <version>1.72</version>
+    <version>1.73</version>


Pulls in a new version of maven-hpi-plugin.

basil · 2022-04-02T05:43:46Z

pom.xml

@@ -85,7 +85,6 @@ THE SOFTWARE.
    <patch.tracker.serverId>jenkins-jira</patch.tracker.serverId>

    <animal.sniffer.skip>${skipTests}</animal.sniffer.skip>
-    <java.level>8</java.level>


Deprecated in the latest parent POM.

basil · 2022-04-02T05:44:15Z

pom.xml

-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java1${java.level}</artifactId>
-            <version>1.0</version>
-          </signature>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <!-- Version specified in parent POM -->
-        <configuration>
-          <source>1.${java.level}</source>
-          <target>1.${java.level}</target>
-          <!-- default reuseCreated is more performant
-          feel free to uncomment if you have any issues on your platform
-          <compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
-          -->
-        </configuration>
-      </plugin>


This was always redundant and declared in the parent POM. Rather than inlining java.level I thought it best to delete the redundant copypasta.

basil · 2022-04-02T05:44:28Z

src/spotbugs/spotbugs-excludes.xml

+      <And>
+        <Bug pattern="SSD_DO_NOT_USE_INSTANCE_LOCK_ON_SHARED_STATIC_DATA"/>
+        <Class name="hudson.model.ViewJob"/>
+      </And>


Some new SpotBugs check that still needs triage. Added to the triage list.

basil · 2022-04-02T05:45:25Z

test/pom.xml

+    <!--
+      Filled in by maven-hpi-plugin from the MANIFEST.MF entry in jenkins.war, but we provide a default value for the benefit of IDEs.
+      Make sure to keep the directives in core/pom.xml and war/pom.xml in sync with these.
+    -->
+    <jenkins.addOpens>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</jenkins.addOpens>
+
+    <!-- Filled in by maven-hpi-plugin with the path to org-netbeans-insane-hook.jar extracted from jenkins-test-harness -->
+    <jenkins.insaneHook />


Needed as defaults for IDEs that don't run Maven.

basil · 2022-04-02T05:47:34Z

test/pom.xml

    <dependency>
      <groupId>${project.groupId}</groupId>
      <artifactId>jenkins-test-harness</artifactId>
-      <version>1723.vcd938b_e66072</version>
+      <version>1731.v383b_5d6c3393</version>


Pulls in a newer version of INSANE that is needed for Java 17.

basil · 2022-04-02T05:48:03Z

test/pom.xml

+        <executions>
+          <execution>
+            <id>test-runtime</id>
+            <goals>
+              <goal>test-runtime</goal>
+            </goals>
+            <phase>test</phase>
+          </execution>
+        </executions>


Sets the jenkins.addOpens and jenkins.insaneHook system property. The latter is needed for the newer version of INSANE.

basil · 2022-04-02T05:48:53Z

test/pom.xml

@@ -229,13 +254,32 @@ THE SOFTWARE.
        <artifactId>maven-surefire-plugin</artifactId>
        <!-- version specified in grandparent pom -->
        <configuration>
+          <argLine>${jacocoSurefireArgs} -Xmx1g @{jenkins.addOpens} @{jenkins.insaneHook}</argLine>


Rather than setting these ourselves in a custom profile, we now rely on maven-hpi-plugin to set them for us, the same way plugins will in the next release of plugin-pom.

basil · 2022-04-02T05:49:39Z

test/pom.xml

+        <executions>
+          <!-- Unbind the default execution so that it does not run before test-runtime. -->
+          <execution>
+            <id>default-test</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <phase>none</phase>
+          </execution>
+          <!-- Bind a new execution which, by virtue of being declared after test-runtime, will also run after it. -->
+          <execution>
+            <id>functional-test</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <phase>test</phase>
+          </execution>
+        </executions>


Get test-runtime to run before Surefire. For plugins we define a custom lifecycle, but for the standard lifecycle used in core we have to define the executions in the order we want them to run in.

basil · 2022-04-02T05:49:53Z

test/src/test/java/jenkins/model/JenkinsLogRecordsTest.java

+        VersionNumber javaVersion = new VersionNumber(System.getProperty("java.specification.version"));
+        if (javaVersion.isOlderThan(new VersionNumber("9")) || javaVersion.isNewerThanOrEqualTo(new VersionNumber("17"))) { // TODO https://github.com/jenkinsci/jenkins-test-harness/issues/359


Still not working on Java 11, but this finally works on Java 17.

basil · 2022-04-02T08:20:31Z

Proof that this is all working:

https://ci.jenkins.io/job/Core/job/jenkins/job/PR-6432/3/testReport/jenkins.model/JenkinsLogRecordsTest/Linux_jdk17___Linux_Build___Test___logRecordsArePresentOnController/

That is JenkinsLogRecordsTest passing on Java 17, checking for memory leaks with the latest version of INSANE, with the INSANE hooks added by the Maven HPI plugin.

basil · 2022-04-03T01:05:40Z

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process. Thanks!

Upgrade build toolchain

5cba301

basil added skip-changelog Should not be shown in the changelog squash-merge-me Unclean or useless commit history, should be merged only with squash-merge dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Apr 2, 2022

basil commented Apr 2, 2022

View reviewed changes

basil mentioned this pull request Apr 2, 2022

Deduplicate Add-Opens directives in tests #6421

Closed

11 tasks

basil added 2 commits April 1, 2022 22:53

Merge remote-tracking branch 'origin/master' into toolchain

944e05e

Default value should not apply to Java 8

39e5861

timja approved these changes Apr 2, 2022

View reviewed changes

basil added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Apr 3, 2022

basil merged commit dc88f58 into jenkinsci:master Apr 4, 2022

basil deleted the toolchain branch April 4, 2022 16:17

daniel-beck mentioned this pull request Jun 30, 2023

mvn test no longer works in jenkinsci/jenkins jenkinsci/maven-hpi-plugin#509

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade build toolchain #6432

Upgrade build toolchain #6432

basil commented Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil Apr 2, 2022

basil commented Apr 2, 2022

basil commented Apr 3, 2022

		VersionNumber javaVersion = new VersionNumber(System.getProperty("java.specification.version"));
		if (javaVersion.isOlderThan(new VersionNumber("9")) \|\| javaVersion.isNewerThanOrEqualTo(new VersionNumber("17"))) { // TODO https://github.com/jenkinsci/jenkins-test-harness/issues/359

Upgrade build toolchain #6432

Upgrade build toolchain #6432

Conversation

basil commented Apr 2, 2022

Proposed changelog entries

Proposed upgrade guidelines

Submitter checklist

Desired reviewers

Maintainer checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

basil commented Apr 2, 2022

basil commented Apr 3, 2022