Migration/standalone build eclipse 2024 06

.github/workflows/main.yml

@@ -4,13 +4,13 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   Library-JUnit5Utils:
-    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
-      java-version: 17
+      java-version: 21
       runner-label: ubuntu-latest
       deploy-updatesite: 'releng/tools.mdsd.junit5utils.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 }}

.mvn/extensions.xml

@@ -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>

bundles/tools.mdsd.junit5utils/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+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=11
+org.eclipse.jdt.core.compiler.source=21

bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF

@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: tools.mdsd.junit5utils;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Automatic-Module-Name: tools.mdsd.junit5utils
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: tools.mdsd.library.standalone.initialization,
  com.google.guava;bundle-version="27.1.0"
 Bundle-ActivationPolicy: lazy

features/tools.mdsd.junit5utils.feature/feature.xml

@@ -2,9 +2,9 @@
 <feature
       id="tools.mdsd.junit5utils.feature"
       label="Library-JUnit5Utils 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">
 
    <requires>
       <import feature="tools.mdsd.license.epl2"/>

pom.xml

@@ -3,20 +3,139 @@
 		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-junit5utils</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>JUnit 5 extensions for standalone EMF tests.</description>
+	<url>http://mdsd.tools</url>
+
 	<properties>
-		<org.palladiosimulator.maven.tychotprefresh.tplocation.2>${project.basedir}/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.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.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.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.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<includes>
+						<include>**/*Test.java</include>
+						<include>**/*Tests.java</include>
+					</includes>
+					<failIfNoTests>false</failIfNoTests>
+				</configuration>
+			</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>

releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target

@@ -1,13 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Library-JUnit5Utils Target Platform" sequenceNumber="1">
+<?pde version="3.8"?><target name="Library-JUnit5Utils 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://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"/>
+<unit id="com.google.guava" version="0.0.0"/>
+<unit id="com.google.guava.failureaccess" version="0.0.0"/>
+<unit id="org.junit" version="0.0.0"/>
+<unit id="junit-jupiter-api" version="0.0.0"/>
+<unit id="junit-jupiter-engine" version="0.0.0"/>
+<unit id="junit-platform-commons" version="0.0.0"/>
+<unit id="junit-platform-launcher" version="0.0.0"/>
+<unit id="org.apiguardian.api" version="0.0.0"/>
+</location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
 <unit id="tools.mdsd.license.epl2.feature.group" version="0.0.0"/>
-<repository location="https://updatesite.mdsd.tools/build-licensefeature/releases/1.0.0"/>
+<repository location="https://updatesite.mdsd.tools/build-licensefeature/releases/1.1.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
 <unit id="tools.mdsd.library.standalone.initialization.core.feature.feature.group" version="0.0.0"/>
-<repository location="https://updatesite.mdsd.tools/library-standaloneinitialization/releases/1.0.0"/>
+<repository location="https://updatesite.mdsd.tools/library-standaloneinitialization/releases/1.1.0/"/>
 </location>
 </locations>
 </target>

releng/tools.mdsd.junit5utils.updatesite/category.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="tools.mdsd.junit5utils.feature" version="1.0.0">
+   <feature id="tools.mdsd.junit5utils.feature" version="1.1.0">
       <category name="library-junit5utils.category"/>
    </feature>
-   <feature id="tools.mdsd.junit5utils.feature.source" version="1.0.0">
+   <feature id="tools.mdsd.junit5utils.feature.source" version="1.1.0">
       <category name="library-junit5utils.category.source"/>
    </feature>
    <category-def name="library-junit5utils.category" label="Library-JUnit5Utils"/>

tests/tools.mdsd.junit5utils.test/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+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=11
+org.eclipse.jdt.core.compiler.source=21

tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF

@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EclipsePlugin Test
 Bundle-SymbolicName: tools.mdsd.junit5utils.test
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
 Fragment-Host: tools.mdsd.junit5utils;bundle-version="1.0.0"
 Automatic-Module-Name: tools.mdsd.junit5utils.test
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: org.junit;version="4.13.0",
  org.junit.jupiter.api;version="5.4.2"
 Bundle-Vendor: tools.mdsd

tests/tools.mdsd.junit5utils.test/pom.xml

@@ -5,11 +5,11 @@
   <parent>
     <groupId>tools.mdsd.library-junit5utils</groupId>
     <artifactId>tests</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>..\.polyglot.pom.tycho</relativePath>
   </parent>
   <artifactId>tools.mdsd.junit5utils.test</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <build>