Skip to content
This repository was archived by the owner on Apr 21, 2023. It is now read-only.

Commit 11e7169

Browse files
authored
Merge pull request #2001 from eclipse/cd_fixAsm94
use fixed asm 9.4 version from orbit m3
2 parents df02332 + 0e751be commit 11e7169

File tree

9 files changed

+41
-41
lines changed

9 files changed

+41
-41
lines changed

org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
2525
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
2626
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
27-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
27+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
2828
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
2929
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
3030
</location>

org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
2525
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
2626
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
27-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
27+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
2828
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
2929
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
3030
</location>

org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
2525
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
2626
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
27-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
27+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
2828
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
2929
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
3030
</location>

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
2525
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
2626
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
27-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
27+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
2828
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
2929
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
3030
</location>

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target

+11-11
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
2626
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
2727
<unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>
28-
<unit id="org.junit.jupiter.api" version="5.8.2.v20220624-2009"/>
29-
<unit id="org.junit.jupiter.engine" version="5.8.2.v20220624-2009"/>
30-
<unit id="org.junit.jupiter.migrationsupport" version="5.8.2.v20220624-2009"/>
31-
<unit id="org.junit.jupiter.params" version="5.8.2.v20220624-2009"/>
32-
<unit id="org.junit.platform.commons" version="1.8.2.v20220624-2009"/>
33-
<unit id="org.junit.platform.engine" version="1.8.2.v20220624-2009"/>
34-
<unit id="org.junit.platform.launcher" version="1.8.2.v20220624-2009"/>
35-
<unit id="org.junit.platform.runner" version="1.8.2.v20220624-2009"/>
36-
<unit id="org.junit.platform.suite.commons" version="1.8.2.v20220624-2009"/>
37-
<unit id="org.junit.vintage.engine" version="5.8.2.v20220624-2009"/>
28+
<unit id="org.junit.jupiter.api" version="5.9.1.v20221103-2317"/>
29+
<unit id="org.junit.jupiter.engine" version="5.9.1.v20221103-2317"/>
30+
<unit id="org.junit.jupiter.migrationsupport" version="5.9.1.v20221103-2317"/>
31+
<unit id="org.junit.jupiter.params" version="5.9.1.v20221103-2317"/>
32+
<unit id="org.junit.platform.commons" version="1.9.1.v20221103-2317"/>
33+
<unit id="org.junit.platform.engine" version="1.9.1.v20221103-2317"/>
34+
<unit id="org.junit.platform.launcher" version="1.9.1.v20221103-2317"/>
35+
<unit id="org.junit.platform.runner" version="1.9.1.v20221103-2317"/>
36+
<unit id="org.junit.platform.suite.commons" version="1.9.1.v20221103-2317"/>
37+
<unit id="org.junit.vintage.engine" version="5.9.1.v20221103-2317"/>
3838
<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
39-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
39+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
4040
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
4141
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
4242
</location>

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
2525
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
2626
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
27-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
27+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
2828
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
2929
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
3030
</location>

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
2525
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
2626
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
27-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
27+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
2828
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
2929
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
3030
</location>

org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend

