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

Merge pull request #1858 from eclipse/cd_xtext_issue2038_dmwiz

Browse source 
[eclipse/xtext#2038] use 2022-06 in wizard
This commit is contained in:
Christian Dietrich 2022-03-17 11:00:46 +01:00 committed by GitHub
commit 74628b7c3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target vendored
View file

@ -8,7 +8,7 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-03"/>
<repository location="https://download.eclipse.org/releases/2022-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

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

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@ -62,7 +62,7 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
«IF config.javaVersion.isAtLeast(JavaVersion.JAVA11)»
<repository location="https://download.eclipse.org/releases/2022-03"/>
<repository location="https://download.eclipse.org/releases/2022-06"/>
«ELSE»
<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->
<repository location="https://download.eclipse.org/releases/2020-06"/>

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

@ -1,5 +1,5 @@
/**
* Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@ -112,7 +112,7 @@ public class TargetPlatformProject extends ProjectDescriptor {
boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11);
if (_isAtLeast) {
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2022-03\"/>");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2022-06\"/>");
_builder.newLine();
} else {
_builder.append("\t\t\t");