Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ on: [push, pull_request, workflow_dispatch]

jobs:
Library-EMFEditUtils:
uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@master
uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@FixTagCreationLogic
with:
use-display-output: true
no-caching: true
java-version: 17
java-version: 21
runner-label: ubuntu-latest
deploy-updatesite: 'releng/tools.mdsd.library.emfeditutils.updatesite/target/repository'
release-version: '1.0.0'
release-version: '1.1.0'
secrets:
SERVER_SSH_KEY: ${{ secrets.DEPLOYMENT_SERVER_SSH_KEY }}
REMOTE_HOST: ${{ secrets.DEPLOYMENT_REMOTE_HOST }}
Expand Down
7 changes: 1 addition & 6 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.5</version>
</extension>
<extension>
<groupId>org.palladiosimulator</groupId>
<artifactId>tycho-tp-refresh-maven-plugin</artifactId>
<version>0.2.6</version>
<version>4.0.13</version>
</extension>
</extensions>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=21
4 changes: 2 additions & 2 deletions bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Edit Utils
Bundle-SymbolicName: tools.mdsd.library.emfeditutils
Bundle-Version: 1.0.0
Bundle-Version: 1.1.0
Automatic-Module-Name: tools.mdsd.library.emfeditutils
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.emf.edit
Export-Package: tools.mdsd.library.emfeditutils.itempropertydescriptor
4 changes: 2 additions & 2 deletions features/tools.mdsd.library.emfeditutils.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<feature
id="tools.mdsd.library.emfeditutils.feature"
label="EMF Edit Utils Feature"
version="1.0.0"
version="1.1.0"
license-feature="tools.mdsd.license.epl2"
license-feature-version="1.0.0">
license-feature-version="1.1.0">

<description>
Tools that ease implementing providers and other framework utils for EMF edit plugins.
Expand Down
127 changes: 117 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>tools.mdsd</groupId>
<artifactId>eclipse-parent-updatesite</artifactId>
<version>0.8.12</version>
</parent>
<groupId>tools.mdsd.library.emfeditutils</groupId>
<artifactId>parent</artifactId>
<version>1.0.0</version>
<artifactId>parent</artifactId>
<version>1.1.0</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
<description>Utilities for EMF.Edit item property descriptors.</description>
<url>http://mdsd.tools</url>

<properties>
<org.palladiosimulator.maven.tychotprefresh.tplocation.2>${project.basedir}/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target</org.palladiosimulator.maven.tychotprefresh.tplocation.2>
<tycho.version>4.0.13</tycho.version>
<java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<targetPlatform.relativePath>releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target</targetPlatform.relativePath>
</properties>

<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>
<version>${tycho.version}</version>
<configuration>
<target>
<!-- Resolved once for the whole reactor instead of per module. -->
<file>${maven.multiModuleProjectDirectory}/${targetPlatform.relativePath}</file>
</target>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>aarch64</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>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
<execution>
<id>feature-source</id>
<goals>
<goal>feature-source</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<id>attached-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
<fileset>
<directory>${project.basedir}</directory>
<includes>
<include>target/**</include>
<include>xtend-gen/**</include>
</includes>
<excludes>
<exclude>*/.gitkeep</exclude>
</excludes>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>

<modules>
<module>bundles</module>
<module>features</module>
<module>releng</module>
</modules>

</project>
13 changes: 11 additions & 2 deletions releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="tools.mdsd.ecoreworkflow Target Platform" sequenceNumber="1">
<?pde version="3.8"?><target name="tools.mdsd.library.emfeditutils Target Platform" sequenceNumber="2">
<locations>
<!-- Eclipse base. Until the move to a standalone build this came in through the
eclipse-modeling-2023-03 target that the shared parent merged into every
repository; it is now declared here, trimmed to what this repository uses. -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://updatesite.mdsd.tools/build-licensefeature/releases/1.0.0/"/>
<repository location="https://download.eclipse.org/releases/2024-06/202406121000/"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://updatesite.mdsd.tools/build-licensefeature/releases/1.1.0/"/>
<unit id="tools.mdsd.license.epl2.feature.group" version="0.0.0"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature id="tools.mdsd.library.emfeditutils.feature" version="1.0.0">
<feature id="tools.mdsd.library.emfeditutils.feature" version="1.1.0">
<category name="tools.mdsd.library.emfeditutils"/>
</feature>
<feature id="tools.mdsd.library.emfeditutils.feature.source" version="1.0.0">
<feature id="tools.mdsd.library.emfeditutils.feature.source" version="1.1.0">
<category name="tools.mdsd.library.emfeditutils.source"/>
</feature>
<category-def name="tools.mdsd.library.emfeditutils" label="MDSD Tools EMF Edit Utils"/>
Expand Down