Skip to content

Commit 11f36c0

Browse files
committed
releng: Upgrade target to dependencies of 2025-12 (Eclipse 4.38) release
Replace use of org.apache.commons.lang with org.apache.commons.lang3 Change deprecation from error to warning in org.eclipse.tracecompass.incubator.tsp.client.core due to use of deprecated MapperBuilder.serializationInclusion() in generated JSON.java Signed-off-by: Patrick Tasse <[email protected]>
1 parent 36063f5 commit 11f36c0

File tree

8 files changed

+16
-18
lines changed

8 files changed

+16
-18
lines changed

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ mvn validate -PdownloadTsp
5454
The generation of the trace server client code from the specification (API.yaml) is done using the maven plugin of the [OpenAPI Generator][openapi-codegen]. To re-generate the TSP client execute the following command:
5555

5656
```bash
57-
mvn generated-resources -PdownloadTsp -PbuildTsp
57+
mvn generate-sources -PdownloadTsp -PbuildTsp
5858
```
5959

6060
Notes:

analyses/org.eclipse.tracecompass.incubator.filters.ui/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-Vendor: %Bundle-Vendor
55
Bundle-SymbolicName: org.eclipse.tracecompass.incubator.filters.ui;singleton:=true
6-
Bundle-Version: 0.1.2.qualifier
6+
Bundle-Version: 0.1.3.qualifier
77
Bundle-Localization: plugin
88
Bundle-Activator: org.eclipse.tracecompass.incubator.internal.filters.ui.Activator
99
Bundle-ActivationPolicy: lazy
@@ -22,5 +22,5 @@ Export-Package: org.eclipse.tracecompass.incubator.internal.filters.ui;x-interna
2222
org.eclipse.tracecompass.incubator.internal.filters.ui.views.global;x-internal:=true
2323
Automatic-Module-Name: org.eclipse.tracecompass.incubator.lsp.ui
2424
Import-Package: com.google.gson,
25-
org.apache.commons.lang,
25+
org.apache.commons.lang3,
2626
org.eclipse.jface.text

analyses/org.eclipse.tracecompass.incubator.filters.ui/src/org/eclipse/tracecompass/incubator/internal/filters/ui/lspFilterTextbox/LspFilterTextbox.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.List;
1616
import java.util.Objects;
1717

18-
import org.apache.commons.lang.StringUtils;
18+
import org.apache.commons.lang3.StringUtils;
1919
import org.eclipse.jdt.annotation.Nullable;
2020
import org.eclipse.jface.layout.GridDataFactory;
2121
import org.eclipse.jface.text.TextViewer;

analyses/org.eclipse.tracecompass.incubator.filters/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<import plugin="org.eclipse.tracecompass.tmf.filter.parser"/>
3434
<import plugin="org.eclipse.ui"/>
3535
<import plugin="org.eclipse.tracecompass.tmf.ui"/>
36-
<import plugin="org.apache.commons.lang"/>
36+
<import plugin="org.apache.commons.lang3"/>
3737
<import plugin="org.eclipse.jface.text"/>
3838
<import plugin="org.eclipse.help"/>
3939
</requires>

common/org.eclipse.tracecompass.incubator.releng-site/category.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<bundle id="jakarta.ws.rs-api"/>
118118
<bundle id="jakarta.xml.bind-api" version="2.3.3"/>
119119
<bundle id="javax.inject"/>
120-
<bundle id="org.apache.commons.lang"/>
120+
<bundle id="org.apache.commons.lang3"/>
121121
<bundle id="org.eclipse.lsp4j"/>
122122
<bundle id="org.eclipse.lsp4j.jsonrpc"/>
123123
<bundle id="org.eclipse.nebula.widgets.opal.commons"/>

common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
<target name="tracecompass-incubator-master" sequenceNumber="90">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/"/>
6+
<repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.9/"/>
77
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
88
</location>
99
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1010
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
11-
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
1211
<unit id="org.eclipse.remote.core" version="0.0.0"/>
1312
<unit id="org.eclipse.remote.ui" version="0.0.0"/>
1413
<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
1514
<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
16-
<repository location="https://download.eclipse.org/tools/cdt/releases/12.2/cdt-12.2.0/"/>
15+
<repository location="https://download.eclipse.org/tools/cdt/releases/12.3/cdt-12.3.0/"/>
1716
</location>
1817
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1918
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -40,7 +39,7 @@
4039
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
4140
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="0.0.0"/>
4241
<unit id="com.google.gson" version="0.0.0"/>
43-
<unit id="com.google.guava" version="33.4.8.jre"/>
42+
<unit id="com.google.guava" version="33.5.0.jre"/>
4443
<unit id="com.sun.xml.bind.jaxb-osgi" version="2.3.9"/>
4544
<unit id="io.github.classgraph.classgraph"/>
4645
<unit id="jakarta.activation-api" version="1.2.2"/>
@@ -62,7 +61,6 @@
6261
<unit id="org.apache.commons.commons-compress" version="0.0.0"/>
6362
<unit id="org.apache.commons.commons-io" version="0.0.0"/>
6463
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
65-
<unit id="org.apache.commons.lang" version="0.0.0"/>
6664
<unit id="org.apache.commons.lang3" version="0.0.0"/>
6765
<unit id="org.apache.commons.math3" version="0.0.0"/>
6866
<unit id="org.apache.xml.serializer" version="0.0.0"/>
@@ -85,12 +83,12 @@
8583
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.47.0"/>
8684
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.47.0"/>
8785
<unit id="org.hamcrest" version="0.0.0"/>
88-
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
86+
<unit id="org.mortbay.jasper.mortbay-apache-jsp" version="0.0.0"/>
8987
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
9088
<unit id="slf4j.api" version="0.0.0"/>
9189
<unit id="slf4j.simple" version="0.0.0"/>
9290
<unit id="org.yaml.snakeyaml" version="0.0.0"/>
93-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0/"/>
91+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.38.0/"/>
9492
</location>
9593
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
9694
<unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -117,19 +115,19 @@
117115
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
118116
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
119117
<unit id="org.eclipse.osgi.services" version="0.0.0"/>
120-
<repository location="https://download.eclipse.org/eclipse/updates/4.37/R-4.37-202509050730/"/>
118+
<repository location="https://download.eclipse.org/eclipse/updates/4.38/R-4.38-202512010920/"/>
121119
</location>
122120
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
123121
<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
124122
<unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
125123
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
126-
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.39.0/R-3.39.0-20250902093744/repository/"/>
124+
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.40.0/R-3.40.0-20251124015847/repository/"/>
127125
</location>
128126
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
129127
<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
130128
<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
131129
<unit id="org.eclipse.xsd" version="0.0.0"/>
132-
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.43.0/"/>
130+
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.44.0/"/>
133131
</location>
134132
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
135133
<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>

rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
version="0.0.0"/>
6767

6868
<plugin
69-
id="org.apache.commons.lang"
69+
id="org.apache.commons.lang3"
7070
version="0.0.0"/>
7171

7272
<plugin

trace-server/org.eclipse.tracecompass.incubator.tsp.client.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
2828
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
2929
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
3030
org.eclipse.jdt.core.compiler.problem.deadCode=ignore
31-
org.eclipse.jdt.core.compiler.problem.deprecation=error
31+
org.eclipse.jdt.core.compiler.problem.deprecation=warning
3232
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
3333
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
3434
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

0 commit comments

Comments
 (0)