Skip to content

Commit 1fe725e

Browse files
awisniew90awisniew90
authored
Merge pull request #604 from awisniew90/25012-version
Update to 25.0.12
2 parents 4552e7f + ca37b3c commit 1fe725e

File tree

15 files changed

+345
-87
lines changed

15 files changed

+345
-87
lines changed

‎.github/workflows/run-regression-tests.yml‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,39 @@ jobs:
2929
- name: 'Setup: Checkout plugin'
3030
uses: actions/checkout@v2
3131

32+
# Restore Maven and Tycho dependencies cache
33+
- name: 'Cache: Maven and Tycho repository (restore)'
34+
uses: actions/cache/restore@v4
35+
with:
36+
path: |
37+
~/.m2/repository
38+
!~/.m2/repository/io/openliberty/tools/eclipse
39+
key: ${{ runner.os }}-maven-tycho-${{ hashFiles('pom.xml', '.mvn/**', 'releng/**') }}
40+
restore-keys: |
41+
${{ runner.os }}-maven-tycho-
42+
43+
# Restore Gradle dependencies cache
44+
- name: 'Cache: Gradle (restore)'
45+
uses: actions/cache/restore@v4
46+
with:
47+
path: |
48+
~/.gradle/caches
49+
~/.gradle/wrapper
50+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
51+
restore-keys: |
52+
${{ runner.os }}-gradle-
53+
54+
# Restore downloaded tools cache (JDK, Maven, Gradle)
55+
- name: 'Cache: Downloaded tools (restore)'
56+
uses: actions/cache/restore@v4
57+
with:
58+
path: test-tools/liberty-dev-tools
59+
key: ${{ runner.os }}-tools-jdk21.0.3-maven3.9.6-gradle8.8
60+
restore-keys: |
61+
${{ runner.os }}-tools-
62+
3263
# Install the required software.
33-
- name: 'Setup: Install required software'
64+
- name: 'Setup: Install required software'
3465
run: bash ./tests/resources/ci/scripts/setup.sh
3566

3667
# Build the plugin.
@@ -50,3 +81,31 @@ jobs:
5081
with:
5182
name: test-app-logs
5283
path: logs
84+
85+
# Save Maven and Tycho dependencies cache (even on failure)
86+
- name: 'Cache: Maven and Tycho repository (save)'
87+
uses: actions/cache/save@v4
88+
if: always()
89+
with:
90+
path: |
91+
~/.m2/repository
92+
!~/.m2/repository/io/openliberty/tools/eclipse
93+
key: ${{ runner.os }}-maven-tycho-${{ hashFiles('pom.xml', '.mvn/**', 'releng/**') }}
94+
95+
# Save Gradle dependencies cache (even on failure)
96+
- name: 'Cache: Gradle (save)'
97+
uses: actions/cache/save@v4
98+
if: always()
99+
with:
100+
path: |
101+
~/.gradle/caches
102+
~/.gradle/wrapper
103+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
104+
105+
# Save downloaded tools cache (even on failure)
106+
- name: 'Cache: Downloaded tools (save)'
107+
uses: actions/cache/save@v4
108+
if: always()
109+
with:
110+
path: test-tools/liberty-dev-tools
111+
key: ${{ runner.os }}-tools-jdk21.0.3-maven3.9.6-gradle8.8

‎bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: Liberty Tools Support for Language Servers
55
Bundle-Vendor: Open Liberty
66
Bundle-SymbolicName: io.openliberty.tools.eclipse.lsp4e;singleton:=true
7-
Bundle-Version: 25.0.8.qualifier
7+
Bundle-Version: 25.0.12.qualifier
88
Bundle-Activator: io.openliberty.tools.eclipse.ls.plugin.LibertyToolsLSPlugin
99
Bundle-ActivationPolicy: lazy
1010
Automatic-Module-Name: io.openliberty.tools.eclipse.lsp4e

‎bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>io.openliberty.tools.eclipse</groupId>
2222
<artifactId>parent</artifactId>
23-
<version>25.0.8-SNAPSHOT</version>
23+
<version>25.0.12-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: Liberty Tools
55
Bundle-Vendor: Open Liberty
66
Bundle-SymbolicName: io.openliberty.tools.eclipse.product;singleton:=true
7-
Bundle-Version: 25.0.8.qualifier
7+
Bundle-Version: 25.0.12.qualifier
88
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Automatic-Module-Name: io.openliberty.tools.eclipse
1010
Bundle-ActivationPolicy: lazy

