Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Orbit 2024-03 #2868

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Orbit 2024-03 #2868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a138f0
update to orbit 2024-03
cdietrich Dec 7, 2023
c405309
bump classgraph
cdietrich Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ASM (9.6)

* License: BSD-3-Clause

classgraph (4.8.164)
classgraph (4.8.165)

* License: MIT
* Project: https://github.com/classgraph/classgraph
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle:
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
org.eclipse.xtend.lib,
com.google.guava;bundle-version="[32.1.2,33.0.0)"
Import-Package: io.github.classgraph;version="4.8.164",
Import-Package: io.github.classgraph;version="4.8.165",
org.apache.commons.logging;version="1.0.4";resolution:=optional,
org.apache.log4j;version="1.2.24"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.dev-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.164</version>
<version>4.8.165</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.p2repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<bundle id="org.kohsuke.args4j.source" version="0.0.0"/>
<bundle id="org.objectweb.asm" version="9.6.0.qualifier"/>
<bundle id="org.objectweb.asm.source" version="9.6.0.qualifier"/>
<bundle id="io.github.classgraph.classgraph" version="4.8.164.qualifier"/>
<bundle id="io.github.classgraph.classgraph.source" version="4.8.164.qualifier"/>
<bundle id="io.github.classgraph.classgraph" version="4.8.165.qualifier"/>
<bundle id="io.github.classgraph.classgraph.source" version="4.8.165.qualifier"/>
<category-def name="Xtext" label="Xtext" />
</site>
4 changes: 2 additions & 2 deletions ....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions ...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions ...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions ...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions ...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<unit id="junit-vintage-engine" version="0.0.0"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions ...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions ...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
2 changes: 1 addition & 1 deletion ...s/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
Just mention the p2 repo so that additional requirements with ranges specified in
features and bundles are taken from Orbit (e.g., objectweb.asm)
-->
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions ...eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="org.opentest4j" version="0.0.0"/>
�ENDIF�
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
</location>
</locations>
</target>
Expand Down
4 changes: 2 additions & 2 deletions ...se.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,10 @@ public CharSequence target() {
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.6.0\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"io.github.classgraph.classgraph\" version=\"4.8.164\"/>");
_builder.append("<unit id=\"io.github.classgraph.classgraph\" version=\"4.8.165\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12\"/>");
_builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("</location>");
Expand Down
4 changes: 2 additions & 2 deletions xtext-latest.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -55,7 +55,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202203.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -57,7 +57,7 @@
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202206.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -56,7 +56,7 @@
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202209.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202212.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202303.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202306.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202309.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202312.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
Expand All @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="io.github.classgraph.classgraph" version="4.8.165"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down