Skip to content

Commit b64e626

Browse files
committed
fix(deps): upgrade joni from 2.2.1 to 2.2.3
1 parent 72a0225 commit b64e626

4 files changed

Lines changed: 101 additions & 134 deletions

File tree

org.eclipse.tm4e.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Bundle-Version: 0.14.2.qualifier
88
Require-Bundle: com.google.gson;bundle-version="[2.10.1,3.0.0)",
99
org.apache.batik.css;bundle-version="[1.16.0,2.0.0)";resolution:=optional,
1010
org.apache.batik.util;bundle-version="[1.16.0,2.0.0)";resolution:=optional,
11-
org.jcodings;bundle-version="[1.0.58,2.0.0)",
12-
org.joni;bundle-version="[2.2.1,3.0.0)",
11+
org.jcodings;bundle-version="[1.0.61,2.0.0)",
12+
org.joni;bundle-version="[2.2.3,3.0.0)",
1313
org.snakeyaml.engine;bundle-version="[2.8.0,3.0.0)"
1414
Import-Package: org.w3c.css.sac;resolution:=optional,
1515
org.w3c.css.sac.helpers;resolution:=optional,

target-platforms/latest.target

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,41 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
33
<target name="TM4E config targeting current stable Eclipse release" sequenceNumber="9">
4-
<locations>
4+
<locations>
55

6-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
7-
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
8-
<repository location="https://download.eclipse.org/cbi/updates/license"/>
9-
</location>
6+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
7+
<repository location="https://download.eclipse.org/cbi/updates/license"/>
8+
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
9+
</location>
1010

11-
<!-- 4.34 = Eclipse 2024-12 -->
11+
<!-- 4.34 = Eclipse 2024-12 -->
12+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
13+
<repository location="https://download.eclipse.org/eclipse/updates/4.34"/>
14+
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
15+
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
16+
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
17+
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
18+
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
19+
<unit id="org.junit" version="0.0.0"/>
20+
<unit id="junit-jupiter-api" version="0.0.0"/>
21+
</location>
1222

13-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
14-
<unit id="com.google.gson" version="0.0.0"/>
15-
<unit id="com.google.gson.source" version="0.0.0"/>
16-
<unit id="org.apache.batik.css" version="0.0.0"/>
17-
<unit id="org.apache.batik.css.source" version="0.0.0"/>
18-
<unit id="org.jcodings" version="0.0.0"/>
19-
<unit id="org.jcodings.source" version="0.0.0"/>
20-
<unit id="org.joni" version="0.0.0"/>
21-
<unit id="org.joni.source" version="0.0.0"/>
22-
<unit id="org.snakeyaml.engine" version="0.0.0"/>
23-
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
24-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
25-
</location>
23+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
24+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03/"/>
25+
<unit id="assertj-core" version="0.0.0"/>
26+
<unit id="assertj-core.source" version="0.0.0"/>
27+
<unit id="com.google.gson" version="0.0.0"/>
28+
<unit id="com.google.gson.source" version="0.0.0"/>
29+
<unit id="org.apache.batik.css" version="0.0.0"/>
30+
<unit id="org.apache.batik.css.source" version="0.0.0"/>
31+
<unit id="org.jcodings" version="0.0.0"/>
32+
<unit id="org.jcodings.source" version="0.0.0"/>
33+
<unit id="org.joni" version="0.0.0"/>
34+
<unit id="org.joni.source" version="0.0.0"/>
35+
<unit id="org.snakeyaml.engine" version="0.0.0"/>
36+
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
37+
</location>
38+
</locations>
2639

27-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
28-
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
29-
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
30-
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
31-
<unit id="org.junit" version="0.0.0"/>
32-
<unit id="junit-jupiter-api" version="0.0.0"/>
33-
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
34-
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
35-
<repository location="https://download.eclipse.org/eclipse/updates/4.34"/>
36-
</location>
37-
38-
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
39-
<dependencies>
40-
<dependency>
41-
<groupId>org.assertj</groupId>
42-
<artifactId>assertj-core</artifactId>
43-
<version>3.27.3</version>
44-
<type>jar</type>
45-
</dependency>
46-
</dependencies>
47-
</location>
48-
</locations>
49-
50-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
40+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
5141
</target>

target-platforms/oldest.target

Lines changed: 33 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,41 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
33
<target name="TM4E config targeting oldest supported Eclipse release" sequenceNumber="9">
4-
<locations>
4+
<locations>
55

6-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
7-
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
8-
<repository location="https://download.eclipse.org/cbi/updates/license"/>
9-
</location>
6+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
7+
<repository location="https://download.eclipse.org/cbi/updates/license"/>
8+
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
9+
</location>
1010

11-
<!-- 4.29 = Eclipse 2023-09 -->
11+
<!-- 4.29 = Eclipse 2023-09 -->
12+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
13+
<repository location="https://download.eclipse.org/eclipse/updates/4.29"/>
14+
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
15+
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
16+
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
17+
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
18+
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
19+
<unit id="org.junit" version="0.0.0"/>
20+
<unit id="junit-jupiter-api" version="0.0.0"/>
21+
</location>
1222

