Merge branch 'dev' into 'master' (8be51f77) · Commits · TDL Open Source / TOP IDE

.gitignore

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@ bin/
		*.xtendbin
		.DS_Store
		target/
		*.xml_gen

.gitlab-ci.yml

+56 −6

Original line number	Diff line number	Diff line
		@@ -26,6 +26,14 @@
		# * Verify but don't deploy merge requests.
		# * Deploy built artifacts from master branch only.

		spec:
		inputs:
		reset-cache:
		type: boolean
		default: false

		---

		variables:
		# CI_TARGET_BRANCH: $CI_DEFAULT_BRANCH
		# CI_TARGET_BRANCH: "ttf-022"
		@@ -49,6 +57,8 @@ variables:
		STANDALONE_LOCATION: "plugins/org.etsi.mts.tdl.standalone/target"
		STANDALONE_NAME: "org.etsi.mts.tdl.standalone-1.0.0-SNAPSHOT-shadow.jar"
		STANDALONE_PATH: "${STANDALONE_LOCATION}/${STANDALONE_NAME}"
		CHANGELOG_PATH: "changelog.txt"


		# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
		MAVEN_OPTS: >-
		@@ -85,12 +95,11 @@ variables:
		# - when: never



		# This template uses the latest Maven 3 release, e.g., 3.8.6, and OpenJDK 8 (LTS)
		# for verifying and deploying images
		# Maven 3.8.x REQUIRES HTTPS repositories.
		# See https://maven.apache.org/docs/3.8.1/release-notes.html#how-to-fix-when-i-get-a-http-repository-blocked for more.
		image: maven:3.9.6-eclipse-temurin-17
		image: maven:3.9.6-eclipse-temurin-21


		# Cache downloaded dependencies and plugins between builds.
		@@ -100,6 +109,7 @@ image: maven:3.9.6-eclipse-temurin-17
		cache:
		paths:
		- .m2/repository
		- $CI_PROJECT_DIR/.m2/repository

		# For merge requests do not `deploy` but only run `verify`.
		# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
		@@ -152,9 +162,12 @@ build-job: # This job runs in the build stage, which runs first.
		# - apt-cache gencaches
		# - apt install -y zip unzip
		# - zip --help
		# - echo "Cleaning caches"
		- rm -rf $CI_PROJECT_DIR/.m2/*
		- rm -rf ~/.m2/*
		- \|
		if $[[ inputs.reset-cache ]]; then
		echo "Cleaning caches"
		rm -rf $CI_PROJECT_DIR/.m2/*
		rm -rf ~/.m2/*
		fi
		# - ls $CI_PROJECT_DIR/.m2/repository
		- echo "Compiling the code..."
		- top -b -n 1 -e m
		@@ -193,10 +206,15 @@ prepare-job:
		- echo "VERSION=$VERSION" >> variables.env
		- echo "PACKAGE_REGISTRY_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ide/${VERSION}" >> variables.env
		- echo "PACKAGE_LATEST_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ide/latest" >> variables.env
		- CHANGES=`git log $(git describe --tags --abbrev=0)..HEAD --format='* %h %s'`
		- echo "$CHANGES" >> $CHANGELOG_PATH
		- cat variables.env
		- cat $CHANGELOG_PATH
		artifacts:
		reports:
		dotenv: variables.env # Use artifacts:reports:dotenv to expose the variables to other jobs
		paths:
		- $CHANGELOG_PATH

		# https://gitlab.com/gitlab-org/release-cli/-/tree/master/docs/examples/release-assets-as-generic-package/
		upload-job:
		@@ -286,10 +304,13 @@ release-job:
		script:
		# --description "Published automatically, permalink for installation (valid for 7 days) at https://labs.etsi.org/rep/top/ide/-/releases/permalink/latest/downloads/repository."
		- echo $BUILD_JOB_ID
		- CHANGES=`git log $(git describe --tags --abbrev=0)..HEAD --format='* %h %s'`
		- echo $CHANGES
		- \|
		release-cli create --name "Release $VERSION" \
		--tag-name $VERSION \
		--ref $CI_COMMIT_SHA \
		--description "$CHANGES" \
		--assets-link "{\"name\":\"${PACKAGE_NAME} (downloadable archive)\",\"url\":\"${PACKAGE_REGISTRY_URL}/${ARCHIVE_NAME}\",\"filepath\":\"/repository-archive\"}" \
		--assets-link "{\"name\":\"${PACKAGE_NAME} (snapshot ${RELEASE_KEY} repository for ${VERSION} (exipres in 7 days))\",\"url\":\"${REPO_PREFIX}/${BUILD_JOB_ID}/${REPO_PATH}\"}" \
		--assets-link "{\"name\":\"${PACKAGE_NAME} (latest ${RELEASE_KEY} release repository (permalink))\",\"url\":\"${RELEASE_PAGE}\"}" \
		@@ -299,3 +320,32 @@ release-job:
		# --assets-link "{\"name\":\"${WINDOWS_GUI_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WINDOWS_GUI_JAR}\"}" \
		# --assets-link "{\"name\":\"${CLI_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${CLI_JAR}\"}" \
		# --assets-link "{\"name\":\"${LIB_JAR}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LIB_JAR}\"}"

		.release-job-new:
		stage: release
		image: registry.gitlab.com/gitlab-org/cli:latest
		needs:
		- job: prepare-job
		artifacts: true
		- job: build-job
		artifacts: true
		- job: pages
		artifacts: true
		rules:
		- !reference [.default_rules, rules]
		script:
		- echo $BUILD_JOB_ID
		release:
		name: 'Release $VERSION'
		tag_name: $VERSION
		ref: $CI_COMMIT_SHA
		description: $CHANGELOG_PATH
		assets:
		links:
		- name: "${PACKAGE_NAME} (downloadable archive)"
		url: "${PACKAGE_REGISTRY_URL}/${ARCHIVE_NAME}"
		filepath: "/repository-archive"
		- name: "${PACKAGE_NAME} (snapshot ${RELEASE_KEY} repository for ${VERSION} (exipres in 7 days))"
		url: "${REPO_PREFIX}/${BUILD_JOB_ID}/${REPO_PATH}"
		- name: "${PACKAGE_NAME} (latest ${RELEASE_KEY} release repository (permalink))"
		url: "${RELEASE_PAGE}"

features/org.etsi.mts.tdl.constraints.feature/feature.xml

+3 −19

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<feature
		id="org.etsi.mts.tdl.constraints.feature"
		label="TDL Constraints Validation"
		label="TDL Constraints Validation (Legacy)"
		version="1.0.0.qualifier"
		provider-name="TDL Open source Project">

		@@ -306,21 +306,11 @@ any resulting litigation.

		<requires>
		<import plugin="org.eclipse.emf.common"/>
		<import plugin="org.eclipse.epsilon.common"/>
		<import plugin="org.eclipse.epsilon.emc.emf"/>
		<import plugin="org.eclipse.epsilon.eol.engine"/>
		<import plugin="org.eclipse.epsilon.erl.engine"/>
		<import plugin="org.eclipse.epsilon.evl.engine"/>
		<import plugin="org.eclipse.epsilon.evl.emf.validation"/>
		<import plugin="org.eclipse.epsilon.etl.engine"/>
		<import plugin="org.eclipse.epsilon.profiling"/>
		<import plugin="org.eclipse.epsilon.eol.tools"/>
		<import plugin="org.eclipse.core.runtime"/>
		<import plugin="org.eclipse.emf.ecore"/>
		<import plugin="org.eclipse.emf.ecore.xmi"/>
		<import plugin="org.etsi.mts.tdl.model"/>
		<import plugin="org.eclipse.xtext"/>
		<import plugin="org.eclipse.epsilon.common.dt"/>
		<import plugin="org.eclipse.ocl.xtext.completeocl"/>
		<import plugin="org.eclipse.ui"/>
		<import plugin="org.eclipse.core.resources"/>
		@@ -335,16 +325,10 @@ any resulting litigation.

		<plugin
		id="org.etsi.mts.tdl.constraints"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.constraints.ui"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		</feature>

features/org.etsi.mts.tdl.converters.feature/feature.xml

+9 −42

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<feature
		id="org.etsi.mts.tdl.converters.feature"
		label="Converters to and from TDL"
		label="TDL Data Type Importers"
		version="1.0.0.qualifier"
		provider-name="ETSI">

		@@ -317,68 +317,35 @@ any resulting litigation.
		<import plugin="org.eclipse.emf.ecore"/>
		<import plugin="org.eclipse.xtext"/>
		<import plugin="org.etsi.mts.tdl.model"/>
		<import plugin="org.etsi.mts.tdl.TPLan2"/>
		<import plugin="org.eclipse.ocl.xtext.essentialocl"/>
		<import plugin="org.etsi.mts.tdl.common"/>
		<import plugin="org.eclipse.emf.common"/>
		<import plugin="org.etsi.mts.tdl.helper"/>
		<import plugin="com.google.gson"/>
		<import plugin="org.etsi.mts.tdl.extras.openapi.generator.wrapper"/>
		</requires>

		<plugin
		id="org.etsi.mts.tdl.tools.to.docx.poi.ui"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>

		<plugin
		id="org.etsi.mts.tdl.tools.to.docx.poi"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>

		<plugin
		id="org.etsi.mts.tdl.importers.ui"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.asn2tdl"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>

		<plugin
		id="org.etsi.mts.tdl.to2tdl"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.json2tdl"
		download-size="0"
		install-size="0"
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.openapi2tdl.next"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.yang2tdl"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.openapi.generator.ui"
		version="0.0.0"/>

		</feature>

features/org.etsi.mts.tdl.model.feature/feature.xml

+10 −8

Original line number	Diff line number	Diff line
		@@ -312,20 +312,22 @@ any resulting litigation.
		<import plugin="org.eclipse.ocl.examples.codegen"/>
		<import plugin="org.eclipse.ocl.xtext.essentialocl"/>
		<import plugin="org.eclipse.ocl.xtext.completeocl"/>
		<import feature="org.eclipse.ocl.examples" version="6.22.0.v20240902-1518"/>
		<import feature="org.eclipse.ocl.examples.unified" version="4.22.0.v20240902-1518"/>
		<import feature="org.eclipse.ocl" version="3.22.0.v20240902-1518"/>
		<import feature="org.eclipse.ocl.all.sdk" version="5.22.0.v20240902-1518"/>
		<import feature="org.eclipse.ocl.build" version="6.22.0.v20240902-1518"/>
		<import feature="org.eclipse.ocl.tools" version="3.22.0.v20240902-1518"/>
		<import feature="org.eclipse.ocl.ui" version="2.22.0.v20240902-1518"/>
		<import feature="org.eclipse.ocl.unified.ui" version="1.22.0.v20240902-1518"/>
		</requires>

		<plugin
		id="org.etsi.mts.tdl.model"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.library"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		</feature>