‎bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: Liberty Tools UI
55
Bundle-Vendor: Open Liberty
66
Bundle-SymbolicName: io.openliberty.tools.eclipse.ui;singleton:=true
7-
Bundle-Version: 25.0.8.qualifier
7+
Bundle-Version: 25.0.12.qualifier
88
Bundle-Activator: io.openliberty.tools.eclipse.LibertyDevPlugin
99
Export-Package: io.openliberty.tools.eclipse;x-friends:="io.openliberty.tools.eclipse.tests",
1010
io.openliberty.tools.eclipse.debug;x-friends:="io.openliberty.tools.eclipse.tests",

‎features/io.openliberty.tools.eclipse.feature/feature.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<feature
1515
id="io.openliberty.tools.eclipse"
1616
label="%featureName"
17-
version="25.0.8.qualifier"
17+
version="25.0.12.qualifier"
1818
plugin="io.openliberty.tools.eclipse.product"
1919
provider-name="%providerName">
2020

@@ -28,21 +28,21 @@
2828
id="io.openliberty.tools.eclipse.ui"
2929
download-size="0"
3030
install-size="0"
31-
version="25.0.8.qualifier"
31+
version="25.0.12.qualifier"
3232
unpack="false"/>
3333

3434
<plugin
3535
id="io.openliberty.tools.eclipse.lsp4e"
3636
download-size="0"
3737
install-size="0"
38-
version="25.0.8.qualifier"
38+
version="25.0.12.qualifier"
3939
unpack="false"/>
4040

4141
<plugin
4242
id="io.openliberty.tools.eclipse.product"
4343
download-size="0"
4444
install-size="0"
45-
version="25.0.8.qualifier"
45+
version="25.0.12.qualifier"
4646
unpack="false"/>
4747

4848
</feature>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<modelVersion>4.0.0</modelVersion>
1616
<groupId>io.openliberty.tools.eclipse</groupId>
1717
<artifactId>parent</artifactId>
18-
<version>25.0.8-SNAPSHOT</version>
18+
<version>25.0.12-SNAPSHOT</version>
1919
<packaging>pom</packaging>
2020
<licenses>
2121
<license>
@@ -196,7 +196,7 @@
196196
<artifact>
197197
<groupId>io.openliberty.tools.eclipse</groupId>
198198
<artifactId>target-platform-${eclipse.target}</artifactId>
199-
<version>25.0.8-SNAPSHOT</version>
199+
<version>25.0.12-SNAPSHOT</version>
200200
<file>target-platform-${eclipse.target}</file>
201201
</artifact>
202202
</target>

‎releng/io.openliberty.tools.update/category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
IBM Corporation - initial implementation
1313
-->
1414
<site>
15-
<feature url="features/io.openliberty.tools.eclipse_25.0.8.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="25.0.8.qualifier">
15+
<feature url="features/io.openliberty.tools.eclipse_25.0.12.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="25.0.12.qualifier">
1616
<category name="io.openliberty.tools.eclipse"/>
1717
</feature>
1818

‎tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-Copyright: Copyright (c) 2022, 2025 IBM Corporation and others.
33
Bundle-ManifestVersion: 2
44
Bundle-Name: Tests Plug-in
55
Bundle-SymbolicName: io.openliberty.tools.eclipse.tests
6-
Bundle-Version: 25.0.8.qualifier
6+
Bundle-Version: 25.0.12.qualifier
77
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: junit-jupiter-api,
99
org.eclipse.ui,

‎tests/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>io.openliberty.tools.eclipse</groupId>
1919
<artifactId>parent</artifactId>
20-
<version>25.0.8-SNAPSHOT</version>
20+
<version>25.0.12-SNAPSHOT</version>
2121
</parent>
2222

2323
<artifactId>io.openliberty.tools.eclipse.tests</artifactId>
@@ -39,6 +39,7 @@
3939
<providerHint>junit5</providerHint>
4040
<trimStackTrace>false</trimStackTrace>
4141
<runOrder>alphabetical</runOrder>
42+
<forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
4243
<systemProperties>
4344
<org.eclipse.swtbot.search.timeout>20000</org.eclipse.swtbot.search.timeout>
4445
<io.liberty.tools.eclipse.tests.mvn.logfile>${mvnLogFile}</io.liberty.tools.eclipse.tests.mvn.logfile>

0 commit comments

Comments
 (0)