Skip to content

Commit 937a0f0

Browse files
albertus82albertus82
committed
Updates.
1 parent edb735a commit 937a0f0

File tree

6 files changed

+68
-54
lines changed

6 files changed

+68
-54
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
java: [ '11', '17', '21' ]
11+
java: [ '17', '21', '25' ]
1212
os: [ windows-latest, ubuntu-latest, macOS-latest ]
1313
runs-on: ${{ matrix.os }}
1414
env:
1515
MAVEN_OPTS: -Dhttp.keepAlive=false
1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-java@v4
17+
- uses: actions/checkout@v6
18+
- uses: actions/setup-java@v5
1919
with:
2020
distribution: zulu
2121
java-version: ${{ matrix.java }}
@@ -27,7 +27,7 @@ jobs:
2727
sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
2828
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/noble/winehq-noble.sources
2929
sudo apt-get update && sudo apt-get install -y --install-recommends wine-devel-i386:i386 winehq-stable
30-
- uses: actions/cache@v3
30+
- uses: actions/cache@v5
3131
with:
3232
path: ~/.m2/repository
3333
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/codeql.yml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
# the `language` matrix defined below to confirm you have the correct set of
1010
# supported CodeQL languages.
1111
#
12-
name: "CodeQL"
12+
name: "CodeQL Advanced"
1313

1414
on:
1515
push:
16-
branches: [ "master", "v*" ]
16+
branches: [ "main", "master", "v*" ]
1717
pull_request:
18-
branches: [ "master", "v*" ]
18+
branches: [ "main", "master", "v*" ]
1919
schedule:
2020
- cron: '27 17 * * 5'
2121

@@ -28,7 +28,6 @@ jobs:
2828
# - https://gh.io/using-larger-runners (GitHub.com only)
2929
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
3030
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31-
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
3231
permissions:
3332
# required for all workflows
3433
security-events: write
@@ -44,9 +43,11 @@ jobs:
4443
fail-fast: false
4544
matrix:
4645
include:
46+
- language: actions
47+
build-mode: none
4748
- language: java-kotlin
4849
build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
49-
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
50+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
5051
# Use `c-cpp` to analyze code written in C, C++ or both
5152
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
5253
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
@@ -56,9 +57,14 @@ jobs:
5657
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5758
steps:
5859
- name: Checkout repository
59-
uses: actions/checkout@v4
60+
uses: actions/checkout@v6
6061

61-
- uses: actions/cache@v3
62+
# Add any setup steps before running the `github/codeql-action/init` action.
63+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
64+
# or others). This is typically only required for manual builds.
65+
# - name: Setup runtime (example)
66+
# uses: actions/setup-example@v1
67+
- uses: actions/cache@v5
6268
with:
6369
path: ~/.m2/repository
6470
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -70,7 +76,7 @@ jobs:
7076

