This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a change to branch rewriteTests
in repository https://gitbox.apache.org/repos/asf/creadur-whisker.git
from 129e9a4 WHISKER-30: Merge in latest changes from WHISKER-26
add bea0cb7 Bump org.apache.maven.skins:maven-fluido-skin from 2.0.1 to
2.1.0
add 470b7ca Merge pull request #232 from
apache/dependabot/maven/org.apache.maven.skins-maven-fluido-skin-2.1.0
add d498bb2 Bump com.gradle:common-custom-user-data-maven-extension
add 812f8a8 Merge pull request #233 from
apache/dependabot/maven/com.gradle-common-custom-user-data-maven-extension-2.0.2
add d5fd085 WHISKER-28: Copy CSS/JS into testapidocs as well to prevent
404
add 478d82f WHISKER-28: Copy resources to more generated locations
add 9bc929e WHISKER-28: Add developers and contributors
add bd5fa30 WHISKER-28: Fix broken link
add 6d4c106 WHISKER-28: Fix broken links to mailing list info
add 1256b00 WHISKER-28: Fix broken links to jira info
add 29af1d1 WHISKER-28: Fix broken links to SCM info
add e0efea3 WHISKER-28: replace by TLS
add bf3f514 WHISKER-28: Duplicate javadoc JS/CSS resources to avoid 404
add fb8aeb1 WHISKER-28: Fix typo in path and silence output during
resource copying
add b5eb57a WHISKER-28: Simplify shell scripts
add 360ef24 Merge pull request #231 from apache/feature/WHISKER-28
add 954c1bc WHISKER-18: Try out failing windows JDK runs on GHA
add 0e89907 WHISKER-18: Try to remove artifact caching to see if it is
related to the windows build failures
add 0555431 WHISKER-31: Disable certain windows JDKs until cause is found
and fixed
add 20d50e4 Bump org.apache.maven.plugins:maven-changes-plugin
add d90000c Merge pull request #234 from
apache/dependabot/maven/org.apache.maven.plugins-maven-changes-plugin-3.0.0-M3
add 61aed7c Bump com.gradle:develocity-maven-extension from 2.0 to 2.0.1
add d9faaec Merge pull request #235 from
apache/dependabot/maven/com.gradle-develocity-maven-extension-2.0.1
add 5ac4aec Update Maven wrapper to 3.9.10
add 8ae2f8c Bump org.apache.maven:maven-plugin-api from 3.9.9 to 3.9.10
add 03fc687 Merge pull request #236 from
apache/dependabot/maven/org.apache.maven-maven-plugin-api-3.9.10
add 7144693 Bump com.gradle:common-custom-user-data-maven-extension
add 7ae3d38 Merge pull request #237 from
apache/dependabot/maven/com.gradle-common-custom-user-data-maven-extension-2.0.3
add 2224262 Bump log4j2.version from 2.24.3 to 2.25.0
add 207cf6b Merge pull request #239 from
apache/dependabot/maven/log4j2.version-2.25.0
add 4a0e802 Bump org.apache.logging.log4j:log4j-bom from 2.24.3 to 2.25.0
add a5fa569 Merge pull request #240 from
apache/dependabot/maven/org.apache.logging.log4j-log4j-bom-2.25.0
add 3f15e58 Bump org.apache.maven.plugins:maven-pmd-plugin from 3.26.0 to
3.27.0
add f47c706 Merge pull request #241 from
apache/dependabot/maven/org.apache.maven.plugins-maven-pmd-plugin-3.27.0
add 4ade54c Bump org.apache.maven.plugins:maven-invoker-plugin from 3.9.0
to 3.9.1
add b3e9417 Merge pull request #242 from
apache/dependabot/maven/org.apache.maven.plugins-maven-invoker-plugin-3.9.1
add 131cc52 Bump org.apache.maven.plugins:maven-enforcer-plugin from
3.5.0 to 3.6.0
add 3389da8 Merge pull request #243 from
apache/dependabot/maven/org.apache.maven.plugins-maven-enforcer-plugin-3.6.0
add dced836 Bump org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0
add 126f1f6 Merge pull request #244 from
apache/dependabot/maven/org.apache.commons-commons-lang3-3.18.0
add a7fd34f Bump org.apache.logging.log4j:log4j-bom from 2.25.0 to 2.25.1
add 62d6e50 Merge pull request #245 from
apache/dependabot/maven/org.apache.logging.log4j-log4j-bom-2.25.1
add 3750e95 Bump commons-io:commons-io from 2.19.0 to 2.20.0
add dad05c3 Merge pull request #249 from
apache/dependabot/maven/commons-io-commons-io-2.20.0
add 3a9dd2b Bump org.apache.maven:maven-plugin-api from 3.9.10 to 3.9.11
add 141217f Merge pull request #248 from
apache/dependabot/maven/org.apache.maven-maven-plugin-api-3.9.11
add c12c1f3 Bump log4j2.version from 2.25.0 to 2.25.1
add c5103ff Merge pull request #246 from
apache/dependabot/maven/log4j2.version-2.25.1
add b9dc96d Bump org.apache.maven.plugins:maven-enforcer-plugin from
3.6.0 to 3.6.1
add bfcf7d6 Merge pull request #247 from
apache/dependabot/maven/org.apache.maven.plugins-maven-enforcer-plugin-3.6.1
add 67575ce Update to Maven 3.9.11
add d768142 Bump com.gradle:develocity-maven-extension from 2.0.1 to 2.1
add 205dd49 Merge pull request #250 from
apache/dependabot/maven/com.gradle-develocity-maven-extension-2.1
add b9924e0 Bump commons-cli:commons-cli from 1.9.0 to 1.10.0
add 3e7c1f6 Merge pull request #251 from
apache/dependabot/maven/commons-cli-commons-cli-1.10.0
add 8ba3800 Bump actions/checkout from 4 to 5
add 637fa06 Merge pull request #252 from
apache/dependabot/github_actions/actions/checkout-5
add bf6fb3b Bump org.apache.maven.plugins:maven-javadoc-plugin from
3.11.2 to 3.11.3
add d7c40f2 Merge pull request #253 from
apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.3
add ed6692a Bump actions/setup-java from 4 to 5
add ab21a8c Merge pull request #254 from
apache/dependabot/github_actions/actions/setup-java-5
add 4f3b6b6 Revert java-setup update to hopefully fix build issues with
changelog plugin
add edae2fe Revert "Revert java-setup update to hopefully fix build
issues with changelog plugin"
add a6f4fb6 Disable changelog plugin until
https://github.com/apache/maven-changelog-plugin/issues/200 is fixed
add 8bf7c1d Bump com.gradle:common-custom-user-data-maven-extension
add cc083b5 Merge pull request #255 from
apache/dependabot/maven/com.gradle-common-custom-user-data-maven-extension-2.0.4
add 1ba0d03 Bump com.gradle:common-custom-user-data-maven-extension
add 2b93943 Merge pull request #256 from
apache/dependabot/maven/com.gradle-common-custom-user-data-maven-extension-2.0.5
add b38b94f Adapt footer reference
add b69c7de Bump org.apache.maven.plugins:maven-surefire-report-plugin
add 5083dd4 Merge pull request #257 from
apache/dependabot/maven/org.apache.maven.plugins-maven-surefire-report-plugin-3.5.4
add 5bbf350 Bump org.apache.maven.plugins:maven-shade-plugin from 3.6.0
to 3.6.1
add 2cd4a3b Merge pull request #258 from
apache/dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.6.1
add 6f1aa8a Bump com.gradle:common-custom-user-data-maven-extension
add cc0396c Merge pull request #259 from
apache/dependabot/maven/com.gradle-common-custom-user-data-maven-extension-2.0.6
add 93f5542 Bump com.gradle:develocity-maven-extension from 2.1 to 2.2
add cecfec6 Merge pull request #260 from
apache/dependabot/maven/com.gradle-develocity-maven-extension-2.2
add c5904f7 Bump org.apache.maven.plugins:maven-javadoc-plugin from
3.11.3 to 3.12.0
add b5b9fb4 Merge pull request #261 from
apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.12.0
add d3ce913 Cleanup log4j version definition chaos and use bom-only
add 597e8fb Add JDK25 to see future issues
add 15cab41 Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0
add 33c923a Merge pull request #264 from
apache/dependabot/maven/org.apache.commons-commons-lang3-3.19.0
add 4317af5 Bump org.apache.maven.plugins:maven-enforcer-plugin from
3.6.1 to 3.6.2
add 156155f Merge pull request #265 from
apache/dependabot/maven/org.apache.maven.plugins-maven-enforcer-plugin-3.6.2
add 610cb83 Bump org.codehaus.mojo:extra-enforcer-rules from 1.10.0 to
1.11.0
add 5181cf9 Merge pull request #266 from
apache/dependabot/maven/org.codehaus.mojo-extra-enforcer-rules-1.11.0
add d1c9b8e Bump org.codehaus.mojo:animal-sniffer-maven-plugin from 1.24
to 1.26
add 10c8270 Merge pull request #267 from
apache/dependabot/maven/org.codehaus.mojo-animal-sniffer-maven-plugin-1.26
add 577a220 Try to use JDK on ASF infra as older versions are to be
removed
add 496fb8e Bump org.apache.maven.plugins:maven-pmd-plugin from 3.27.0 to
3.28.0
add 7d00dd9 Merge pull request #268 from
apache/dependabot/maven/org.apache.maven.plugins-maven-pmd-plugin-3.28.0
add ee27082 Use RAT0.17 and adapt configuration
add e6994e2 Test-enable JDK17 to see if WHISKER-331 is still an issue
add fe9f252 Revert "Test-enable JDK17 to see if WHISKER-331 is still an
issue"
add 6d1dc5c Bump mavenPluginPluginVersion from 3.15.1 to 3.15.2
add 2d542eb Merge pull request #270 from
apache/dependabot/maven/mavenPluginPluginVersion-3.15.2
add 3a89a5e Bump com.gradle:develocity-maven-extension from 2.2 to 2.2.1
add 15829f8 Merge pull request #271 from
apache/dependabot/maven/com.gradle-develocity-maven-extension-2.2.1
add 9685086 Merge branch 'master' into rewriteTests
No new revisions were added by this update.
Summary of changes:
.buildtools/formatPom | 1 +
.buildtools/formatSiteXml | 1 +
.buildtools/generateStagingSiteInWebpageRepo | 23 +++++-
.github/workflows/maven.yml | 11 +--
.mvn/extensions.xml | 4 +-
.mvn/wrapper/maven-wrapper.properties | 2 +-
Jenkinsfile | 2 +-
apache-whisker-maven-plugin/pom.xml | 4 +-
.../src/site/apt/index.apt.vm | 14 ++--
apache-whisker-maven-plugin/src/site/fml/faq.fml | 4 +-
pom.xml | 81 ++++++++++++----------
src/site/apt/examples/3rd-party-corporate.apt | 2 +-
src/site/apt/examples/3rd-party-group.apt | 2 +-
src/site/apt/examples/3rd-party-individual.apt | 2 +-
src/site/apt/examples/copyright-notices.apt | 2 +-
src/site/apt/examples/in-5-mins.apt | 2 +-
src/site/apt/examples/license-family.apt | 2 +-
src/site/apt/index.apt | 2 +-
src/site/fml/faq.fml | 8 +--
src/site/site.xml | 2 +-
20 files changed, 101 insertions(+), 70 deletions(-)
