Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade commons libs, asm, jgit, jna, jackson, felix, jacoco and junit #7237

Merged
merged 13 commits into from
Apr 8, 2024
Merged

Upgrade commons libs, asm, jgit, jna, jackson, felix, jacoco and junit #7237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c761a59
stabilize PHPCCDocumentationTest#testDNFTypesMethodTag test
mbien Apr 7, 2024
15cbc0a
CI: hack to shorten windows file paths for PHP job
mbien Apr 6, 2024
e1bb040
Upgrade commons-codec from 1.16.0 to 1.16.1
mbien Apr 3, 2024
ae59d83
Upgrade commons-io from 2.15.1 to 2.16.0
mbien Apr 3, 2024
7b48bc7
Upgrade commons-logging from 1.3.0 to 1.3.1
mbien Apr 3, 2024
02601a4
Upgrade commons-compress from 1.25.0 to 1.26.1
mbien Apr 3, 2024
10b9d58
Upgrade ASM from 9.6 to 9.7
mbien Apr 3, 2024
a13a685
Upgrade jgit from 9.8.0 to 9.9.0
mbien Apr 3, 2024
ff5008a
Upgrade felix from 7.0.3 to 7.0.5
mbien Apr 3, 2024
1e122c7
Upgrade JNA from 5.12.1 to 5.14.0
mbien Apr 3, 2024
1c31e1a
Upgrade junit from 5.6.0 to 5.10.2
mbien Apr 3, 2024
61c274f
Upgrade jacoco.core from 0.8.7 to 0.8.12
mbien Apr 3, 2024
51ed34f
Upgrade jackson from 2.16.1 to 2.17.0
mbien Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2417,8 +2417,22 @@ jobs:
exclude:
- os: ${{ (contains(github.event.pull_request.labels.*.name, 'PHP') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request') && 'nothing' || 'windows-latest' }}
fail-fast: false
defaults:
run:
# hack: shorten paths to stay below 32k char process arg limit of windows (symptom: junit jvm spawn failures)
# note 'a' is apparently a mount point, we shouldn't go below that
# note actions don't care about the defaults here, its just for 'run:', they will keep using the long path which is fine
working-directory: ${{ contains(matrix.os, 'windows') && 'D:\\a\\ws' || github.workspace }}
shell: bash

steps:

- name: Symlink short paths for windows
if: contains(matrix.os, 'windows')
run: mklink /d D:\\a\\ws ${{ github.workspace }}
working-directory: ${{ github.workspace }}
shell: cmd

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
Expand Down
12 changes: 6 additions & 6 deletions enterprise/libs.jackson/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.

FD441D574A71E7D10A4F73DE6609F881D8CDFEEC com.fasterxml.jackson.core:jackson-annotations:2.16.1
9456BB3CDD0F79F91A5F730A1B1BB041A380C91F com.fasterxml.jackson.core:jackson-core:2.16.1
02A16EFEB840C45AF1E2F31753DFE76795278B73 com.fasterxml.jackson.core:jackson-databind:2.16.1
1BE7098DCCC079171464DCA7E386BD8DF623B031 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.16.1
36A418325C618E440E5CCB80B75C705D894F50BD com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1
E9DF364A2695E66EB8D2803D6725424842760125 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.16.1
880A742337010DA4C851F843D8CAC150E22DFF9F com.fasterxml.jackson.core:jackson-annotations:2.17.0
A6E5058EF9720623C517252D17162F845306FF3A com.fasterxml.jackson.core:jackson-core:2.17.0
7173E9E1D4BC6D7CA03BC4EEEDCD548B8B580B34 com.fasterxml.jackson.core:jackson-databind:2.17.0
6833C8573452D583E4AF650A7424D547606B2501 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.0
3FAB507BBA9D477E52ED2302DC3DDBD23CBAE339 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0
E07032CE170277213AC4835169CA79FA0340C7B5 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.0
4 changes: 2 additions & 2 deletions ...ckson/external/jackson-2.16.1-license.txt → ...ckson/external/jackson-2.17.0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Name: Jackson
Description: Jackson is a high-performance JSON processor for Java.
License: Apache-2.0
Origin: https://github.com/FasterXML/jackson
Version: 2.16.1
Files: jackson-annotations-2.16.1.jar, jackson-core-2.16.1.jar, jackson-databind-2.16.1.jar, jackson-dataformat-cbor-2.16.1.jar, jackson-datatype-jsr310-2.16.1.jar, jackson-module-jaxb-annotations-2.16.1.jar
Version: 2.17.0
Files: jackson-annotations-2.17.0.jar, jackson-core-2.17.0.jar, jackson-databind-2.17.0.jar, jackson-dataformat-cbor-2.17.0.jar, jackson-datatype-jsr310-2.17.0.jar, jackson-module-jaxb-annotations-2.17.0.jar


Apache License
Expand Down
318 changes: 249 additions & 69 deletions enterprise/libs.jackson/nbproject/org-netbeans-libs-jackson.sig
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions enterprise/libs.jackson/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
sigtest.gen.fail.on.error=false
release.external/jackson-annotations-2.16.1.jar=modules/ext/jackson/jackson-annotations-2.16.1.jar
release.external/jackson-core-2.16.1.jar=modules/ext/jackson/jackson-core-2.16.1.jar
release.external/jackson-databind-2.16.1.jar=modules/ext/jackson/jackson-databind-2.16.1.jar
release.external/jackson-dataformat-cbor-2.16.1.jar=modules/ext/jackson/jackson-dataformat-cbor-2.16.1.jar
release.external/jackson-datatype-jsr310-2.16.1.jar=modules/ext/jackson/jackson-datatype-jsr310-2.16.1.jar
release.external/jackson-module-jaxb-annotations-2.16.1.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.16.1.jar
release.external/jackson-annotations-2.17.0.jar=modules/ext/jackson/jackson-annotations-2.17.0.jar
release.external/jackson-core-2.17.0.jar=modules/ext/jackson/jackson-core-2.17.0.jar
release.external/jackson-databind-2.17.0.jar=modules/ext/jackson/jackson-databind-2.17.0.jar
release.external/jackson-dataformat-cbor-2.17.0.jar=modules/ext/jackson/jackson-dataformat-cbor-2.17.0.jar
release.external/jackson-datatype-jsr310-2.17.0.jar=modules/ext/jackson/jackson-datatype-jsr310-2.17.0.jar
release.external/jackson-module-jaxb-annotations-2.17.0.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.17.0.jar
24 changes: 12 additions & 12 deletions enterprise/libs.jackson/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,28 +85,28 @@
<package>com.fasterxml.jackson.module.jaxb.ser</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/jackson/jackson-annotations-2.16.1.jar</runtime-relative-path>
<binary-origin>external/jackson-annotations-2.16.1.jar</binary-origin>
<runtime-relative-path>ext/jackson/jackson-annotations-2.17.0.jar</runtime-relative-path>
<binary-origin>external/jackson-annotations-2.17.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jackson/jackson-core-2.16.1.jar</runtime-relative-path>
<binary-origin>external/jackson-core-2.16.1.jar</binary-origin>
<runtime-relative-path>ext/jackson/jackson-core-2.17.0.jar</runtime-relative-path>
<binary-origin>external/jackson-core-2.17.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jackson/jackson-databind-2.16.1.jar</runtime-relative-path>
<binary-origin>external/jackson-databind-2.16.1.jar</binary-origin>
<runtime-relative-path>ext/jackson/jackson-databind-2.17.0.jar</runtime-relative-path>
<binary-origin>external/jackson-databind-2.17.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jackson/jackson-dataformat-cbor-2.16.1.jar</runtime-relative-path>
<binary-origin>external/jackson-dataformat-cbor-2.16.1.jar</binary-origin>
<runtime-relative-path>ext/jackson/jackson-dataformat-cbor-2.17.0.jar</runtime-relative-path>
<binary-origin>external/jackson-dataformat-cbor-2.17.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jackson/jackson-datatype-jsr310-2.16.1.jar</runtime-relative-path>
<binary-origin>external/jackson-datatype-jsr310-2.16.1.jar</binary-origin>
<runtime-relative-path>ext/jackson/jackson-datatype-jsr310-2.17.0.jar</runtime-relative-path>
<binary-origin>external/jackson-datatype-jsr310-2.17.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jackson/jackson-module-jaxb-annotations-2.16.1.jar</runtime-relative-path>
<binary-origin>external/jackson-module-jaxb-annotations-2.16.1.jar</binary-origin>
<runtime-relative-path>ext/jackson/jackson-module-jaxb-annotations-2.17.0.jar</runtime-relative-path>
<binary-origin>external/jackson-module-jaxb-annotations-2.17.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ...aEWAH/external/JavaEWAH-1.1.6-license.txt → ...aEWAH/external/JavaEWAH-1.2.3-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: JavaEWAH
Version: 1.1.6
Version: 1.2.3
License: Apache-2.0
Origin: JavaEWAH Project
URL: https://github.com/lemire/javaewah
Expand Down
2 changes: 1 addition & 1 deletion ide/c.googlecode.javaewah.JavaEWAH/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
94AD16D728B374D65BD897625F3FBB3DA223A2B6 com.googlecode.javaewah:JavaEWAH:1.1.6
13A27C856E0C8808CEE9A64032C58EEE11C3ADC9 com.googlecode.javaewah:JavaEWAH:1.2.3
2 changes: 1 addition & 1 deletion ide/c.googlecode.javaewah.JavaEWAH/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
release.external/JavaEWAH-1.1.6.jar=modules/com-googlecode-javaewah-JavaEWAH.jar
release.external/JavaEWAH-1.2.3.jar=modules/com-googlecode-javaewah-JavaEWAH.jar
2 changes: 1 addition & 1 deletion ide/c.googlecode.javaewah.JavaEWAH/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>com-googlecode-javaewah-JavaEWAH.jar</runtime-relative-path>
<binary-origin>external/JavaEWAH-1.1.6.jar</binary-origin>
<binary-origin>external/JavaEWAH-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
8 changes: 8 additions & 0 deletions ide/db.dataview/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<code-name-base>org.netbeans.modules.db.dataview</code-name-base>
<module-dependencies>
<dependency>
<code-name-base>org.apache.commons.commons_io</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>2.15</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress</code-name-base>
<build-prerequisite/>
Expand Down
2 changes: 1 addition & 1 deletion ide/libs.commons_compress/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
9D35AEC423DA6C8A7F93D7E9E1C6B1D9FE14BB5E org.apache.commons:commons-compress:1.25.0
44331C1130C370E726A2E1A3E6FBA6D2558EF04A org.apache.commons:commons-compress:1.26.1
2 changes: 1 addition & 1 deletion ...ernal/commons-compress-1.25.0-license.txt → ...ernal/commons-compress-1.26.1-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: Commons Compress
Version: 1.25.0
Version: 1.26.1
Description: The Apache Commons Compress library defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files.
Origin: https://commons.apache.org/proper/commons-compress/index.html
License: Apache-2.0
Expand Down
0 ...ternal/commons-compress-1.25.0-notice.txt → ...ternal/commons-compress-1.26.1-notice.txt
View file
Open in desktop
File renamed without changes.
Loading
Loading