diff --git a/book/pom.xml b/book/pom.xml index 178cce9b..1c201615 100644 --- a/book/pom.xml +++ b/book/pom.xml @@ -29,7 +29,7 @@ along with nmw-oss-parent. If not, see . com.newmediaworksnmw-oss-parent-book1.20.0-SNAPSHOT - bundle + jar com.newmediaworks.oss.parent.book @@ -150,6 +150,14 @@ along with nmw-oss-parent. If not, see . + + org.apache.maven.pluginsmaven-jar-plugin + + + **/module-info.class + + + diff --git a/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx index cbd61d04..c18dddc6 100644 --- a/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx +++ b/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx @@ -37,7 +37,7 @@ along with nmw-oss-parent. If not, see . shortTitle="Changelog" tocLevels="1" datePublished="2019-05-24T19:05:12-05:00" - dateModified="2023-08-16T21:22:51Z" + dateModified="2023-08-17T20:46:40Z" > . via git-commit-id-maven-plugin.
  • Builds now require Java 11 or newer.
  • +
  • + Builds now require Maven 3.9.0 or newer for + profile activation by packaging. +
  • +
  • +

    + Using packaging=jar instead of packaging=bundle for all jar projects. + OSGI manifest entries are still added, however, as documented at + + Adding OSGi metadata to existing projects without changing the packaging type + . + This has the side effect that projects that were previously packaging=jar will now have + OSGI manifest entries added. None of our projects were previously of the jar packaging. +

    +

    + This change is required since maven-bundle-plugin + has been adding entries with a constant and hard-coded timestamp of 1980-02-01. +

    +

    + These constant timestamps are incompatible with the automatic lastModified parameters added by + AO Servlet Last Modified when the resource + is contained in a JAR file within WEB-INF/lib. This has resulted in browsers using + out-of-date cached content. +

    +
  • diff --git a/pom.xml b/pom.xml index 4a5a3540..33fa54d3 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,10 @@ along with nmw-oss-parent. If not, see . UA-177004-2 + The Java module name, defaulting to the value previously used for "Bundle-SymbolicName" in Java < 9. All projects + should set this to match the module name defined in "module-info.java". Furthermore, projects without + "module-info.java" should also add the "Automatic-Module-Name" manifest entry. + --> ${project.groupId}.${project.artifactId} target/resources-filtered @@ -1618,8 +1621,8 @@ along with nmw-oss-parent. If not, see . - Maven >= 3.6.3 required by maven-help-plugin - [3.6.3,) + Maven >= 3.9.0 required for profile activation by packaging + [3.9.0,) @@ -2006,6 +2009,35 @@ along with nmw-oss-parent. If not, see . + + + packaging-jar + packagingjar + + + + + org.apache.maven.pluginsmaven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + + org.apache.felixmaven-bundle-plugin + + + bundle-manifestprocess-classesmanifest + + + + + + nmw-javadoc-resources-addStylesheet-java-11