diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1560bef..c0957d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,13 +4,13 @@ on: [push, pull_request, workflow_dispatch] jobs: Library-StandaloneInitialization: - 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 runner-label: ubuntu-latest - java-version: 17 + java-version: 21 deploy-updatesite: 'releng/tools.mdsd.library.standalone.initialization.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.standalone.initialization.emfprofiles/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/.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.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF index c07568e..d724ab2 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Standalone Initialization EMFProfiles Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.emfprofiles -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.emfprofiles -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: tools.mdsd.library.standalone.initialization, org.modelversioning.emfprofile.registry;bundle-version="1.0.0" Export-Package: tools.mdsd.library.standalone.initialization.emfprofiles diff --git a/bundles/tools.mdsd.library.standalone.initialization.log4j/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization.log4j/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.log4j/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization.log4j/.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.standalone.initialization.log4j/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF index 6cedf0b..6006223 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Standalone Initialization Log4j Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.log4j -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Require-Bundle: org.eclipse.core.runtime, tools.mdsd.library.standalone.initialization -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.log4j Import-Package: org.apache.log4j;version="1.2.15" Export-Package: tools.mdsd.library.standalone.initialization.log4j diff --git a/bundles/tools.mdsd.library.standalone.initialization.ocl/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization.ocl/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.ocl/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization.ocl/.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.standalone.initialization.ocl/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF index d2ca081..314e846 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ecore OCL Standalone Initializer Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.ocl -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.ocl -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.ocl.ecore;bundle-version="3.15.0", tools.mdsd.library.standalone.initialization diff --git a/bundles/tools.mdsd.library.standalone.initialization/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization/.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.standalone.initialization/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF index 7a66ae9..2d1f607 100644 --- a/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Standalone Initialization Bundle-SymbolicName: tools.mdsd.library.standalone.initialization -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: tools.mdsd.library.standalone.initialization Export-Package: tools.mdsd.library.standalone.initialization, tools.mdsd.library.standalone.initialization.core diff --git a/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml index 0b71b5e..6be06c7 100644 --- a/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -14,7 +14,7 @@ id="tools.mdsd.library.standalone.initialization" download-size="0" install-size="0" - version="1.0.0" + version="1.1.0" unpack="false"/> diff --git a/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml index 16680ba..0ee6bfe 100644 --- a/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -13,13 +13,13 @@ + version="1.1.0"/> diff --git a/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml index b855e60..c161cc2 100644 --- a/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -12,13 +12,13 @@ + version="1.1.0"/> diff --git a/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml index aad84e4..d308972 100644 --- a/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -12,13 +12,13 @@ + version="1.1.0"/> diff --git a/pom.xml b/pom.xml index 3af1102..d3876ce 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,133 @@ - + 4.0.0 - - tools.mdsd - eclipse-parent-updatesite - 0.8.12 - tools.mdsd.standalone.initializer - parent - 1.0.0 + parent + 1.1.0 pom - + + ${project.artifactId} + Helpers for initializing EMF-based applications outside of an OSGi runtime. + http://mdsd.tools + - ${project.basedir}/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target + 4.0.13 + 21 + ${java.version} + ${java.version} + UTF-8 + ${project.build.sourceEncoding} + releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.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.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target b/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target index b2a0c3e..5f34363 100644 --- a/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target +++ b/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target @@ -1,8 +1,19 @@ - + + - + + + + + + + + + @@ -11,4 +22,3 @@ - diff --git a/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml b/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml index 1d5fcee..e3e8261 100644 --- a/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml +++ b/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml @@ -1,27 +1,27 @@ - + - + - + - + - + - + - + - +