diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b46e904..fc02a3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 1feaecb..3b91197 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,11 +3,6 @@ org.eclipse.tycho tycho-build - 2.7.5 - - - org.palladiosimulator - tycho-tp-refresh-maven-plugin - 0.2.6 + 4.0.13 diff --git a/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF index 4595592..7b46c9b 100644 --- a/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF @@ -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 diff --git a/features/tools.mdsd.library.emfeditutils.feature/feature.xml b/features/tools.mdsd.library.emfeditutils.feature/feature.xml index 1df1000..9e08c53 100644 --- a/features/tools.mdsd.library.emfeditutils.feature/feature.xml +++ b/features/tools.mdsd.library.emfeditutils.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> Tools that ease implementing providers and other framework utils for EMF edit plugins. diff --git a/pom.xml b/pom.xml index f087771..3e14d5c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,133 @@ - + 4.0.0 - - tools.mdsd - eclipse-parent-updatesite - 0.8.12 - tools.mdsd.library.emfeditutils - parent - 1.0.0 + parent + 1.1.0 pom + ${project.artifactId} + Utilities for EMF.Edit item property descriptors. + http://mdsd.tools + - ${project.basedir}/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target + 4.0.13 + 21 + ${java.version} + ${java.version} + UTF-8 + ${project.build.sourceEncoding} + releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + ${maven.multiModuleProjectDirectory}/${targetPlatform.relativePath} + + + + linux + gtk + x86_64 + + + linux + gtk + aarch64 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + macosx + cocoa + aarch64 + + + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + feature-source + + feature-source + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + attached-p2-metadata + package + + p2-metadata + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + true + + + ${project.basedir} + + target/** + xtend-gen/** + + + */.gitkeep + + + + + + + + bundles features releng - + diff --git a/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target b/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target index 924b34e..66c71be 100644 --- a/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target +++ b/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target @@ -1,8 +1,17 @@ - + + - + + + + + + + diff --git a/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml b/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml index e3534f9..f379732 100644 --- a/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml +++ b/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml @@ -1,9 +1,9 @@ - + - +