diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9a4d08ee5..009df65db 100644 --- a/.github/workflows/maven-publish.yml +++ b/.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:.*\(.*\).*:\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 diff --git a/README.adoc b/README.adoc index 574c9eee9..37b37c40f 100644 --- a/README.adoc +++ b/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 diff --git a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar index 3c42ca489..c34d8d8f2 100644 Binary files a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar and b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar differ diff --git a/org.omg.sysml.logic.bundle/pom.xml b/org.omg.sysml.logic.bundle/pom.xml index 2e1428be8..1fcef7ea5 100644 --- a/org.omg.sysml.logic.bundle/pom.xml +++ b/org.omg.sysml.logic.bundle/pom.xml @@ -38,32 +38,21 @@ - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} + maven-antrun-plugin + ${maven-antrun-plugin.version} copy-jar-org.omg.sysml.logic initialize - copy-resources + run - ${project.basedir}/lib - - - - ${project.basedir}/../org.omg.sysml.logic/target - - org.omg.sysml.logic-*.jar - - - *-sources.jar - *-tests.jar - - false - - + + + @@ -87,10 +76,10 @@ org.apache.maven.plugins - maven-resources-plugin + maven-antrun-plugin [0,) - copy-resources + run diff --git a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar index e20b9e92b..54830b113 100644 Binary files a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar and b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar differ diff --git a/org.omg.sysml.model.bundle/pom.xml b/org.omg.sysml.model.bundle/pom.xml index 86adf740f..a4c55b2d8 100644 --- a/org.omg.sysml.model.bundle/pom.xml +++ b/org.omg.sysml.model.bundle/pom.xml @@ -38,34 +38,30 @@ - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} + maven-antrun-plugin + ${maven-antrun-plugin.version} copy-jar-org.omg.sysml.model initialize - copy-resources + run - ${project.basedir}/lib - - - - ${project.basedir}/../org.omg.sysml.model/target - - org.omg.sysml.model-*.jar - - - *-sources.jar - *-tests.jar - - false - - + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + copy-ecore-genmodel-org.omg.sysml.model initialize @@ -108,10 +104,10 @@ org.apache.maven.plugins - maven-resources-plugin + maven-antrun-plugin [0,) - copy-resources + run diff --git a/org.omg.sysml/pom.xml b/org.omg.sysml/pom.xml index e0dfd1fbf..e572a36fd 100644 --- a/org.omg.sysml/pom.xml +++ b/org.omg.sysml/pom.xml @@ -16,18 +16,26 @@ org.omg.sysml - org.omg.sysml.model.bundle + org.omg.sysml.model ${revision} org.omg.sysml - org.omg.sysml.logic.bundle + org.omg.sysml.logic ${revision} + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + wrapAsBundle + + org.apache.maven.plugins maven-clean-plugin diff --git a/pom.xml b/pom.xml index f57bd2e2d..c2a7bbe9c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ 2.6 3.5.0 3.3.2 + 3.8.1 3.7.1 1.12.0 16.20.2