+12-12
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,19 @@ class TargetPlatformProject extends ProjectDescriptor {
9595
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
9696
«IF config.junitVersion == JUnitVersion.JUNIT_5»
9797
<unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>
98-
<unit id="org.junit.jupiter.api" version="5.8.2.v20220624-2009"/>
99-
<unit id="org.junit.jupiter.engine" version="5.8.2.v20220624-2009"/>
100-
<unit id="org.junit.jupiter.migrationsupport" version="5.8.2.v20220624-2009"/>
101-
<unit id="org.junit.jupiter.params" version="5.8.2.v20220624-2009"/>
102-
<unit id="org.junit.platform.commons" version="1.8.2.v20220624-2009"/>
103-
<unit id="org.junit.platform.engine" version="1.8.2.v20220624-2009"/>
104-
<unit id="org.junit.platform.launcher" version="1.8.2.v20220624-2009"/>
105-
<unit id="org.junit.platform.runner" version="1.8.2.v20220624-2009"/>
106-
<unit id="org.junit.platform.suite.commons" version="1.8.2.v20220624-2009"/>
107-
<unit id="org.junit.vintage.engine" version="5.8.2.v20220624-2009"/>
98+
<unit id="org.junit.jupiter.api" version="5.9.1.v20221103-2317"/>
99+
<unit id="org.junit.jupiter.engine" version="5.9.1.v20221103-2317"/>
100+
<unit id="org.junit.jupiter.migrationsupport" version="5.9.1.v20221103-2317"/>
101+
<unit id="org.junit.jupiter.params" version="5.9.1.v20221103-2317"/>
102+
<unit id="org.junit.platform.commons" version="1.9.1.v20221103-2317"/>
103+
<unit id="org.junit.platform.engine" version="1.9.1.v20221103-2317"/>
104+
<unit id="org.junit.platform.launcher" version="1.9.1.v20221103-2317"/>
105+
<unit id="org.junit.platform.runner" version="1.9.1.v20221103-2317"/>
106+
<unit id="org.junit.platform.suite.commons" version="1.9.1.v20221103-2317"/>
107+
<unit id="org.junit.vintage.engine" version="5.9.1.v20221103-2317"/>
108108
<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
109109
«ENDIF»
110-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
110+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
111111
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
112112
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
113113
</location>
@@ -120,7 +120,7 @@ class TargetPlatformProject extends ProjectDescriptor {
120120
«IF config.junitVersion == JUnitVersion.JUNIT_4»
121121
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
122122
«ENDIF»
123-
<unit id="org.objectweb.asm" version="9.4.0.v20221013-0857"/>
123+
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
124124
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
125125
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
126126
</location>

org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -220,43 +220,43 @@ public CharSequence target() {
220220
_builder.newLine();
221221
_builder.append("\t\t");
222222
_builder.append("\t");
223-
_builder.append("<unit id=\"org.junit.jupiter.api\" version=\"5.8.2.v20220624-2009\"/>");
223+
_builder.append("<unit id=\"org.junit.jupiter.api\" version=\"5.9.1.v20221103-2317\"/>");
224224
_builder.newLine();
225225
_builder.append("\t\t");
226226
_builder.append("\t");
227-
_builder.append("<unit id=\"org.junit.jupiter.engine\" version=\"5.8.2.v20220624-2009\"/>");
227+
_builder.append("<unit id=\"org.junit.jupiter.engine\" version=\"5.9.1.v20221103-2317\"/>");
228228
_builder.newLine();
229229
_builder.append("\t\t");
230230
_builder.append("\t");
231-
_builder.append("<unit id=\"org.junit.jupiter.migrationsupport\" version=\"5.8.2.v20220624-2009\"/>");
231+
_builder.append("<unit id=\"org.junit.jupiter.migrationsupport\" version=\"5.9.1.v20221103-2317\"/>");
232232
_builder.newLine();
233233
_builder.append("\t\t");
234234
_builder.append("\t");
235-
_builder.append("<unit id=\"org.junit.jupiter.params\" version=\"5.8.2.v20220624-2009\"/>");
235+
_builder.append("<unit id=\"org.junit.jupiter.params\" version=\"5.9.1.v20221103-2317\"/>");
236236
_builder.newLine();
237237
_builder.append("\t\t");
238238
_builder.append("\t");
239-
_builder.append("<unit id=\"org.junit.platform.commons\" version=\"1.8.2.v20220624-2009\"/>");
239+
_builder.append("<unit id=\"org.junit.platform.commons\" version=\"1.9.1.v20221103-2317\"/>");
240240
_builder.newLine();
241241
_builder.append("\t\t");
242242
_builder.append("\t");
243-
_builder.append("<unit id=\"org.junit.platform.engine\" version=\"1.8.2.v20220624-2009\"/>");
243+
_builder.append("<unit id=\"org.junit.platform.engine\" version=\"1.9.1.v20221103-2317\"/>");
244244
_builder.newLine();
245245
_builder.append("\t\t");
246246
_builder.append("\t");
247-
_builder.append("<unit id=\"org.junit.platform.launcher\" version=\"1.8.2.v20220624-2009\"/>");
247+
_builder.append("<unit id=\"org.junit.platform.launcher\" version=\"1.9.1.v20221103-2317\"/>");
248248
_builder.newLine();
249249
_builder.append("\t\t");
250250
_builder.append("\t");
251-
_builder.append("<unit id=\"org.junit.platform.runner\" version=\"1.8.2.v20220624-2009\"/>");
251+
_builder.append("<unit id=\"org.junit.platform.runner\" version=\"1.9.1.v20221103-2317\"/>");
252252
_builder.newLine();
253253
_builder.append("\t\t");
254254
_builder.append("\t");
255-
_builder.append("<unit id=\"org.junit.platform.suite.commons\" version=\"1.8.2.v20220624-2009\"/>");
255+
_builder.append("<unit id=\"org.junit.platform.suite.commons\" version=\"1.9.1.v20221103-2317\"/>");
256256
_builder.newLine();
257257
_builder.append("\t\t");
258258
_builder.append("\t");
259-
_builder.append("<unit id=\"org.junit.vintage.engine\" version=\"5.8.2.v20220624-2009\"/>");
259+
_builder.append("<unit id=\"org.junit.vintage.engine\" version=\"5.9.1.v20221103-2317\"/>");
260260
_builder.newLine();
261261
_builder.append("\t\t");
262262
_builder.append("\t");
@@ -266,7 +266,7 @@ public CharSequence target() {
266266
}
267267
_builder.append("\t\t");
268268
_builder.append("\t");
269-
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.4.0.v20221013-0857\"/>");
269+
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.4.0.v20221107-1714\"/>");
270270
_builder.newLine();
271271
_builder.append("\t\t");
272272
_builder.append("\t");
@@ -311,7 +311,7 @@ public CharSequence target() {
311311
}
312312
_builder.append("\t\t");
313313
_builder.append("\t");
314-
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.4.0.v20221013-0857\"/>");
314+
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.4.0.v20221107-1714\"/>");
315315
_builder.newLine();
316316
_builder.append("\t\t");
317317
_builder.append("\t");

0 commit comments

Comments
 (0)