sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test with reload4j

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2022-02-10 08:03:24 +01:00
parent 1ca71081ee
commit dbbc3767a8
12 changed files with 220 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java
View file

@ -16,6 +16,7 @@ import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.util.XtextVersion;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import com.google.common.base.Objects;
@ -208,7 +209,7 @@ public class WizardConfigurationTest {
(AbstractFile it) -> "build.properties".equals(it.getRelativePath())));
}
@Test
@Test @Ignore
public void projectsCanBeBuiltAgainstXtextNightlies() {
config.setPreferredBuildSystem(BuildSystem.GRADLE);
config.getUiProject().setEnabled(true);

4
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml vendored
View file

@ -11,8 +11,8 @@
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>

5
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml vendored
View file

@ -11,8 +11,8 @@
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
@ -140,6 +140,7 @@
<exclude>*:lsMavenTychoFatjar.ide-com.google.guava*</exclude>
<exclude>*:lsMavenTychoFatjar.ide-asm*</exclude>
<exclude>*:lsMavenTychoFatjar.ide-log4j*</exclude>
<exclude>*:lsMavenTychoFatjar.ide-reload4j*</exclude>
<exclude>*:lsMavenTychoFatjar.ide-org.objectweb.asm*</exclude>
<exclude>*:lsMavenTychoFatjar.ide-org.apache.log4j*</exclude>
</excludes>

2
org.eclipse.xtext.util/build.gradle
View file

@ -3,7 +3,7 @@ description = 'Utility classes used throughout Xtext.'
dependencies {
api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
api 'log4j:log4j'
api 'ch.qos.reload4j:reload4j'
api 'org.eclipse.emf:org.eclipse.emf.common'
api 'org.eclipse.emf:org.eclipse.emf.ecore'
api 'com.google.inject:guice'

5
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend
View file

@ -49,8 +49,8 @@ class IdeProjectDescriptor extends ProjectDescriptor {
«IF config.languageServer!=LanguageServer.NONE && isEclipsePluginProject»
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
@ -227,6 +227,7 @@ class IdeProjectDescriptor extends ProjectDescriptor {
<exclude>*:«config.ideProject.name»-com.google.guava*</exclude>
<exclude>*:«config.ideProject.name»-asm*</exclude>
<exclude>*:«config.ideProject.name»-log4j*</exclude>
<exclude>*:«config.ideProject.name»-reload4j*</exclude>
<exclude>*:«config.ideProject.name»-org.objectweb.asm*</exclude>
<exclude>*:«config.ideProject.name»-org.apache.log4j*</exclude>
</excludes>

61
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file

@ -99,9 +99,12 @@ class ParentProjectDescriptor extends ProjectDescriptor {
repositories {
mavenCentral()
«IF config.xtextVersion.isSnapshot»
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots'
}
maven { url 'https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/' }
maven { url 'https://ci.eclipse.org/xtext/job/xtext-core/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/' }
maven { url 'https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/' }
maven { url 'https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/' }
maven { url 'https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/' }
maven { url 'https://ci.eclipse.org/xtext/job/xtext-web/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/' }
«ENDIF»
}
@ -549,10 +552,28 @@ class ParentProjectDescriptor extends ProjectDescriptor {
</repository>
«IF config.xtextVersion.isSnapshot»
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<id>lib</id>
<url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</repository>
<repository>
<id>core</id>
<url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</repository>
<repository>
<id>extras</id>
<url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</repository>
<repository>
<id>xtend</id>
<url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</repository>
<repository>
<id>web</id>
<url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</repository>
<repository>
<id>maven</id>
<url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</repository>
«ENDIF»
</repositories>
@ -570,10 +591,28 @@ class ParentProjectDescriptor extends ProjectDescriptor {
</pluginRepository>
«IF config.xtextVersion.isSnapshot»
<pluginRepository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<id>libp</id>
<url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</pluginRepository>
<pluginRepository>
<id>corep</id>
<url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</pluginRepository>
<pluginRepository>
<id>extrasp</id>
<url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</pluginRepository>
<pluginRepository>
<id>xtendp</id>
<url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</pluginRepository>
<pluginRepository>
<id>webp</id>
<url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</pluginRepository>
<pluginRepository>
<id>mavenp</id>
<url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
</pluginRepository>
«ENDIF»
«IF config.needsTychoBuild && tychoVersion.endsWith("-SNAPSHOT")»

2
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file

@ -79,7 +79,7 @@ class TargetPlatformProject extends ProjectDescriptor {
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
«IF config.xtextVersion.isSnapshot»
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/nightly/"/>
<repository location="https://ci.eclipse.org/xtext/job/xtext-umbrella/job/cd_reload4j/lastSuccessfulBuild/artifact/build/p2-repository/"/>
«ELSEIF config.xtextVersion.isStable»
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
«ELSE»

14
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java
View file

@ -77,10 +77,10 @@ public class IdeProjectDescriptor extends ProjectDescriptor {
_builder.append("<dependency>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("<groupId>log4j</groupId>");
_builder.append("<groupId>ch.qos.reload4j</groupId>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("<artifactId>log4j</artifactId>");
_builder.append("<artifactId>reload4j</artifactId>");
_builder.newLine();
_builder.append("\t");
_builder.append("</dependency>");
@ -779,7 +779,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor {
_builder.append("<exclude>*:");
String _name_6 = this.getConfig().getIdeProject().getName();
_builder.append(_name_6, "\t\t\t\t\t\t");
_builder.append("-org.objectweb.asm*</exclude>");
_builder.append("-reload4j*</exclude>");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t\t");
@ -787,6 +787,14 @@ public class IdeProjectDescriptor extends ProjectDescriptor {
_builder.append("<exclude>*:");
String _name_7 = this.getConfig().getIdeProject().getName();
_builder.append(_name_7, "\t\t\t\t\t\t");
_builder.append("-org.objectweb.asm*</exclude>");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t\t");
_builder.append("\t\t");
_builder.append("<exclude>*:");
String _name_8 = this.getConfig().getIdeProject().getName();
_builder.append(_name_8, "\t\t\t\t\t\t");
_builder.append("-org.apache.log4j*</exclude>");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");

156
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
View file

@ -173,14 +173,22 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
boolean _isSnapshot = this.getConfig().getXtextVersion().isSnapshot();
if (_isSnapshot) {
_builder.append("\t\t");
_builder.append("maven {");
_builder.append("maven { url \'https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/\' }");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t");
_builder.append("url \'https://oss.sonatype.org/content/repositories/snapshots\'");
_builder.append("maven { url \'https://ci.eclipse.org/xtext/job/xtext-core/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/\' }");
_builder.newLine();
_builder.append("\t\t");
_builder.append("}");
_builder.append("maven { url \'https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/\' }");
_builder.newLine();
_builder.append("\t\t");
_builder.append("maven { url \'https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/\' }");
_builder.newLine();
_builder.append("\t\t");
_builder.append("maven { url \'https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/\' }");
_builder.newLine();
_builder.append("\t\t");
_builder.append("maven { url \'https://ci.eclipse.org/xtext/job/xtext-web/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/\' }");
_builder.newLine();
}
}
@ -1814,19 +1822,81 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>sonatype-snapshots</id>");
_builder.append("<id>lib</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://oss.sonatype.org/content/repositories/snapshots</url>");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases><enabled>false</enabled></releases>");
_builder.append("<id>core</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots><enabled>true</enabled></snapshots>");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>extras</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>xtend</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>web</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>maven</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
@ -1878,19 +1948,81 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>sonatype-snapshots</id>");
_builder.append("<id>libp</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://oss.sonatype.org/content/repositories/snapshots</url>");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-lib/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases><enabled>false</enabled></releases>");
_builder.append("<id>corep</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots><enabled>true</enabled></snapshots>");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-core/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>extrasp</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-extras/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>xtendp</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-xtend/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>webp</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-web/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>mavenp</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://ci.eclipse.org/xtext/job/xtext-maven/job/cd_reload4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");

2
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file

@ -163,7 +163,7 @@ public class TargetPlatformProject extends ProjectDescriptor {
boolean _isSnapshot = this.getConfig().getXtextVersion().isSnapshot();
if (_isSnapshot) {
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/modeling/tmf/xtext/updates/nightly/\"/>");
_builder.append("<repository location=\"https://ci.eclipse.org/xtext/job/xtext-umbrella/job/cd_reload4j/lastSuccessfulBuild/artifact/build/p2-repository/\"/>");
_builder.newLine();
} else {
boolean _isStable = this.getConfig().getXtextVersion().isStable();

2
org.eclipse.xtext/build.gradle
View file

@ -4,7 +4,7 @@ description = 'Core component of Xtext.'
dependencies {
api project(':org.eclipse.xtext.util')
api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
api 'log4j:log4j'
api 'ch.qos.reload4j:reload4j'
api 'org.eclipse.platform:org.eclipse.equinox.common'
// remove me, once the following is fixed : https://bugs.eclipse.org/bugs/show_bug.cgi?id=510504
api 'org.eclipse.platform:org.eclipse.osgi'

2
releng/pom.xml
View file

@ -12,7 +12,7 @@
<tycho-version>1.7.0</tycho-version>
<root-dir>${basedir}/..</root-dir>
<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
<upstreamBranch>master</upstreamBranch>
<upstreamBranch>cd_reload4j</upstreamBranch>
</properties>
<repositories>