13-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
14-
<unit id="com.google.gson" version="0.0.0"/>
15-
<unit id="org.apache.batik.css" version="0.0.0"/>
16-
<unit id="org.apache.batik.css.source" version="0.0.0"/>
17-
<unit id="org.jcodings" version="0.0.0"/>
18-
<unit id="org.jcodings.source" version="0.0.0"/>
19-
<unit id="org.joni" version="0.0.0"/>
20-
<unit id="org.joni.source" version="0.0.0"/>
21-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
22-
</location>
23+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
24+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03/"/>
25+
<unit id="assertj-core" version="0.0.0"/>
26+
<unit id="assertj-core.source" version="0.0.0"/>
27+
<unit id="com.google.gson" version="0.0.0"/>
28+
<unit id="com.google.gson.source" version="0.0.0"/>
29+
<unit id="org.apache.batik.css" version="0.0.0"/>
30+
<unit id="org.apache.batik.css.source" version="0.0.0"/>
31+
<unit id="org.jcodings" version="0.0.0"/>
32+
<unit id="org.jcodings.source" version="0.0.0"/>
33+
<unit id="org.joni" version="0.0.0"/>
34+
<unit id="org.joni.source" version="0.0.0"/>
35+
<unit id="org.snakeyaml.engine" version="0.0.0"/>
36+
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
37+
</location>
38+
</locations>
2339

24-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
25-
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
26-
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
27-
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
28-
<unit id="org.junit" version="0.0.0"/>
29-
<unit id="junit-jupiter-api" version="0.0.0"/>
30-
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
31-
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
32-
<repository location="https://download.eclipse.org/eclipse/updates/4.29"/>
33-
</location>
34-
35-
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
36-
<dependencies>
37-
<dependency>
38-
<groupId>org.assertj</groupId>
39-
<artifactId>assertj-core</artifactId>
40-
<version>3.27.3</version>
41-
<type>jar</type>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.snakeyaml</groupId>
45-
<artifactId>snakeyaml-engine</artifactId>
46-
<version>2.8</version>
47-
<type>jar</type>
48-
</dependency>
49-
</dependencies>
50-
</location>
51-
</locations>
52-
53-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
40+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
5441
</target>

target-platforms/unstable.target

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,41 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
33
<target name="TM4E config targeting integration builds of the next Eclipse release" sequenceNumber="9">
4-
<locations>
4+
<locations>
55

6-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
7-
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
8-
<repository location="https://download.eclipse.org/cbi/updates/license"/>
9-
</location>
6+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
7+
<repository location="https://download.eclipse.org/cbi/updates/license"/>
8+
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
9+
</location>
1010

11-
<!-- 4.35 = Eclipse 2025-03 -->
11+
<!-- 4.35 = Eclipse 2025-03 -->
12+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
13+
<repository location="https://download.eclipse.org/eclipse/updates/4.35-I-builds"/>
14+
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
15+
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
16+
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
17+
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
18+
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
19+
<unit id="org.junit" version="0.0.0"/>
20+
<unit id="junit-jupiter-api" version="0.0.0"/>
21+
</location>
1222

13-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
14-
<unit id="com.google.gson" version="0.0.0"/>
15-
<unit id="com.google.gson.source" version="0.0.0"/>
16-
<unit id="org.apache.batik.css" version="0.0.0"/>
17-
<unit id="org.apache.batik.css.source" version="0.0.0"/>
18-
<unit id="org.jcodings" version="0.0.0"/>
19-
<unit id="org.jcodings.source" version="0.0.0"/>
20-
<unit id="org.joni" version="0.0.0"/>
21-
<unit id="org.joni.source" version="0.0.0"/>
22-
<unit id="org.snakeyaml.engine" version="0.0.0"/>
23-
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
24-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03"/>
25-
</location>
23+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
24+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03/"/>
25+
<unit id="assertj-core" version="0.0.0"/>
26+
<unit id="assertj-core.source" version="0.0.0"/>
27+
<unit id="com.google.gson" version="0.0.0"/>
28+
<unit id="com.google.gson.source" version="0.0.0"/>
29+
<unit id="org.apache.batik.css" version="0.0.0"/>
30+
<unit id="org.apache.batik.css.source" version="0.0.0"/>
31+
<unit id="org.jcodings" version="0.0.0"/>
32+
<unit id="org.jcodings.source" version="0.0.0"/>
33+
<unit id="org.joni" version="0.0.0"/>
34+
<unit id="org.joni.source" version="0.0.0"/>
35+
<unit id="org.snakeyaml.engine" version="0.0.0"/>
36+
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
37+
</location>
38+
</locations>
2639

27-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
28-
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
29-
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
30-
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
31-
<unit id="org.junit" version="0.0.0"/>
32-
<unit id="junit-jupiter-api" version="0.0.0"/>
33-
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
34-
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
35-
<repository location="https://download.eclipse.org/eclipse/updates/4.35-I-builds"/>
36-
</location>
37-
38-
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
39-
<dependencies>
40-
<dependency>
41-
<groupId>org.assertj</groupId>
42-
<artifactId>assertj-core</artifactId>
43-
<version>3.27.3</version>
44-
<type>jar</type>
45-
</dependency>
46-
</dependencies>
47-
</location>
48-
</locations>
49-
50-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
40+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
5141
</target>

0 commit comments

Comments
 (0)