Skip to content

Commit

Permalink
fix(deps): upgrade joni from 2.2.1 to 2.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sebthom committed Jan 23, 2025
1 parent fef6ccb commit b579003
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 106 deletions.
4 changes: 2 additions & 2 deletions org.eclipse.tm4e.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Bundle-Version: 0.14.2.qualifier
Require-Bundle: com.google.gson;bundle-version="[2.10.1,3.0.0)",
org.apache.batik.css;bundle-version="[1.16.0,2.0.0)";resolution:=optional,
org.apache.batik.util;bundle-version="[1.16.0,2.0.0)";resolution:=optional,
org.jcodings;bundle-version="[1.0.58,2.0.0)",
org.joni;bundle-version="[2.2.1,3.0.0)",
org.jcodings;bundle-version="[1.0.61,2.0.0)",
org.joni;bundle-version="[2.2.3,3.0.0)",
org.snakeyaml.engine;bundle-version="[2.8.0,3.0.0)"
Import-Package: org.w3c.css.sac;resolution:=optional,
org.w3c.css.sac.helpers;resolution:=optional,
Expand Down
63 changes: 31 additions & 32 deletions target-platforms/latest.target
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="TM4E config targeting current stable Eclipse release" sequenceNumber="9">
<locations>
<locations>

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

<!-- 4.34 = Eclipse 2024-12 -->
<!-- 4.34 = Eclipse 2024-12 -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.34"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.google.gson.source" version="0.0.0"/>
<unit id="org.apache.batik.css" version="0.0.0"/>
<unit id="org.apache.batik.css.source" version="0.0.0"/>
<unit id="org.jcodings" version="0.0.0"/>
<unit id="org.jcodings.source" version="0.0.0"/>
<unit id="org.joni" version="0.0.0"/>
<unit id="org.joni.source" version="0.0.0"/>
<unit id="org.snakeyaml.engine" version="0.0.0"/>
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.google.gson.source" version="0.0.0"/>
<unit id="org.apache.batik.css" version="0.0.0"/>
<unit id="org.apache.batik.css.source" version="0.0.0"/>
<unit id="org.jcodings" version="0.0.0"/>
<unit id="org.jcodings.source" version="0.0.0"/>
<unit id="org.joni" version="0.0.0"/>
<unit id="org.joni.source" version="0.0.0"/>
<unit id="org.snakeyaml.engine" version="0.0.0"/>
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03/"/>
</location>
</locations>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.34"/>
</location>
</locations>

<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
</target>
71 changes: 31 additions & 40 deletions target-platforms/oldest.target
Original file line number Diff line number Diff line change
@@ -1,48 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="TM4E config targeting oldest supported Eclipse release" sequenceNumber="9">
<locations>
<locations>

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

<!-- 4.29 = Eclipse 2023-09 -->
<!-- 4.29 = Eclipse 2023-09 -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.29"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="org.apache.batik.css" version="0.0.0"/>
<unit id="org.apache.batik.css.source" version="0.0.0"/>
<unit id="org.jcodings" version="0.0.0"/>
<unit id="org.jcodings.source" version="0.0.0"/>
<unit id="org.joni" version="0.0.0"/>
<unit id="org.joni.source" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.google.gson.source" version="0.0.0"/>
<unit id="org.apache.batik.css" version="0.0.0"/>
<unit id="org.apache.batik.css.source" version="0.0.0"/>
<unit id="org.jcodings" version="0.0.0"/>
<unit id="org.jcodings.source" version="0.0.0"/>
<unit id="org.joni" version="0.0.0"/>
<unit id="org.joni.source" version="0.0.0"/>
<unit id="org.snakeyaml.engine" version="0.0.0"/>
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03/"/>
</location>
</locations>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.29"/>
</location>

<location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.snakeyaml</groupId>
<artifactId>snakeyaml-engine</artifactId>
<version>2.8</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>

<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
</target>
63 changes: 31 additions & 32 deletions target-platforms/unstable.target
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="TM4E config targeting integration builds of the next Eclipse release" sequenceNumber="9">
<locations>
<locations>

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

<!-- 4.35 = Eclipse 2025-03 -->
<!-- 4.35 = Eclipse 2025-03 -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.35-I-builds"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.google.gson.source" version="0.0.0"/>
<unit id="org.apache.batik.css" version="0.0.0"/>
<unit id="org.apache.batik.css.source" version="0.0.0"/>
<unit id="org.jcodings" version="0.0.0"/>
<unit id="org.jcodings.source" version="0.0.0"/>
<unit id="org.joni" version="0.0.0"/>
<unit id="org.joni.source" version="0.0.0"/>
<unit id="org.snakeyaml.engine" version="0.0.0"/>
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.google.gson.source" version="0.0.0"/>
<unit id="org.apache.batik.css" version="0.0.0"/>
<unit id="org.apache.batik.css.source" version="0.0.0"/>
<unit id="org.jcodings" version="0.0.0"/>
<unit id="org.jcodings.source" version="0.0.0"/>
<unit id="org.joni" version="0.0.0"/>
<unit id="org.joni.source" version="0.0.0"/>
<unit id="org.snakeyaml.engine" version="0.0.0"/>
<unit id="org.snakeyaml.engine.source" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03/"/>
</location>
</locations>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.35-I-builds"/>
</location>
</locations>

<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
</target>

0 comments on commit b579003

Please sign in to comment.