Skip to content

Commit

Permalink
adapt to latest orbit changes
Browse files Browse the repository at this point in the history 
Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
  • Loading branch information
@cdietrich
cdietrich committed Jul 25, 2023
1 parent 3c0c506 commit fcaccf6
Show file tree
Hide file tree
Showing 17 changed files with 43 additions and 23 deletions.
2 changes: 2 additions & 0 deletions org.eclipse.xtext.p2repository/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
<bundle id="org.aopalliance.source" version="1.0.0.qualifier"/>
<bundle id="org.junit" version="4.13.2.qualifier"/>
<bundle id="org.junit.source" version="4.13.2.qualifier"/>
<bundle id="org.hamcrest.core" version="1.3.0.qualifier"/>
<bundle id="org.hamcrest.core.source" version="1.3.0.qualifier"/>
<bundle id="org.kohsuke.args4j" version="0.0.0"/>
<bundle id="org.kohsuke.args4j.source" version="0.0.0"/>
<bundle id="org.objectweb.asm" version="9.5.0.qualifier"/>
Expand Down
3 changes: 2 additions & 1 deletion ....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
Expand Down
3 changes: 2 additions & 1 deletion ...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
Expand Down
3 changes: 2 additions & 1 deletion ...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
Expand Down
3 changes: 2 additions & 1 deletion ...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
Expand Down
3 changes: 2 additions & 1 deletion ...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
Expand Down
3 changes: 2 additions & 1 deletion ...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
Expand Down
3 changes: 2 additions & 1 deletion ...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
Expand Down
3 changes: 2 additions & 1 deletion ...eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
«IF config.junitVersion == JUnitVersion.JUNIT_5»
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
Expand Down
5 changes: 4 additions & 1 deletion ...se.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ public CharSequence target() {
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v20220404-1927\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit\" version=\"4.13.2.v20211018-1956\"/>");
_builder.append("<unit id=\"org.junit\" version=\"4.13.2.v20230725-0701\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.hamcrest.core\" version=\"1.3.0.v20230721-0740\"/>");
_builder.newLine();
{
JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
Expand Down
5 changes: 3 additions & 2 deletions xtext-latest.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,14 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
5 changes: 3 additions & 2 deletions xtext-r202203.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,13 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<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.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
Expand Down
5 changes: 3 additions & 2 deletions xtext-r202206.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,13 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<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.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
Expand Down
5 changes: 3 additions & 2 deletions xtext-r202209.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,14 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
5 changes: 3 additions & 2 deletions xtext-r202212.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,14 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
5 changes: 3 additions & 2 deletions xtext-r202303.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down
5 changes: 3 additions & 2 deletions xtext-r202306.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.5.0"/>
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit" version="4.13.2.v20230725-0701"/>
<unit id="org.hamcrest.core" version="1.3.0.v20230721-0740"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
Expand Down

0 comments on commit fcaccf6

Please sign in to comment.