Skip to content

Commit e27f2f2

Browse files
authored
Merge pull request #342 from eclipse/cd-jat
Build against latest i-build and fix build
2 parents ef6c245 + 86eee94 commit e27f2f2

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pipeline {
2121
environment {
2222
PUBLISH_LOCATION = 'updates'
2323
BUILD_TIMESTAMP = sh(returnStdout: true, script: 'date +%Y%m%d%H%M').trim()
24-
TYCHO_VERSION = '4.0.3'
24+
TYCHO_VERSION = '4.0.7'
2525
TARGET_PLATFORM_PRIMARY = 'eclipse_2023_03-xtext_2_31_0'
2626
TARGET_PLATFORM_LATEST = 'eclipse_2024_06-xtext_nightly'
2727
}

org.eclipse.xpect.releng/Xpect.setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
<listAttribute key="M2_PROPERTIES">
253253
<listEntry value="target-platform=eclipse_2023_03-xtext_2_31_0"/>
254254
<listEntry value="user.home=$${system_property:user.home}"/>
255-
<listEntry value="tycho-version=4.0.3"/>
255+
<listEntry value="tycho-version=4.0.7"/>
256256
</listAttribute>
257257
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
258258
<booleanAttribute key="M2_SKIP_TESTS" value="true"/>

org.eclipse.xpect.releng/maven-plugin-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
1919
<xtextVersion>2.31.0</xtextVersion>
20-
<tycho-version>4.0.3</tycho-version>
20+
<tycho-version>4.0.7</tycho-version>
2121
<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
</properties>

org.eclipse.xpect.releng/target-platforms/eclipse_2024_06-xtext_nightly/org.eclipse.xpect.target.eclipse_2023_09-xtext_nightly.target

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,19 @@
1515
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/nightly/"/>
1616
</location>
1717
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
18-
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
19-
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
20-
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
2118
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
2219
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
2320
<repository location="https://download.eclipse.org/releases/2024-06"/>
2421
</location>
22+
23+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
24+
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
25+
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
26+
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
27+
<repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds"/>
28+
</location>
29+
30+
2531
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
2632
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
2733
<unit id="org.hamcrest.core.source" version="2.2.0.v20230809-1000"/>

org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Contributors:
2020
<properties>
2121
<os-jvm-flags />
2222
<memory-settings>-Xmx1G</memory-settings>
23-
<tycho-version>4.0.3</tycho-version>
23+
<tycho-version>4.0.7</tycho-version>
2424
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
2525
<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
2626
</properties>

org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Contributors:
1919

2020
<properties>
2121
<memory-settings>-Xmx1G</memory-settings>
22-
<tycho-version>4.0.3</tycho-version>
22+
<tycho-version>4.0.7</tycho-version>
2323
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
2424
<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
2525
</properties>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<maven.compiler.source>11</maven.compiler.source>
2020
<maven.compiler.target>11</maven.compiler.target>
2121
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
22-
<tycho-version>4.0.3</tycho-version>
22+
<tycho-version>4.0.7</tycho-version>
2323

2424
<!-- Used for promotion -->
2525
<eclipse.repo>https://download.eclipse.org/releases/2023-09</eclipse.repo>

0 commit comments

Comments
 (0)