[eclipse/xtext#1996] Update to Orbit 2021-12

[eclipse/xtext#2001] Update to Junit 5.8.1
[eclipse/xtext#1992] Update to Classgraph 4.8.117

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2021-10-01 07:09:45 +02:00
parent d525544c8c
commit d064558484
10 changed files with 235 additions and 89 deletions

View file

@ -154,7 +154,7 @@ Caliper (0.5.0)
* Project: http://code.google.com/p/caliper/
* Source: http://code.google.com/p/caliper/source/browse/?name=v0.5-rc1
classgraph (4.8.35)
classgraph (4.8.117)
* License: MIT
* Project: https://github.com/classgraph/classgraph

View file

@ -27,8 +27,8 @@
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
</locations>
</target>

View file

@ -27,8 +27,8 @@
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
</locations>
</target>

View file

@ -27,8 +27,8 @@
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
</locations>
</target>

View file

@ -27,8 +27,8 @@
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
</locations>
</target>

View file

@ -24,17 +24,19 @@
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
<unit id="org.junit.jupiter.engine" version="5.7.1.v20210222-1948"/>
<unit id="org.junit.platform.commons" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.engine" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/>
<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
<unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>
<unit id="org.junit.jupiter.api" version="5.8.1.v20211018-1956"/>
<unit id="org.junit.jupiter.engine" version="5.8.1.v20211018-1956"/>
<unit id="org.junit.platform.commons" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.engine" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.launcher" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.runner" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.suite.commons" version="1.8.1.v20211018-1956"/>
<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
</locations>
</target>

View file

@ -27,8 +27,8 @@
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
</locations>
</target>

View file

@ -86,26 +86,54 @@ class TargetPlatformProject extends ProjectDescriptor {
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/«config.xtextVersion»/"/>
«ENDIF»
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
«IF config.javaVersion.isAtLeast(JavaVersion.JAVA11)»
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
«IF config.junitVersion == JUnitVersion.JUNIT_5»
<unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>
<unit id="org.junit.jupiter.api" version="5.8.1.v20211018-1956"/>
<unit id="org.junit.jupiter.engine" version="5.8.1.v20211018-1956"/>
<unit id="org.junit.platform.commons" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.engine" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.launcher" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.runner" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.suite.commons" version="1.8.1.v20211018-1956"/>
<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
«ENDIF»
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
«ELSE»
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.117.v20210930-0420"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
</location>
«IF config.junitVersion == JUnitVersion.JUNIT_5»
<unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
<unit id="org.junit.jupiter.engine" version="5.7.1.v20210222-1948"/>
<unit id="org.junit.platform.commons" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.engine" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/>
<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
<unit id="org.junit.jupiter.engine" version="5.7.1.v20210222-1948"/>
<unit id="org.junit.platform.commons" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.engine" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/>
<unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/>
<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
</location>
«ENDIF»
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
</location>
«ENDIF»
</locations>
</target>
'''

View file

@ -184,66 +184,182 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"com.google.gson\" version=\"2.8.7.v20210624-1215\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"com.google.inject\" version=\"5.0.1.v20210324-2015\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"javax.inject\" version=\"1.0.0.v20091030\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v201101311130\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit\" version=\"4.12.0.v201504281640\"/>");
_builder.newLine();
{
JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
boolean _equals = Objects.equal(_junitVersion, JUnitVersion.JUNIT_5);
if (_equals) {
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit.jupiter.api\" version=\"5.7.1.v20210222-1948\"/>");
boolean _isAtLeast_1 = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11);
if (_isAtLeast_1) {
_builder.append("\t\t");
_builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit.jupiter.engine\" version=\"5.7.1.v20210222-1948\"/>");
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"com.google.gson\" version=\"2.8.7.v20210624-1215\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit.platform.commons\" version=\"1.7.1.v20210222-1948\"/>");
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"com.google.inject\" version=\"5.0.1.v20210324-2015\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit.platform.engine\" version=\"1.7.1.v20210222-1948\"/>");
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"javax.inject\" version=\"1.0.0.v20091030\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit.platform.launcher\" version=\"1.7.1.v20210222-1948\"/>");
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v201101311130\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.junit.platform.runner\" version=\"1.7.1.v20210222-1948\"/>");
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit\" version=\"4.12.0.v201504281640\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.opentest4j\" version=\"1.2.0.v20190826-0900\"/>");
{
JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
boolean _equals = Objects.equal(_junitVersion, JUnitVersion.JUNIT_5);
if (_equals) {
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.apiguardian\" version=\"1.1.2.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.jupiter.api\" version=\"5.8.1.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.jupiter.engine\" version=\"5.8.1.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.commons\" version=\"1.8.1.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.engine\" version=\"1.8.1.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.launcher\" version=\"1.8.1.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.runner\" version=\"1.8.1.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.suite.commons\" version=\"1.8.1.v20211018-1956\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.opentest4j\" version=\"1.2.0.v20211018-1956\"/>");
_builder.newLine();
}
}
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.2.0.v20210813-1119\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"9.2.0.v20210813-1119\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.117.v20210930-0420\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/downloads/2021-12\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();
} else {
_builder.append("\t\t");
_builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"com.google.gson\" version=\"2.8.7.v20210624-1215\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"com.google.inject\" version=\"5.0.1.v20210324-2015\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"javax.inject\" version=\"1.0.0.v20091030\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.antlr.runtime\" version=\"3.2.0.v201101311130\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit\" version=\"4.12.0.v201504281640\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.2.0.v20210813-1119\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"9.2.0.v20210813-1119\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.117.v20210930-0420\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/downloads/2021-12\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();
{
JUnitVersion _junitVersion_1 = this.getConfig().getJunitVersion();
boolean _equals_1 = Objects.equal(_junitVersion_1, JUnitVersion.JUNIT_5);
if (_equals_1) {
_builder.append("\t\t");
_builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.jupiter.api\" version=\"5.7.1.v20210222-1948\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.jupiter.engine\" version=\"5.7.1.v20210222-1948\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.commons\" version=\"1.7.1.v20210222-1948\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.engine\" version=\"1.7.1.v20210222-1948\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.launcher\" version=\"1.7.1.v20210222-1948\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.junit.platform.runner\" version=\"1.7.1.v20210222-1948\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<unit id=\"org.opentest4j\" version=\"1.2.0.v20190826-0900\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/downloads/2021-09\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();
}
}
}
}
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.objectweb.asm\" version=\"9.2.0.v20210813-1119\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"9.2.0.v20210813-1119\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.35.v20190528-1517\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/downloads/2021-09\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();
_builder.append("\t");
_builder.append("</locations>");
_builder.newLine();

View file

@ -18,7 +18,7 @@
<repository location="https://download.eclipse.org/releases/oxygen/201804111000"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
</location>