Skip to content

Commit

Permalink
Merge pull request #342 from eclipse/cd-jat
Browse files Browse the repository at this point in the history
Build against latest i-build and fix build
  • Loading branch information
cdietrich committed May 17, 2024
2 parents ef6c245 + 86eee94 commit e27f2f2
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pipeline {
environment {
PUBLISH_LOCATION = 'updates'
BUILD_TIMESTAMP = sh(returnStdout: true, script: 'date +%Y%m%d%H%M').trim()
TYCHO_VERSION = '4.0.3'
TYCHO_VERSION = '4.0.7'
TARGET_PLATFORM_PRIMARY = 'eclipse_2023_03-xtext_2_31_0'
TARGET_PLATFORM_LATEST = 'eclipse_2024_06-xtext_nightly'
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xpect.releng/Xpect.setup
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
<listAttribute key="M2_PROPERTIES">
<listEntry value="target-platform=eclipse_2023_03-xtext_2_31_0"/>
<listEntry value="user.home=$${system_property:user.home}"/>
<listEntry value="tycho-version=4.0.3"/>
<listEntry value="tycho-version=4.0.7"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<properties>
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
<xtextVersion>2.31.0</xtextVersion>
<tycho-version>4.0.3</tycho-version>
<tycho-version>4.0.7</tycho-version>
<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,19 @@
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/nightly/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<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/2024-06"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds"/>
</location>


<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.hamcrest.core.source" version="2.2.0.v20230809-1000"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Contributors:
<properties>
<os-jvm-flags />
<memory-settings>-Xmx1G</memory-settings>
<tycho-version>4.0.3</tycho-version>
<tycho-version>4.0.7</tycho-version>
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Contributors:

<properties>
<memory-settings>-Xmx1G</memory-settings>
<tycho-version>4.0.3</tycho-version>
<tycho-version>4.0.7</tycho-version>
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
<tycho-version>4.0.3</tycho-version>
<tycho-version>4.0.7</tycho-version>

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

0 comments on commit e27f2f2

Please sign in to comment.