Skip to content

Commit

Permalink
Move to Eclipse 2024-09
Browse files Browse the repository at this point in the history 
Signed-off-by: Pierre-Charles David <[email protected]>
  • Loading branch information
@pcdavid
pcdavid committed Sep 12, 2024
1 parent 41f6f02 commit c837a9e
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 132 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.sirius.tools.kit-feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.sirius.tools.kit"
label="%featureName"
version="24.6.1"
version="24.9.0"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.sirius.tools.kit-feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.sirius.tools</groupId>
<artifactId>dev-kit</artifactId>
<version>24.6.1</version>
<version>24.9.0</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.sirius.tools.kit-repo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.sirius.tools</groupId>
<artifactId>dev-kit</artifactId>
<version>24.6.1</version>
<version>24.9.0</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.sirius.tools.kit.target/sirius-kit.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.sonarlint.eclipse.feature.feature.group" version="0.0.0"/>
<repository id="SonarLint" location="https://binaries.sonarsource.com/SonarLint-for-Eclipse/releases/10.3.0.82013"/>
<repository id="SonarLint" location="https://binaries.sonarsource.com/SonarLint-for-Eclipse/releases/10.6.0.82217"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
Expand All @@ -37,7 +37,7 @@
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
<repository id="Eclipse-2024-06" location="https://download.eclipse.org/releases/2024-06"/>
<repository id="Eclipse-2024-09" location="https://download.eclipse.org/releases/2024-09"/>
</location>
</locations>
</target>
260 changes: 133 additions & 127 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,138 +11,144 @@
Contributors:
Obeo - Initial API and implementation
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.eclipse.sirius.tools</groupId>
<artifactId>dev-kit</artifactId>
<version>24.6.1</version>
<packaging>pom</packaging>
<groupId>org.eclipse.sirius.tools</groupId>
<artifactId>dev-kit</artifactId>
<version>24.9.0</version>
<packaging>pom</packaging>

<name>Sirius Development Kit</name>
<name>Sirius Development Kit</name>

<licenses>
<license>
<name>Eclipse Public License 2.0</name>
<comments>
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which accompanies this
distribution, and is available at http://www.eclipse.org/legal/epl-2.0/
</comments>
</license>
</licenses>
<licenses>
<license>
<name>Eclipse Public License 2.0</name>
<comments>
This program and the accompanying materials are made available
under the
terms of the Eclipse Public License 2.0 which accompanies this
distribution, and is available at
http://www.eclipse.org/legal/epl-2.0/
</comments>
</license>
</licenses>

<properties>
<tycho-version>4.0.8</tycho-version>
<tycho-extras-version>4.0.8</tycho-extras-version>
<target-platform-path>.</target-platform-path>
</properties>
<properties>
<tycho-version>4.0.8</tycho-version>
<tycho-extras-version>4.0.8</tycho-extras-version>
<target-platform-path>.</target-platform-path>
</properties>

<modules>
<module>./org.eclipse.sirius.tools.kit-feature</module>
<module>./org.eclipse.sirius.tools.kit-repo</module>
</modules>
<modules>
<module>./org.eclipse.sirius.tools.kit-feature</module>
<module>./org.eclipse.sirius.tools.kit-repo</module>
</modules>

<build>
<sourceDirectory>src</sourceDirectory>
<build>
<sourceDirectory>src</sourceDirectory>

<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<optionalDependencies>ignore</optionalDependencies>
</dependency-resolution>
<target>
<artifact>
<groupId>org.eclipse.sirius.tools</groupId>
<artifactId>dev-kit</artifactId>
<version>24.6.1</version>
<classifier>./org.eclipse.sirius.tools.kit.target/sirius-kit</classifier>
</artifact>
</target>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<useProjectSettings>false</useProjectSettings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
<!-- Exclude pom.xml and pom.properties from generated archive (see http://maven.apache.org/shared/maven-archiver/) -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-extras-version}</version>
<executions>
<execution>
<id>p2-metadata</id>
<goals>
<goal>p2-metadata</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<optionalDependencies>ignore</optionalDependencies>
</dependency-resolution>
<target>
<artifact>
<groupId>org.eclipse.sirius.tools</groupId>
<artifactId>dev-kit</artifactId>
<version>24.9.0</version>
<classifier>
./org.eclipse.sirius.tools.kit.target/sirius-kit</classifier>
</artifact>
</target>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<useProjectSettings>false</useProjectSettings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
<!-- Exclude pom.xml and pom.properties from generated archive
(see http://maven.apache.org/shared/maven-archiver/) -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-extras-version}</version>
<executions>
<execution>
<id>p2-metadata</id>
<goals>
<goal>p2-metadata</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

0 comments on commit c837a9e

Please sign in to comment.