Versions Compared

Key

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

...

It is easiest to do this if you have the git repository cloned and updated

Merge against 9.4

The 9.4 branch may have changed and this has to be reflected in the artefact we build

Code Block
cd idp-jetty-base
git checkout 9.4
git pull
git checkout 9.4-windows
git merge 9.4

Check Changes

We need to track any changes to the 9.4 branch and and breaking changes in jetty itself.

...

  • Remove the prefixing of KeyStorePath with ${Jetty.base},this  allows absolute paths to be used.  Procrun is setup to allow relative paths to use this shortcut.

  • Remove the explicit setting of 5 bean properties, allowing the Java defaults to take over..  These can be checked in jetty-util\src\main\java\org\eclipse\jetty\util\ssl\SslContextFactory.java

    • KeyManagerPassword This is used in getKeyManagers().  Having it not set  means it defaults to the KeyStorePassword

    • TrustStore reading the loadTrustStore will show that if these three properties are not set then the keystore is used.

Logging versions

The versions of logback and slf4j need to match the version that jetty ships with. Check the version in the pom file for jetty base with the version at the top level if jetty.project

Build

Having completed the review the artefact used to build the installer can be created.  You should change version in the pom file to reflect the Jetty version.

...