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

[eclipse/xtext#1422] update to tycho 1.4.0

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2019-03-24 09:30:10 +01:00
parent d91faabd5d
commit ffd6e4ce40
14 changed files with 11 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml vendored
View file

@ -12,7 +12,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.3.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>

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

@ -12,7 +12,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.3.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>

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

@ -12,7 +12,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.3.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>

19
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.tests/pom.xml vendored
View file

@ -15,25 +15,6 @@
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<extraRequirements>
<!-- to get the org.eclipse.osgi.compatibility.state plugin
if the target platform is Luna or later.
(backward compatible with kepler and previous versions)
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml vendored
View file

@ -12,7 +12,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.3.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>

19
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.tests/pom.xml vendored
View file

@ -15,25 +15,6 @@
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<extraRequirements>
<!-- to get the org.eclipse.osgi.compatibility.state plugin
if the target platform is Luna or later.
(backward compatible with kepler and previous versions)
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/pom.xml vendored
View file

@ -12,7 +12,7 @@
<maven.compiler.source>9</maven.compiler.source>
<maven.compiler.target>9</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.3.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>

19
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.tests/pom.xml vendored
View file

@ -15,25 +15,6 @@
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<extraRequirements>
<!-- to get the org.eclipse.osgi.compatibility.state plugin
if the target platform is Luna or later.
(backward compatible with kepler and previous versions)
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml vendored
View file

@ -12,7 +12,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.3.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>

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

@ -68,7 +68,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}
def String getTychoVersion() {
'1.3.0'
'1.4.0'
}
def private CharSequence loadResource(String resourcePath) {

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

@ -103,8 +103,6 @@ abstract class TestProjectDescriptor extends ProjectDescriptor {
<useUIHarness>true</useUIHarness>
</configuration>
</plugin>
«ENDIF»
«IF isEclipsePluginProject»
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>

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

@ -115,7 +115,7 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
}
public String getTychoVersion() {
return "1.3.0";
return "1.4.0";
}
private CharSequence loadResource(final String resourcePath) {

9
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java
View file

@ -238,11 +238,6 @@ public abstract class TestProjectDescriptor extends ProjectDescriptor {
_builder.append("\t\t");
_builder.append("</plugin>");
_builder.newLine();
}
}
{
boolean _isEclipsePluginProject_1 = this.isEclipsePluginProject();
if (_isEclipsePluginProject_1) {
_builder.append("\t\t");
_builder.append("<plugin>");
_builder.newLine();
@ -320,8 +315,8 @@ public abstract class TestProjectDescriptor extends ProjectDescriptor {
}
}
{
boolean _isEclipsePluginProject_2 = this.isEclipsePluginProject();
boolean _not = (!_isEclipsePluginProject_2);
boolean _isEclipsePluginProject_1 = this.isEclipsePluginProject();
boolean _not = (!_isEclipsePluginProject_1);
if (_not) {
_builder.append("\t\t");
_builder.append("<plugin>");

2
releng/pom.xml
View file

@ -9,7 +9,7 @@
<properties>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<tycho-version>1.3.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<root-dir>${basedir}/..</root-dir>
<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
<upstreamBranch>master</upstreamBranch>