Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. Updated Java Build Prerequisites (
    Jira
    serverASF JIRA
    serverId5aa69414-a9e9-3523-82ec-879b028fb15b
    keySLING-11842
    and
    Jira
    serverASF JIRA
    serverId5aa69414-a9e9-3523-82ec-879b028fb15b
    keySLING-12080
    )
    • Parent 60 requires Java 11 while Sling Bundle Parent 60+ requires Java 17, therefore add an according Sling module descriptor to only run CI builds with Java 17+ (if using sling-bundle-parent) (by default the build is executed with 11, 17 and 21)
  2. Enforced code formatting with spotless-maven-plugin (
    Jira
    serverASF JIRA
    serverId5aa69414-a9e9-3523-82ec-879b028fb15b
    keySLING-12186
    )
    • Add a dedicated(!) commit after the actual parent update with only the formatting changes (applied via mvn spotless:apply ) and afterwards ignore that commit in blame automatically by adding its SHA1 to a file named .git-blame-ignore-revs. This file is automatically considered in GitHubs blame view and optionally considered for a local git CLI blame. Note though that this only works well for non-reordering formatting changes. For reordered lines in pom.xml it will emit wrong blame information per line. To temporarily disable the formatting check use -Dspotless.check.skip=true.
    • In order to make the maven-release-plugin not violate the spotless format during releases please make sure the SCM information in the POM contains the tag element in correct formatting, for example like this

      Code Block
      languagexml
      <project ...>	
      	<scm>
              <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-hamcrest.git</connection>
              <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-hamcrest.git</developerConnection>
              <tag>master</tag>
              <url>https://github.com/apache/sling-org-apache-sling-testing-hamcrest/tree/${project.scm.tag}</url>
          </scm>
      ...

      Otherwise the m-release-p will add the tag element with the wrong indentation and also change the indentation of the scm close element.

  3. Default target bytecode version increased to Java 11 (
    Jira
    serverASF JIRA
    serverId5aa69414-a9e9-3523-82ec-879b028fb15b
    keySLING-11842
    )
    • Either downgrade the bytecode version to Java 8 with property sling.java.version or at least bump the minor version segment of the to be released module (and mention the Java 11 runtime requirement in JIRA)

...