Release build

.github/workflows/maven-publish.yml

@@ -25,10 +25,15 @@ jobs:
         java-version: '21'
         distribution: 'temurin'
         cache: maven
-    - name: Remove -snapshot from version
-      run: ./mvnw -B versions:set -DremoveSnapshot=true
+    # Keep the checkout unchanged and pass the non-SNAPSHOT revision to Maven
+    # explicitly, because versions:set updates project.version but leaves the
+    # revision property behind in this build.
+    - name: Resolve release version
+      run: |
+        release_version=$(sed -n 's:.*<revision>\(.*\)</revision>.*:\1:p' pom.xml | head -n 1 | sed 's/-SNAPSHOT$//')
+        echo "RELEASE_VERSION=${release_version}" >> "$GITHUB_ENV"
     - name: Publish to Github Packages
-      run: ./mvnw -B deploy -DskipTests=true
+      run: ./mvnw -B clean install -DskipTests=true -Drevision=${{ env.RELEASE_VERSION }}
       env:
         GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password
     - name: Upload SysML Library .kpar files

README.adoc

@@ -84,8 +84,11 @@ image:oomph-projects.png[oomph projects]
    * Click "Reload Target Platform" on the upper right. 
 
 5. https://maven.apache.org/[Maven] is used to perform a coordinated build of all projects.
-   * To build the repository, invoke `mvn clean install` from the base `SysML-v2-Pilot-Implementation` directory.
-   * If you have https://www.eclipse.org/m2e/[M2Eclipse] installed (with the Tycho Project Configurators connector), it can also launch a Maven build in Eclipse using the launch configuration in `SysML-v2-Pilot-Implementation/launch`.
+   * The canonical full repository build is run from the base `SysML-v2-Pilot-Implementation` directory with `mvn clean install`.
+   * This Maven build prepares generated and copied artifacts that are required by downstream plug-in projects during the Tycho build.
+   * For example, the jars consumed from `org.omg.sysml.model.bundle/lib` and `org.omg.sysml.logic.bundle/lib` are populated by Maven lifecycle executions and may remain empty until a Maven build is run.
+   * A plain Eclipse workspace build does not execute the full Maven lifecycle, so it should not be treated as a full repository build.
+   * If you have https://www.eclipse.org/m2e/[M2Eclipse] installed with the Tycho Project Configurators connector, you can launch the same kind of Maven build from Eclipse by using the launch configuration in `SysML-v2-Pilot-Implementation/launch` or by running a Maven build manually from the repository root.
 
 === Runtime Editing Environment
 

org.omg.sysml.logic.bundle/pom.xml

@@ -38,32 +38,21 @@
 			</plugin>
 			<!-- Copy org.omg.sysml.logic jar in lib/ before the Tycho build -->
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven-resources-plugin.version}</version>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>${maven-antrun-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>copy-jar-org.omg.sysml.logic</id>
 						<phase>initialize</phase>
 						<goals>
-							<goal>copy-resources</goal>
+							<goal>run</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.basedir}/lib</outputDirectory>
-							<resources>
-								<resource>
-									<directory>
-										${project.basedir}/../org.omg.sysml.logic/target</directory>
-									<includes>
-										<include>org.omg.sysml.logic-*.jar</include>
-									</includes>
-									<excludes>
-										<exclude>*-sources.jar</exclude>
-										<exclude>*-tests.jar</exclude>
-									</excludes>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
+							<target>
+								<copy file="${project.basedir}/../org.omg.sysml.logic/target/org.omg.sysml.logic-${revision}.jar"
+									tofile="${project.basedir}/lib/org.omg.sysml.logic-${revision}.jar"
+									overwrite="true" />
+							</target>
 						</configuration>
 					</execution>
 				</executions>
@@ -87,10 +76,10 @@
 									<pluginExecution>
 										<pluginExecutionFilter>
 											<groupId>org.apache.maven.plugins</groupId>
-											<artifactId>maven-resources-plugin</artifactId>
+											<artifactId>maven-antrun-plugin</artifactId>
 											<versionRange>[0,)</versionRange>
 											<goals>
-												<goal>copy-resources</goal>
+												<goal>run</goal>
 											</goals>
 										</pluginExecutionFilter>
 										<action>

org.omg.sysml.model.bundle/pom.xml

@@ -38,34 +38,30 @@
 			</plugin>
 			<!-- Copy org.omg.sysml.model jar in lib/ before the Tycho build -->
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven-resources-plugin.version}</version>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>${maven-antrun-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>copy-jar-org.omg.sysml.model</id>
 						<phase>initialize</phase>
 						<goals>
-							<goal>copy-resources</goal>
+							<goal>run</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.basedir}/lib</outputDirectory>
-							<resources>
-								<resource>
-									<directory>
-										${project.basedir}/../org.omg.sysml.model/target</directory>
-									<includes>
-										<include>org.omg.sysml.model-*.jar</include>
-									</includes>
-									<excludes>
-										<exclude>*-sources.jar</exclude>
-										<exclude>*-tests.jar</exclude>
-									</excludes>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
+							<target>
+								<copy file="${project.basedir}/../org.omg.sysml.model/target/org.omg.sysml.model-${revision}.jar"
+									tofile="${project.basedir}/lib/org.omg.sysml.model-${revision}.jar"
+									overwrite="true" />
+							</target>
 						</configuration>
 					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>${maven-resources-plugin.version}</version>
+				<executions>
 					<execution>
 						<id>copy-ecore-genmodel-org.omg.sysml.model</id>
 						<phase>initialize</phase>
@@ -108,10 +104,10 @@
 									<pluginExecution>
 										<pluginExecutionFilter>
 											<groupId>org.apache.maven.plugins</groupId>
-											<artifactId>maven-resources-plugin</artifactId>
+											<artifactId>maven-antrun-plugin</artifactId>
 											<versionRange>[0,)</versionRange>
 											<goals>
-												<goal>copy-resources</goal>
+												<goal>run</goal>
 											</goals>
 										</pluginExecutionFilter>
 										<action>

org.omg.sysml/pom.xml

@@ -16,18 +16,26 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.omg.sysml</groupId>
-			<artifactId>org.omg.sysml.model.bundle</artifactId>
+			<artifactId>org.omg.sysml.model</artifactId>
 			<version>${revision}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.omg.sysml</groupId>
-			<artifactId>org.omg.sysml.logic.bundle</artifactId>
+			<artifactId>org.omg.sysml.logic</artifactId>
 			<version>${revision}</version>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<pomDependencies>wrapAsBundle</pomDependencies>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>

pom.xml

@@ -19,6 +19,7 @@
     <maven-resources-plugin.version>2.6</maven-resources-plugin.version>
     <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
     <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+    <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
     <frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
     <node.version>16.20.2</node.version>