Commit 38700b6a authored by Martti Käärik's avatar Martti Käärik
Browse files

Merge branch 'dev'

parents 394bcdf4 a52568c5

.gitlab-ci.yml

+5 −0
Original line number Diff line number Diff line
@@ -152,7 +152,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/*

    # - ls $CI_PROJECT_DIR/.m2/repository

    - echo "Compiling the code..."

    - top -b -n 1 -e m

    - echo "BUILD_JOB_ID=$CI_JOB_ID" >> build.env

    - cat build.env

    - cd org.etsi.mts.tdl.parent

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

+7 −0
Original line number Diff line number Diff line
@@ -374,4 +374,11 @@ any resulting litigation. 
         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.etsi.mts.tdl.yang2tdl"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



</feature>

features/org.etsi.mts.tdl.execution.feature/.project

+11 −0
Original line number Diff line number Diff line
@@ -20,4 +20,15 @@ 
		<nature>org.eclipse.m2e.core.maven2Nature</nature>

		<nature>org.eclipse.pde.FeatureNature</nature>

	</natures>

	<filteredResources>

		<filter>

			<id>1705077780099</id>

			<name></name>

			<type>30</type>

			<matcher>

				<id>org.eclipse.core.resources.regexFilterMatcher</id>

				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>

			</matcher>

		</filter>

	</filteredResources>

</projectDescription>

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

+7 −0
Original line number Diff line number Diff line
@@ -315,4 +315,11 @@ any resulting litigation. 
         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.etsi.mts.tdl.execution.java.codegen"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



</feature>

features/org.etsi.mts.tdl.graphical.editor.feature/.project

+11 −0
Original line number Diff line number Diff line
@@ -20,4 +20,15 @@ 
		<nature>org.eclipse.m2e.core.maven2Nature</nature>

		<nature>org.eclipse.pde.FeatureNature</nature>

	</natures>

	<filteredResources>

		<filter>

			<id>1705077780106</id>

			<name></name>

			<type>30</type>

			<matcher>

				<id>org.eclipse.core.resources.regexFilterMatcher</id>

				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>

			</matcher>

		</filter>

	</filteredResources>

</projectDescription>