This repository was archived by the owner on Oct 13, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Bump the java-dependencies group with 20 updates #469
Merged
colincasey
merged 1 commit into
main
from
dependabot/maven/java-dependencies-cf8ea02717
May 15, 2024
Merged
Bump the java-dependencies group with 20 updates #469
colincasey
merged 1 commit into
main
from
dependabot/maven/java-dependencies-cf8ea02717
May 15, 2024
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps the java-dependencies group with 20 updates: | Package | From | To | | --- | --- | --- | | [nl.jqno.equalsverifier:equalsverifier](https://github.com/jqno/equalsverifier) | `3.15.3` | `3.16.1` | | [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | `3.11.0` | `3.13.0` | | [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.2.2` | `3.2.5` | | [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) | `3.3.0` | `3.4.1` | | [org.apache.maven.plugins:maven-install-plugin](https://github.com/apache/maven-install-plugin) | `3.1.1` | `3.1.2` | | [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) | `3.1.1` | `3.1.2` | | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) | `3.4.5` | `3.5.0` | | [org.apache.maven.plugins:maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) | `3.6.0` | `3.7.1` | | [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) | `0.8.11` | `0.8.12` | | [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) | `3.3.0` | `3.3.1` | | [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) | `3.6.2` | `3.6.3` | | [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) | `3.1.0` | `3.2.4` | | [com.github.tomakehurst:wiremock-jre8](https://github.com/wiremock/wiremock) | `2.35.1` | `2.35.2` | | org.apache.commons:commons-text | `1.11.0` | `1.12.0` | | [io.undertow:undertow-core](https://github.com/undertow-io/undertow) | `2.2.28.Final` | `2.2.32.Final` | | [org.tomlj:tomlj](https://github.com/tomlj/tomlj) | `1.1.0` | `1.1.1` | | [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.16.0` | `2.17.0` | | [com.fasterxml.jackson.core:jackson-annotations](https://github.com/FasterXML/jackson) | `2.16.0` | `2.17.0` | | [io.leangen.geantyref:geantyref](https://github.com/leangen/geantyref) | `1.3.14` | `1.3.15` | | [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) | `4.10.0` | `4.12.0` | Updates `nl.jqno.equalsverifier:equalsverifier` from 3.15.3 to 3.16.1 - [Release notes](https://github.com/jqno/equalsverifier/releases) - [Changelog](https://github.com/jqno/equalsverifier/blob/main/CHANGELOG.md) - [Commits](jqno/equalsverifier@equalsverifier-3.15.3...equalsverifier-3.16.1) Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.11.0 to 3.13.0 - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.13.0) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.2.2 to 3.2.5 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.2...surefire-3.2.5) Updates `org.apache.maven.plugins:maven-jar-plugin` from 3.3.0 to 3.4.1 - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.3.0...maven-jar-plugin-3.4.1) Updates `org.apache.maven.plugins:maven-install-plugin` from 3.1.1 to 3.1.2 - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](apache/maven-install-plugin@maven-install-plugin-3.1.1...maven-install-plugin-3.1.2) Updates `org.apache.maven.plugins:maven-deploy-plugin` from 3.1.1 to 3.1.2 - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](apache/maven-deploy-plugin@maven-deploy-plugin-3.1.1...maven-deploy-plugin-3.1.2) Updates `org.apache.maven.plugins:maven-project-info-reports-plugin` from 3.4.5 to 3.5.0 - [Commits](apache/maven-project-info-reports-plugin@maven-project-info-reports-plugin-3.4.5...maven-project-info-reports-plugin-3.5.0) Updates `org.apache.maven.plugins:maven-assembly-plugin` from 3.6.0 to 3.7.1 - [Release notes](https://github.com/apache/maven-assembly-plugin/releases) - [Commits](apache/maven-assembly-plugin@maven-assembly-plugin-3.6.0...maven-assembly-plugin-3.7.1) Updates `org.jacoco:jacoco-maven-plugin` from 0.8.11 to 0.8.12 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](jacoco/jacoco@v0.8.11...v0.8.12) Updates `org.apache.maven.plugins:maven-source-plugin` from 3.3.0 to 3.3.1 - [Commits](apache/maven-source-plugin@maven-source-plugin-3.3.0...maven-source-plugin-3.3.1) Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.6.2 to 3.6.3 - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3) Updates `org.apache.maven.plugins:maven-gpg-plugin` from 3.1.0 to 3.2.4 - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](apache/maven-gpg-plugin@maven-gpg-plugin-3.1.0...maven-gpg-plugin-3.2.4) Updates `com.github.tomakehurst:wiremock-jre8` from 2.35.1 to 2.35.2 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](wiremock/wiremock@2.35.1...2.35.2) Updates `org.apache.commons:commons-text` from 1.11.0 to 1.12.0 Updates `io.undertow:undertow-core` from 2.2.28.Final to 2.2.32.Final - [Commits](undertow-io/undertow@2.2.28.Final...2.2.32.Final) Updates `org.tomlj:tomlj` from 1.1.0 to 1.1.1 - [Release notes](https://github.com/tomlj/tomlj/releases) - [Commits](tomlj/tomlj@1.1.0...1.1.1) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.16.0 to 2.17.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.16.0 to 2.17.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `io.leangen.geantyref:geantyref` from 1.3.14 to 1.3.15 - [Release notes](https://github.com/leangen/geantyref/releases) - [Commits](leangen/geantyref@geantyref-v1.3.14...geantyref-v1.3.15) Updates `com.squareup.okhttp3:okhttp` from 4.10.0 to 4.12.0 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.10.0...parent-4.12.0) --- updated-dependencies: - dependency-name: nl.jqno.equalsverifier:equalsverifier dependency-type: direct:development update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-assembly-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: com.github.tomakehurst:wiremock-jre8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.apache.commons:commons-text dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: io.undertow:undertow-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.tomlj:tomlj dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:development update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:development update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: io.leangen.geantyref:geantyref dependency-type: direct:development update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: com.squareup.okhttp3:okhttp dependency-type: direct:development update-type: version-update:semver-minor dependency-group: java-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
colincasey
approved these changes
May 15, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps the java-dependencies group with 20 updates:
3.15.33.16.13.11.03.13.03.2.23.2.53.3.03.4.13.1.13.1.23.1.13.1.23.4.53.5.03.6.03.7.10.8.110.8.123.3.03.3.13.6.23.6.33.1.03.2.42.35.12.35.21.11.01.12.02.2.28.Final2.2.32.Final1.1.01.1.12.16.02.17.02.16.02.17.01.3.141.3.154.10.04.12.0Updates
nl.jqno.equalsverifier:equalsverifierfrom 3.15.3 to 3.16.1Release notes
Sourced from nl.jqno.equalsverifier:equalsverifier's releases.
Changelog
Sourced from nl.jqno.equalsverifier:equalsverifier's changelog.
Commits
4d34147Bumps version to 3.16.1a776fc3Automatically generates next release version03b1f71Updates CHANGELOG for releasec16e40eMerge pull request #949 from jqno/fix-bounded-wildcard-generics0134b86Merge pull request #948 from jqno/dependabot/maven/version.jacoco-0.8.123946d85Bump version.jacoco from 0.8.11 to 0.8.12435c75fFixes argument type mismatch on wildcard fields of type with bounded generic9ab24e3Adds test case for bounded wildcard genericse79c4c0Merge pull request #945 from jqno/dependabot/maven/org.apache.maven.plugins-m...1b55c99Merge pull request #941 from jqno/dependabot/maven/com.google.guava-guava-33....Updates
org.apache.maven.plugins:maven-compiler-pluginfrom 3.11.0 to 3.13.0Release notes
Sourced from org.apache.maven.plugins:maven-compiler-plugin's releases.
... (truncated)
Commits
a1415aa[maven-release-plugin] prepare release maven-compiler-plugin-3.13.0b2b9196[MCOMPILER-574] Propagate cause of exception in AbstractCompilerMojo6d2ce5a[MCOMPILER-584] Refresh page - Using Non-Javac Compilerseebad60[MCOMPILER-585] Refresh plugins versions in ITsceacf68[MCOMPILER-582] Automatic detection of release option for JDK < 9110293f[MCOMPILER-583] Require Maven 3.6.390131df[MCOMPILER-575] Bump plexusCompilerVersion from 2.14.2 to 2.15.0 (#227)74cfc72[MCOMPILER-548] JDK 21 throws annotations processing warning that can not be ...f85aa27Bump apache/maven-gh-actions-shared from 3 to 4d59ef49extract Maven 3.3.1 specific method callUpdates
org.apache.maven.plugins:maven-surefire-pluginfrom 3.2.2 to 3.2.5Release notes
Sourced from org.apache.maven.plugins:maven-surefire-plugin's releases.
... (truncated)
Commits
4b3a271[maven-release-plugin] prepare release surefire-3.2.5eb3f1d9Bump org.codehaus.plexus:plexus-component-metadata from 2.1.1 to 2.2.0430c406Bump org.assertj:assertj-core from 3.24.2 to 3.25.12d92f2d[SUREFIRE-2231] JaCoCo 0.8.11 fails with old TestNG releases on Java 17+3290740Bump org.apache.maven.plugins:maven-docck-plugin from 1.1 to 1.225a9776Bump net.java.dev.javacc:javacc from 7.0.12 to 7.0.137752f7eBump commons-io:commons-io from 2.15.0 to 2.15.18874addRevert "Bump jacocoVersion from 0.8.8 to 0.8.11"c0f7755Fix formattinge5f4545Bump jacocoVersion from 0.8.8 to 0.8.11Updates
org.apache.maven.plugins:maven-jar-pluginfrom 3.3.0 to 3.4.1Release notes
Sourced from org.apache.maven.plugins:maven-jar-plugin's releases.
Commits
8b29adc[maven-release-plugin] prepare release maven-jar-plugin-3.4.1325b299[MJAR-308] Bump org.apache.maven.plugins:maven-plugins from 41 to 42 (#85)52111cc[MJAR-307] Wrong version of commons-io cause a ClassNotFound o.a.commons.io.f...902d4c5[maven-release-plugin] prepare for next development iteration992f44a[maven-release-plugin] prepare release maven-jar-plugin-3.4.05e31b99[MJAR-296] Allow including files excluded by default. (#67)ddfb635[MJAR-306] Use properties for plugins versions in LifecycleMappingaeffa39[MJAR-304] Refresh download pageee85d59[MJAR-303] Cleanup declared dependencies845c120Bump org.junit:junit-bom from 5.10.1 to 5.10.2Updates
org.apache.maven.plugins:maven-install-pluginfrom 3.1.1 to 3.1.2Release notes
Sourced from org.apache.maven.plugins:maven-install-plugin's releases.
Commits
e1494c1[maven-release-plugin] prepare release maven-install-plugin-3.1.26712ae8Remove workaround, handle it centrally1fa847fBump workflowbdc93d5Quickfix: move to zulu7b9bf51[MINSTALL-193] Parent 42, min Maven 3.6.3 (#64)e914367[MINSTALL-195] Include artifactId in InstallMojo#processProject messages3ebb448[MINSTALL-197] Update to parent 41, cleanup (#61)30d2b53[MINSTALL-192] - Code cleanups429ad5b[MNG-6829] Replace StringUtils#isEmpty(String) & #isNotEmpty(String) (#58)f6377c4configure notificationsUpdates
org.apache.maven.plugins:maven-deploy-pluginfrom 3.1.1 to 3.1.2Release notes
Sourced from org.apache.maven.plugins:maven-deploy-plugin's releases.
Commits
4f016bc[maven-release-plugin] prepare release maven-deploy-plugin-3.1.20ed18beRemove workaround, handle it centrallyb9c1c8b[MDEPLOY-314] Include artifactId in DeployMojo#processProject messages74d331b[MDEPLOY-316] Parent 42 and prerequisite 3.6.3 (#54)ac9c49dBump org.mockito:mockito-core from 2.28.2 to 4.11.0de7cefbBump apache/maven-gh-actions-shared from 3 to 4edf85d7Add Dependabot390e610[MDEPLOY-313] Update to parent 41, cleanup (#47)29f3c81DeployFileMojo#readModel(File): fixed MojoExecutionException javadoc9039fc6Type: fill --> fileUpdates
org.apache.maven.plugins:maven-project-info-reports-pluginfrom 3.4.5 to 3.5.0Commits
28ac4b5[maven-release-plugin] prepare release maven-project-info-reports-plugin-3.5.09c4fc33Remove unneeded incompatiblity notice482ea62Fix formatting60cfdea[MPIR-453] Replace Commons IO in favor of standard APIs4d94edc[MPIR-446] Update to Maven SCM 2.0.91a065b[MPIR-452] Upgrade to Parent 41ceac0bfConsistently use MavenReport#getReportOutputDirectory()c16ec94[MNG-7416] Simplify Boolean expressions and returns (#63)abd0e76Fix style value18aedbbReduce IT runtime by invoking goal directlyUpdates
org.apache.maven.plugins:maven-assembly-pluginfrom 3.6.0 to 3.7.1Release notes
Sourced from org.apache.maven.plugins:maven-assembly-plugin's releases.
... (truncated)
Commits
0afbb3e[maven-release-plugin] prepare release maven-assembly-plugin-3.7.174e858a[MASSEMBLY-1022] Unresolved artifacts should be not processedcb56382[MASSEMBLY-1025] Bump org.codehaus.plexus:plexus-archiver from 4.9.1 to 4.9.2...86bbed0[MASSEMBLY-1024] Bump org.apache.commons:commons-compress from 1.25.0 to 1.26...bdcc4d0[MASSEMBLY-1023] Bump org.apache.maven.shared:maven-filtering from 3.3.1 to 3...74fe92e[maven-release-plugin] prepare for next development iteration9be6e87[maven-release-plugin] prepare release maven-assembly-plugin-3.7.0e8630dcBump apache/maven-gh-actions-shared from 3 to 498f97a5Bump org.postgresql:postgresql in /src/it/projects/bugs/massembly-730c84e110[MASSEMBLY-1019] Maven 3.6.3 as minimum requirementsUpdates
org.jacoco:jacoco-maven-pluginfrom 0.8.11 to 0.8.12Release notes
Sourced from org.jacoco:jacoco-maven-plugin's releases.
Commits
dbfb6f2Prepare release 0.8.12a50585bUpgrade maven-plugin-plugin to 3.6.4 (#1604)fd63cc5Configure labels that Dependabot assigns to PRs (#1603)03a5333Add configuration for Dependabot to simplify updates of ASM (#1601)40ff9fbUpgrade ASM to 9.7 (#1600)9077178Happy birthday Java 22! (#1596)7edd1b5Bump actions/setup-java from 4.1.0 to 4.2.1 (#1594)e50b547Upgrade ECJ to 3.37.0 (#1590)a1144d0Upgrade maven-site-plugin to 3.12.1 (#1586)04b0141Bump actions/setup-java from 4.0.0 to 4.1.0 (#1587)Updates
org.apache.maven.plugins:maven-source-pluginfrom 3.3.0 to 3.3.1Commits
f80596e[maven-release-plugin] prepare release maven-source-plugin-3.3.17626998Bump apache/maven-gh-actions-shared from 3 to 483c963cBump org.apache.maven.plugins:maven-plugins from 39 to 41 (#18)40ae495Bump org.codehaus.plexus:plexus-archiver from 4.8.0 to 4.9.1 (#20)073462bBump org.apache.maven:maven-archiver from 3.6.0 to 3.6.1 (#21)0b1c823Fix typos in AbstractSourceJarMojo exception099c65a[MSOURCES-142] Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 (...1edeea4[MSOURCES-139] Fix typo in AbstractSourceJarMojo exception436966e[maven-release-plugin] prepare for next development iterationUpdates
org.apache.maven.plugins:maven-javadoc-pluginfrom 3.6.2 to 3.6.3Commits
8205008[maven-release-plugin] prepare release maven-javadoc-plugin-3.6.3b69af90[MJAVADOC-682] Reactor builds fail when multiple modules with same groupId:ar...b47b280directory, not folder488624f[MJAVADOC-782] Align read-only parameters naming with other plugins867dc73[MJAVADOC-781] Upgrade plugins and components (in ITs)0104ab2Fix incorrect config in test-javadoc-test-plugin-config.xmldd39c0c[MJAVADOC-780] add missing plugin configuratione6e6180Remove junk from 692d7a8a9918efd24633a44f0f3d4dfd22d0fec4692d7a8[MJAVADOC-779] - Upgrade maven-plugin parent to 41386d4eaRemove dead linkUpdates
org.apache.maven.plugins:maven-gpg-pluginfrom 3.1.0 to 3.2.4Release notes
Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.
... (truncated)
Commits
789149e[maven-release-plugin] prepare release maven-gpg-plugin-3.2.4893aedc[MGPG-125] Fix "bestPractices" (#95)b6f0324[MGPG-126] Bump commons-io:commons-io from 2.16.0 to 2.16.1 (#94)3c5878b[maven-release-plugin] prepare for next development iteration89b91a4[maven-release-plugin] prepare release maven-gpg-plugin-3.2.3fc2efa3[MGPG-123][MGPG-124] Dependency upgrades (#93)50222d3[MGPG-120] New mojo sign-deployed (#88)a6c3a09[MGPG-122] Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.0 to 3...78f5e37[MGPG-121] Return the workaround for pseudo security (#90)582df74[MGPG-117] Improve passphrase handling (#86)Updates
com.github.tomakehurst:wiremock-jre8from 2.35.1 to 2.35.2Commits
e032c4aBumped patch versionc20a913Disable XML External Entities (#2607)Updates
org.apache.commons:commons-textfrom 1.11.0 to 1.12.0Updates
io.undertow:undertow-corefrom 2.2.28.Final to 2.2.32.FinalCommits
3ecaed9Prepare 2.2.32.Final00b0d8fMerge pull request #1584 from gaol/enforce_jdk8_for_2.2c72db34Merge pull request #1583 from fl4via/2.2.x_backport-fixes95712b5[UNDERTOW-2376] Enforce build of 2.2.x with JDK8c92301d[UNDERTOW-2375] Minor fixes in contributing guide: broken links, types, style...b289b18[UNDERTOW-2264] CVE-2023-1973 Force session timeout to 2 minutes when session...9e1eaeb[UNDERTOW-2374] Move the check for allowUnescapedCharactersInUrl to outside o...02fa346Merge pull request #1572 from gaol/JBEAP-26756