Merge branch 'main' into dependabot/gradle/org.jline-jline-3.24.1

remkop · Dec 16, 2023 · dbc64bd · dbc64bd
2 parents 2ee47d3 + 8cf5451
commit dbc64bd
Show file tree

Hide file tree

Showing 28 changed files with 1,377 additions and 1,374 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,12 +15,12 @@ jobs:
  continue-on-error: ${{ matrix.os == 'macos-latest' || matrix.java-version == '9' || matrix.java-version == '10' || matrix.java-version == '12' || matrix.java-version == '13' || matrix.java-version == '14' || matrix.java-version == '15' || matrix.java-version == '16' || matrix.java-version == '19' }}
  steps:
  - name: Harden Runner
- uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v1
+ uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
  with:
  egress-policy: audit
 
  - name: Checkout
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2
 
  - name: Validate Gradle Wrapper
  uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1
@@ -130,12 +130,12 @@ jobs:
  runs-on: ${{ matrix.os }}
  steps:
  - name: Harden Runner
- uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v1
+ uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
  with:
  egress-policy: audit
 
  - name: Checkout
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2
 
  - name: Validate Gradle Wrapper
  uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -49,12 +49,12 @@ jobs:
 
  steps:
  - name: Harden Runner
- uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v1
+ uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
  with:
  egress-policy: audit
 
  - name: Checkout repository
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -31,7 +31,7 @@ jobs:
 
  steps:
  - name: "Checkout code"
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v2.4.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2.4.0
  with:
  persist-credentials: false
 

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -27,6 +27,7 @@ Artifacts in this release are signed by Remko Popma (6601 E5C0 8DCC BB96).
 
 * [#2102][#2107] Enhancement: `PropertiesDefaultProvider` should try to load properties from classpath (last). Thanks to [Lumír Návrat](https://github.com/rimuln) for the pull request.
 * [#2058] Bugfix: `defaultValue` should not be applied in addition to user-specified value for options with a custom `IParameterConsumer`. Thanks to [Staffan Arvidsson McShane](https://github.com/StaffanArvidsson) for raising this.
+* [#2148] Bugfix: Fix NPE in jline3 `Example.jar` as `ConfigurationPath` cannot be `null` anymore. Thanks to [llzen44](https://github.com/llzen44) for the pull request.
 * [#2047] DEP: Bump andymckay/append-gist-action from 1fbfbbce708a39bd45846f0955ed5521f2099c6d to 6e8d64427fe47cbacf4ab6b890411f1d67c07f3e
 * [#2091] DEP: Bump actions/checkout from 3.5.2 to 3.6.0
 * [#2108] DEP: Bump actions/checkout from 3.6.0 to 4.0.0

diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
  classpath "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradlePluginVersion"
  classpath 'org.asciidoctor:asciidoctorj-pdf:2.3.9'
  classpath "org.beryx:badass-jar:2.0.0"
- classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0'
+ classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:7.0.0'
  classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0"
  }
 }

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -19,12 +19,12 @@ ext {
  hamcrestCoreVersion = "2.2"
  ivyVersion = "2.5.2"
  jacocoVersion = "0.8.2"
- jansiVersion = "2.4.0"
+ jansiVersion = "2.4.1"
  jline2Version = "2.14.6"
  jline3Version = "3.24.1"
  junitDepVersion = "4.11"
  junitVersion = "4.13.2"
- log4j2Version = "2.20.0"
+ log4j2Version = "2.21.1"
  springBootVersion = "3.1.2" // Spring Boot 3.0 requires Java 17 as a minimum version
  systemRulesVersion = "1.19.0"
  systemLambdaVersion = '1.2.1'

diff --git a/docs/A-Whirlwind-Tour-of-Picocli.html b/docs/A-Whirlwind-Tour-of-Picocli.html
@@ -1564,81 +1564,81 @@
  });
 });
 </script>
-<style>
-.hidden {
- display: none;
-}
-
-.switch {
- border-width: 1px 1px 0 1px;
- border-style: solid;
- border-color: #7a2518;
- display: inline-block;
-}
-
-.switch--item {
- padding: 10px;
- background-color: #ffffff;
- color: #7a2518;
- display: inline-block;
- cursor: pointer;
-}
-
-.switch--item.selected {
- background-color: #7a2519;
- color: #ffffff;
-}
-
-</style>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/zepto/1.2.0/zepto.min.js"></script>
-<script type="text/javascript">
-function addBlockSwitches() {
- $('.primary').each(function() {
- primary = $(this);
- createSwitchItem(primary, createBlockSwitch(primary)).item.addClass("selected");
- primary.children('.title').remove();
- });
- $('.secondary').each(function(idx, node) {
- secondary = $(node);
- primary = findPrimary(secondary);
- switchItem = createSwitchItem(secondary, primary.children('.switch'));
- switchItem.content.addClass('hidden');
- findPrimary(secondary).append(switchItem.content);
- secondary.remove();
- });
-}
-
-function createBlockSwitch(primary) {
- blockSwitch = $('<div class="switch"></div>');
- primary.prepend(blockSwitch);
- return blockSwitch;
-}
-
-function findPrimary(secondary) {
- candidate = secondary.prev();
- while (!candidate.is('.primary')) {
- candidate = candidate.prev();
- }
- return candidate;
-}
-
-function createSwitchItem(block, blockSwitch) {
- blockName = block.children('.title').text();
- content = block.children('.content').first().append(block.next('.colist'));
- item = $('<div class="switch--item">' + blockName + '</div>');
- item.on('click', '', content, function(e) {
- $(this).addClass('selected');
- $(this).siblings().removeClass('selected');
- e.data.siblings('.content').addClass('hidden');
- e.data.removeClass('hidden');
- });
- blockSwitch.append(item);
- return {'item': item, 'content': content};
-}
-
-$(addBlockSwitches);
-
-</script>
+<style>
+.hidden {
+ display: none;
+}
+
+.switch {
+ border-width: 1px 1px 0 1px;
+ border-style: solid;
+ border-color: #7a2518;
+ display: inline-block;
+}
+
+.switch--item {
+ padding: 10px;
+ background-color: #ffffff;
+ color: #7a2518;
+ display: inline-block;
+ cursor: pointer;
+}
+
+.switch--item.selected {
+ background-color: #7a2519;
+ color: #ffffff;
+}
+
+</style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/zepto/1.2.0/zepto.min.js"></script>
+<script type="text/javascript">
+function addBlockSwitches() {
+ $('.primary').each(function() {
+ primary = $(this);
+ createSwitchItem(primary, createBlockSwitch(primary)).item.addClass("selected");
+ primary.children('.title').remove();
+ });
+ $('.secondary').each(function(idx, node) {
+ secondary = $(node);
+ primary = findPrimary(secondary);
+ switchItem = createSwitchItem(secondary, primary.children('.switch'));
+ switchItem.content.addClass('hidden');
+ findPrimary(secondary).append(switchItem.content);
+ secondary.remove();
+ });
+}
+
+function createBlockSwitch(primary) {
+ blockSwitch = $('<div class="switch"></div>');
+ primary.prepend(blockSwitch);
+ return blockSwitch;
+}
+
+function findPrimary(secondary) {
+ candidate = secondary.prev();
+ while (!candidate.is('.primary')) {
+ candidate = candidate.prev();
+ }
+ return candidate;
+}
+
+function createSwitchItem(block, blockSwitch) {
+ blockName = block.children('.title').text();
+ content = block.children('.content').first().append(block.next('.colist'));
+ item = $('<div class="switch--item">' + blockName + '</div>');
+ item.on('click', '', content, function(e) {
+ $(this).addClass('selected');
+ $(this).siblings().removeClass('selected');
+ e.data.siblings('.content').addClass('hidden');
+ e.data.removeClass('hidden');
+ });
+ blockSwitch.append(item);
+ return {'item': item, 'content': content};
+}
+
+$(addBlockSwitches);
+
+</script>
 
 </head>
 <body class="article">

diff --git a/docs/announcing-picocli-1.0.html b/docs/announcing-picocli-1.0.html
@@ -526,81 +526,81 @@
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
 </style>
-<style>
-.hidden {
- display: none;
-}
-
-.switch {
- border-width: 1px 1px 0 1px;
- border-style: solid;
- border-color: #7a2518;
- display: inline-block;
-}
-
-.switch--item {
- padding: 10px;
- background-color: #ffffff;
- color: #7a2518;
- display: inline-block;
- cursor: pointer;
-}
-
-.switch--item.selected {
- background-color: #7a2519;
- color: #ffffff;
-}
-
-</style>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/zepto/1.2.0/zepto.min.js"></script>
-<script type="text/javascript">
-function addBlockSwitches() {
- $('.primary').each(function() {
- primary = $(this);
- createSwitchItem(primary, createBlockSwitch(primary)).item.addClass("selected");
- primary.children('.title').remove();
- });
- $('.secondary').each(function(idx, node) {
- secondary = $(node);
- primary = findPrimary(secondary);
- switchItem = createSwitchItem(secondary, primary.children('.switch'));
- switchItem.content.addClass('hidden');
- findPrimary(secondary).append(switchItem.content);
- secondary.remove();
- });
-}
-
-function createBlockSwitch(primary) {
- blockSwitch = $('<div class="switch"></div>');
- primary.prepend(blockSwitch);
- return blockSwitch;
-}
-
-function findPrimary(secondary) {
- candidate = secondary.prev();
- while (!candidate.is('.primary')) {
- candidate = candidate.prev();
- }
- return candidate;
-}
-
-function createSwitchItem(block, blockSwitch) {
- blockName = block.children('.title').text();
- content = block.children('.content').first().append(block.next('.colist'));
- item = $('<div class="switch--item">' + blockName + '</div>');
- item.on('click', '', content, function(e) {
- $(this).addClass('selected');
- $(this).siblings().removeClass('selected');
- e.data.siblings('.content').addClass('hidden');
- e.data.removeClass('hidden');
- });
- blockSwitch.append(item);
- return {'item': item, 'content': content};
-}
-
-$(addBlockSwitches);
-
-</script>
+<style>
+.hidden {
+ display: none;
+}
+
+.switch {
+ border-width: 1px 1px 0 1px;
+ border-style: solid;
+ border-color: #7a2518;
+ display: inline-block;
+}
+
+.switch--item {
+ padding: 10px;
+ background-color: #ffffff;
+ color: #7a2518;
+ display: inline-block;
+ cursor: pointer;
+}
+
+.switch--item.selected {
+ background-color: #7a2519;
+ color: #ffffff;
+}
+
+</style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/zepto/1.2.0/zepto.min.js"></script>
+<script type="text/javascript">
+function addBlockSwitches() {
+ $('.primary').each(function() {
+ primary = $(this);
+ createSwitchItem(primary, createBlockSwitch(primary)).item.addClass("selected");
+ primary.children('.title').remove();
+ });
+ $('.secondary').each(function(idx, node) {
+ secondary = $(node);
+ primary = findPrimary(secondary);
+ switchItem = createSwitchItem(secondary, primary.children('.switch'));
+ switchItem.content.addClass('hidden');
+ findPrimary(secondary).append(switchItem.content);
+ secondary.remove();
+ });
+}
+
+function createBlockSwitch(primary) {
+ blockSwitch = $('<div class="switch"></div>');
+ primary.prepend(blockSwitch);
+ return blockSwitch;
+}
+
+function findPrimary(secondary) {
+ candidate = secondary.prev();
+ while (!candidate.is('.primary')) {
+ candidate = candidate.prev();
+ }
+ return candidate;
+}
+
+function createSwitchItem(block, blockSwitch) {
+ blockName = block.children('.title').text();
+ content = block.children('.content').first().append(block.next('.colist'));
+ item = $('<div class="switch--item">' + blockName + '</div>');
+ item.on('click', '', content, function(e) {
+ $(this).addClass('selected');
+ $(this).siblings().removeClass('selected');
+ e.data.siblings('.content').addClass('hidden');
+ e.data.removeClass('hidden');
+ });
+ blockSwitch.append(item);
+ return {'item': item, 'content': content};
+}
+
+$(addBlockSwitches);
+
+</script>
 
 </head>
 <body class="article">