Skip to content

Commit

Permalink
Merge pull request #369 from eclipse/cd-tycho-4010
Browse files Browse the repository at this point in the history 
bump tycho version
  • Loading branch information
@cdietrich
cdietrich authored Dec 17, 2024
2 parents 6af102a + f141f16 commit bda6bc5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
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.7'
TYCHO_VERSION = '4.0.10'
TARGET_PLATFORM_PRIMARY = 'xpect_r202403'
TARGET_PLATFORM_LATEST = 'xpect_latest'
}
Expand Down
5 changes: 2 additions & 3 deletions org.eclipse.xpect.releng/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ Maven release artifacts are automatically deployed during a release build

### Update maven version

To select an other target platform use e.g. `-Dtarget-platform=eclipse_2023_03-xtext_2_31_0`
To select an other target platform use e.g. `-Dtarget-platform=xpect_latest`

```mvn org.eclipse.tycho:tycho-versions-plugin:set-version -Dtarget-platform=eclipse_2023_03-xtext_2_31_0 -P'!xtext-examples' -DnewVersion="0.2.0.v20190619" -Dartifacts="org.eclipse.xpect.parent,org.eclipse.xpect.test.parent"```
```mvn org.eclipse.tycho:tycho-versions-plugin:set-version -Dtarget-platform=xpect_latest -P'!xtext-examples' -DnewVersion="0.2.0.v20190619" -Dartifacts="org.eclipse.xpect.parent,org.eclipse.xpect.test.parent"```

Manually change the property value of `target-platform-version` to 0.2.0.v20190619 in:
```
org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xpect.releng/Xpect.setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value="!promote"/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="target-platform=eclipse_2023_03-xtext_2_31_0"/>
<listEntry value="target-platform=xpect_r202403"/>
<listEntry value="user.home=$${system_property:user.home}"/>
<listEntry value="tycho-version=4.0.7"/>
<listEntry value="tycho-version=4.0.10"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
Expand Down
29 changes: 2 additions & 27 deletions org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
<packaging>pom</packaging>

<properties>
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
<target-platform>xpect_r202403</target-platform>
<xtextVersion>2.31.0</xtextVersion>
<tycho-version>4.0.7</tycho-version>
<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
<tycho-version>4.0.10</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -291,30 +290,6 @@
</plugins>
</build>
</profile>
<profile>
<id>eclipse_2024_06-xtext_nightly</id>
<activation>
<property>
<name>target-platform</name>
<value>eclipse_2024_06-xtext_nightly</value>
</property>
</activation>
<modules>
<module>../target-platforms/eclipse_2024_06-xtext_nightly</module>
</modules>
</profile>
<profile>
<id>eclipse_2023_03-xtext_2_31_0</id>
<activation>
<property>
<name>target-platform</name>
<value>eclipse_2023_03-xtext_2_31_0</value>
</property>
</activation>
<modules>
<module>../target-platforms/eclipse_2023_03-xtext_2_31_0</module>
</modules>
</profile>
<profile>
<id>maven-publish</id>
<distributionManagement>
Expand Down
5 changes: 2 additions & 3 deletions org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ Contributors:
<properties>
<os-jvm-flags />
<memory-settings>-Xmx1G</memory-settings>
<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>
<tycho-version>4.0.10</tycho-version>
<target-platform>xpect_r202403</target-platform>
</properties>

<profiles>
Expand Down
13 changes: 5 additions & 8 deletions org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ Contributors:

<properties>
<memory-settings>-Xmx1G</memory-settings>
<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>
<tycho-version>4.0.10</tycho-version>
<target-platform>xpect_r202403</target-platform>
</properties>

<profiles>
Expand Down Expand Up @@ -106,11 +105,9 @@ Contributors:
<version>${tycho-version}</version>
<configuration>
<target>
<artifact>
<groupId>org.eclipse.xpect</groupId>
<artifactId>org.eclipse.xpect.target.${target-platform}</artifactId>
<version>${target-platform-version}</version>
</artifact>
<file>
${maven.multiModuleProjectDirectory}/${target-platform}.target
</file>
</target>
<environments>
<environment>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
<tycho-version>4.0.7</tycho-version>
<target-platform>xpect_r202403</target-platform>
<tycho-version>4.0.10</tycho-version>

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

0 comments on commit bda6bc5

Please sign in to comment.