7177
# Initializes the CodeQL tools for scanning.
7278
- name: Initialize CodeQL
73-
uses: github/codeql-action/init@v3
79+
uses: github/codeql-action/init@v4
7480
with:
7581
languages: ${{ matrix.language }}
7682
build-mode: ${{ matrix.build-mode }}
@@ -87,7 +93,8 @@ jobs:
8793
# to build your code.
8894
# ℹ️ Command-line programs to run using the OS shell.
8995
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
90-
- if: matrix.build-mode == 'manual'
96+
- name: Run manual build steps
97+
if: matrix.build-mode == 'manual'
9198
shell: bash
9299
run: |
93100
echo 'If you are using a "manual" build mode for one or more of the' \
@@ -98,6 +105,6 @@ jobs:
98105
exit 1
99106
100107
- name: Perform CodeQL Analysis
101-
uses: github/codeql-action/analyze@v3
108+
uses: github/codeql-action/analyze@v4
102109
with:
103110
category: "/language:${{matrix.language}}"

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
env:
1414
MAVEN_OPTS: -Dhttp.keepAlive=false
1515
steps:
16-
- uses: actions/checkout@v4
17-
- uses: actions/setup-java@v4
16+
- uses: actions/checkout@v6
17+
- uses: actions/setup-java@v5
1818
with:
1919
distribution: temurin
20-
java-version: 17
20+
java-version: 25
2121
- run: mvn clean verify -B -V -e -ntp
22-
- uses: ncipollo/release-action@v1
22+
- uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b
2323
with:
2424
artifacts: target/*.exe, target/*.tar.gz, target/*.zip
2525
bodyFile: target/checksums.md

‎.github/workflows/sonar.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
env:
1010
MAVEN_OPTS: -Dhttp.keepAlive=false
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
15-
- uses: actions/setup-java@v4
15+
- uses: actions/setup-java@v5
1616
with:
1717
distribution: temurin
18-
java-version: 17
19-
- uses: actions/cache@v3
18+
java-version: 25
19+
- uses: actions/cache@v5
2020
with:
2121
path: ~/.m2/repository
2222
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
Compression=lzma2
139139
SolidCompression=yes
140140
CloseApplications=no
141-
ArchitecturesAllowed=x86
141+
ArchitecturesAllowed=x86os
142142

143143
[Languages]
144144
Name: "English"; MessagesFile: "compiler:Default.isl"; LicenseFile: "${project.name}\LICENSE.txt"
@@ -192,8 +192,8 @@
192192
Compression=lzma2
193193
SolidCompression=yes
194194
CloseApplications=no
195-
ArchitecturesAllowed=x64
196-
ArchitecturesInstallIn64BitMode=x64
195+
ArchitecturesAllowed=x64compatible
196+
ArchitecturesInstallIn64BitMode=x64compatible
197197

198198
[Languages]
199199
Name: "English"; MessagesFile: "compiler:Default.isl"; LicenseFile: "${project.name}\LICENSE.txt"

‎pom.xml‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<maven.version.rules>${project.baseUri}maven-version-rules.xml</maven.version.rules>
4646
<swt.version>3.116.100</swt.version> <!-- Last version compatible with JRE 8 -->
4747
<jface.version>3.22.200</jface.version> <!-- Last version compatible with JRE 8 -->
48-
<lombok.version>1.18.32</lombok.version>
49-
<picocli.version>4.7.5</picocli.version>
48+
<lombok.version>1.18.42</lombok.version>
49+
<picocli.version>4.7.7</picocli.version>
5050
<windows.build.finalName>${project.name}</windows.build.finalName>
5151
<linux.build.finalName>${project.artifactId}</linux.build.finalName>
5252
<mac.build.finalName>${project.name}</mac.build.finalName>
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>io.github.albertus82</groupId>
7777
<artifactId>jface-utils</artifactId>
78-
<version>20.0.0</version>
78+
<version>20.2.0</version>
7979
<exclusions>
8080
<exclusion>
8181
<groupId>org.eclipse.platform</groupId>
@@ -87,7 +87,7 @@
8787
<groupId>io.github.albertus82</groupId>
8888
<artifactId>unexepack</artifactId>
8989
<version>0.3.1</version>
90-
</dependency>
90+
</dependency>
9191
<dependency>
9292
<groupId>org.eclipse.platform</groupId>
9393
<artifactId>org.eclipse.core.commands</artifactId>
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>org.eclipse.platform</groupId>
9898
<artifactId>org.eclipse.osgi</artifactId>
99-
<version>3.19.0</version>
99+
<version>3.24.0</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>org.eclipse.draw2d.plugins</groupId>
@@ -141,19 +141,19 @@
141141
<dependency>
142142
<groupId>org.junit.jupiter</groupId>
143143
<artifactId>junit-jupiter</artifactId>
144-
<version>5.10.2</version>
144+
<version>6.0.2</version>
145145
<scope>test</scope>
146146
</dependency>
147147
<dependency>
148-
<groupId>commons-io</groupId>
149-
<artifactId>commons-io</artifactId>
150-
<version>2.16.1</version>
148+
<groupId>commons-codec</groupId>
149+
<artifactId>commons-codec</artifactId>
150+
<version>1.20.0</version>
151151
<scope>test</scope>
152152
</dependency>
153153
<dependency>
154-
<groupId>commons-codec</groupId>
155-
<artifactId>commons-codec</artifactId>
156-
<version>1.16.1</version>
154+
<groupId>commons-io</groupId>
155+
<artifactId>commons-io</artifactId>
156+
<version>2.21.0</version>
157157
<scope>test</scope>
158158
</dependency>
159159
</dependencies>
@@ -679,17 +679,17 @@
679679
<plugin>
680680
<groupId>org.apache.maven.plugins</groupId>
681681
<artifactId>maven-surefire-plugin</artifactId>
682-
<version>3.0.0</version>
682+
<version>3.5.4</version>
683683
</plugin>
684684
<plugin>
685685
<groupId>org.apache.maven.plugins</groupId>
686686
<artifactId>maven-antrun-plugin</artifactId>
687-
<version>3.1.0</version>
687+
<version>3.2.0</version>
688688
</plugin>
689689
<plugin>
690690
<groupId>org.apache.maven.plugins</groupId>
691691
<artifactId>maven-dependency-plugin</artifactId>
692-
<version>3.5.0</version>
692+
<version>3.9.0</version>
693693
</plugin>
694694
<plugin>
695695
<groupId>org.sonarsource.scanner.maven</groupId>
@@ -703,7 +703,7 @@
703703
<plugin>
704704
<groupId>org.apache.maven.plugins</groupId>
705705
<artifactId>maven-clean-plugin</artifactId>
706-
<version>3.2.0</version>
706+
<version>3.5.0</version>
707707
<configuration>
708708
<excludeDefaultDirectories>true</excludeDefaultDirectories>
709709
<filesets>
@@ -723,16 +723,23 @@
723723
<plugin>
724724
<groupId>org.apache.maven.plugins</groupId>
725725
<artifactId>maven-compiler-plugin</artifactId>
726-
<version>3.11.0</version>
726+
<version>3.14.1</version>
727727
<configuration>
728728
<compilerArgument>-Xlint:all</compilerArgument>
729+
<annotationProcessorPaths>
730+
<path>
731+
<groupId>org.projectlombok</groupId>
732+
<artifactId>lombok</artifactId>
733+
<version>${lombok.version}</version>
734+
</path>
735+
</annotationProcessorPaths>
729736
</configuration>
730737
</plugin>
731738

732739
<plugin>
733740
<groupId>io.github.git-commit-id</groupId>
734741
<artifactId>git-commit-id-maven-plugin</artifactId>
735-
<version>5.0.0</version>
742+
<version>9.0.2</version>
736743
<executions>
737744
<execution>
738745
<goals>
@@ -750,7 +757,7 @@
750757
<plugin>
751758
<groupId>org.apache.maven.plugins</groupId>
752759
<artifactId>maven-jar-plugin</artifactId>
753-
<version>3.3.0</version>
760+
<version>3.5.0</version>
754761
<configuration>
755762
<archive>
756763
<manifestEntries>
@@ -771,7 +778,7 @@
771778
<plugin>
772779
<groupId>org.apache.maven.plugins</groupId>
773780
<artifactId>maven-enforcer-plugin</artifactId>
774-
<version>3.3.0</version>
781+
<version>3.6.2</version>
775782
<executions>
776783
<execution>
777784
<goals>
@@ -780,13 +787,14 @@
780787
<configuration>
781788
<rules>
782789
<requireJavaVersion>
783-
<version>11</version>
790+
<version>17</version>
784791
</requireJavaVersion>
785792
<requireMavenVersion>
786793
<version>3.6.3</version>
787794
</requireMavenVersion>
788795
<enforceBytecodeVersion>
789796
<maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
797+
<ignoredScopes>test</ignoredScopes>
790798
</enforceBytecodeVersion>
791799
</rules>
792800
</configuration>
@@ -796,15 +804,15 @@
796804
<dependency>
797805
<groupId>org.codehaus.mojo</groupId>
798806
<artifactId>extra-enforcer-rules</artifactId>
799-
<version>1.8.0</version>
807+
<version>1.11.0</version>
800808
</dependency>
801809
</dependencies>
802810
</plugin>
803811

804812
<plugin>
805813
<groupId>org.jacoco</groupId>
806814
<artifactId>jacoco-maven-plugin</artifactId>
807-
<version>0.8.9</version>
815+
<version>0.8.14</version>
808816
<executions>
809817
<execution>
810818
<id>default-prepare-agent</id>
@@ -824,7 +832,7 @@
824832
<plugin>
825833
<groupId>org.codehaus.mojo</groupId>
826834
<artifactId>versions-maven-plugin</artifactId>
827-
<version>2.15.0</version>
835+
<version>2.20.1</version>
828836
<executions>
829837
<execution>
830838
<phase>verify</phase>
@@ -899,7 +907,7 @@
899907
<plugin>
900908
<groupId>org.apache.maven.plugins</groupId>
901909
<artifactId>maven-assembly-plugin</artifactId>
902-
<version>3.5.0</version>
910+
<version>3.8.0</version>
903911
<configuration>
904912
<finalName>${assembly.finalName}</finalName>
905913
<outputDirectory>${assembly.outputDirectory}</outputDirectory>
@@ -920,7 +928,7 @@
920928
<plugin>
921929
<groupId>org.apache.maven.plugins</groupId>
922930
<artifactId>maven-invoker-plugin</artifactId>
923-
<version>3.5.1</version>
931+
<version>3.9.1</version>
924932
<configuration>
925933
<pom>pom.xml</pom>
926934
<streamLogs>true</streamLogs>
@@ -1022,7 +1030,7 @@
10221030
<plugin>
10231031
<groupId>org.apache.maven.plugins</groupId>
10241032
<artifactId>maven-help-plugin</artifactId>
1025-
<version>3.4.0</version>
1033+
<version>3.5.1</version>
10261034
<executions>
10271035
<execution>
10281036
<?m2e ignore?>
@@ -1038,7 +1046,7 @@
10381046

10391047
<repositories>
10401048
<repository>
1041-
<id>${project.groupId}_${project.artifactId}</id>
1049+
<id>${project.groupId}_${project.artifactId}_local</id>
10421050
<url>${project.baseUri}mvn/repository</url>
10431051
</repository>
10441052
<repository>
@@ -1054,4 +1062,3 @@
10541062
</repositories>
10551063

10561064
</project>
1057-

0 commit comments

Comments
 (0)