EnforceBytecodeVersion fails with "Restricted to JDK 11 yet […] con…

…tains […] targeted to JDK 17" (#582)
jenkinsci · Feb 22, 2024 · 47b6b67 · 47b6b67
1 parent 4ed686b
commit 47b6b67
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 74 deletions.
diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/InitializeMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/InitializeMojo.java
diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/ValidateMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/ValidateMojo.java
@@ -42,6 +42,8 @@ public void execute() throws MojoExecutionException {
  throw new MojoExecutionException("Java " + javaVersion + " or later is necessary to build this plugin.");
  }
  writeProfileMarker(javaVersion);
+ setProperty("maven.compiler.release", Integer.toString(javaVersion.toReleaseVersion()));
+ setProperty("maven.compiler.testRelease", Integer.toString(javaVersion.toReleaseVersion()));
 
  if (new VersionNumber(findJenkinsVersion()).compareTo(new VersionNumber("2.361")) < 0) {
  throw new MojoExecutionException("This version of maven-hpi-plugin requires Jenkins 2.361 or later");
@@ -149,6 +151,14 @@ private static void delete(Path p) throws MojoExecutionException {
  }
  }
 
+ private void setProperty(String key, String value) {
+ String currentValue = project.getProperties().getProperty(key);
+ if (currentValue == null || !currentValue.equals(value)) {
+ getLog().info("Setting " + key + " to " + value);
+ project.getProperties().setProperty(key, value);
+ }
+ }
+
  private void check(String tag, String value, String badStart, String goodStart, String reason) {
  if (value.startsWith(badStart)) {
  String goodValue = goodStart + value.substring(badStart.length());

diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/extensions/HpiLifecycleMappingProvider.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/extensions/HpiLifecycleMappingProvider.java
@@ -26,7 +26,6 @@ static Map<String, LifecyclePhase> getBindings() {
  "validate",
  new LifecyclePhase(
  "org.jenkins-ci.tools:maven-hpi-plugin:validate,org.jenkins-ci.tools:maven-hpi-plugin:validate-hpi"));
- bindings.put("initialize", new LifecyclePhase("org.jenkins-ci.tools:maven-hpi-plugin:initialize"));
  bindings.put(
  "process-resources",
  new LifecyclePhase("org.apache.maven.plugins:maven-resources-plugin:2.6:resources"));