Commit 8971d2a4 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'dev' into 'master' 

* reduce sizes through external dependencies

See merge request !5
parents f3dd392f 7550e482

.gitlab-ci.yml

+7 −7
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ variables: 
# 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-openjdk-11

image: maven:3.9.5-eclipse-temurin-17





# Cache downloaded dependencies and plugins between builds.

# To keep cache across branches add 'key: "$CI_JOB_NAME"'
@@ -236,16 +237,15 @@ pages: 
      artifacts: true

  script:

    # Get the previous GitLab Pages content (otherwise other beta/stable branch gets removed..)

    # - rm -rf /var/lib/apt/lists/*

    # - apt update

    # - apt-cache gencaches

    # - apt install -y zip unzip

    # - zip --help

    - rm -rf /var/lib/apt/lists/*

    - apt update

    - apt-cache gencaches

    - apt install -y zip unzip

    - zip --help

    # - set +e

    # - curl --fail "$CI_PAGES_URL/content.zip" -o "content.zip"

    # - if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi

    # - set -e

    # - ls -la $RELEASE_PATH

    # Cleanup content? -> remove content in release path?

    # Add/update content

    - echo $CI_PAGES_URL

Readme.md

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ More info at [TDL website](https://tdl.etsi.org) 


## Installing the plug-ins



The TDL tools are available as a set of Eclipse plug-ins. You need to first be able to run Eclipse. The [Eclipse Modeling Tools (2022-12)](https://www.eclipse.org/downloads/packages/release/2022-12/r/eclipse-modeling-tools) distribution contains most of the necessary prerequisites for the TDL tools. Newer versions should be compatible but have not been extensively tested yet.

The TDL tools are available as a set of Eclipse plug-ins. You need to first be able to run Eclipse. The [Eclipse Modeling Tools (2023-09)](https://www.eclipse.org/downloads/packages/release/2023-09/r/eclipse-modeling-tools) distribution contains most of the necessary prerequisites for the TDL tools. Newer versions should be compatible but have not been extensively tested yet.



Once Eclipse is up and running, the easiest way to install the TOP tools is from the Eclipse Marketplace - simply search for TDL in the Eclipse Marketplace client within Eclipse, or go to the [TOP Marketplace Listing](https://marketplace.eclipse.org/content/top-tdl-open-source-project) and drag the install button into the Eclipse window.
@@ -83,10 +83,10 @@ The following steps are needed to setup a local development environment. 
 * Download and install Eclipse Modeling Tools package

 * Install following additional components from Eclipse Marketplace

     * Sirius (v7)

     * Eclipse Xtext (v2.29 or newer)

     * Eclipse Xtext (v2.32 or newer)

     * Epsilon (v2.x)

     * Eclipse OCL (v6.x)

     * Eclise Maven Integration m2e (v2.1.x)

     * Eclipse Maven Integration m2e (v2.1.x)

 * Check out the repository

 * Import the plug-ins in the Eclipse workspace

     * Import -> Existing Projects into Workspace

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

+1 −6
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ any resulting litigation. 
      <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
@@ -373,10 +374,4 @@ any resulting litigation. 
         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.etsi.mts.tdl.openapi.generator.wrapper"

         download-size="0"

         install-size="0"

         version="0.0.0"/>



</feature>

org.etsi.mts.tdl.parent/pom.xml

+72 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
		<!-- Converters -->

		<module>../plugins/org.etsi.mts.tdl.tools.to.docx.poi</module>

		<module>../plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui</module>

		<module>../plugins/org.etsi.mts.tdl.openapi.generator.wrapper</module>

		<module>../plugins/org.etsi.mts.tdl.openapi.generator.ui</module>

		<module>../plugins/org.etsi.mts.tdl.openapi2tdl.next</module>

		<module>../plugins/org.etsi.mts.tdl.json2tdl</module>
@@ -77,9 +76,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
	<properties>

		<maven.compiler.source>11</maven.compiler.source>

		<maven.compiler.target>11</maven.compiler.target>

		<tycho-version>2.7.5</tycho-version>

		<tycho-version>3.0.5</tycho-version>

		<mwe2Version>2.15.0</mwe2Version>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<xtext.version>2.30.0</xtext.version>

		<xtext.version>2.32.0</xtext.version>

		<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>

		<maven.compiler.plugin.version>3.9.0</maven.compiler.plugin.version>

		<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
@@ -133,6 +133,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
						<skipPomGeneration>true</skipPomGeneration>

					</configuration>

				</plugin>

				<plugin>

					<!--

						Can be removed after first generator execution

						https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097

					-->

					<groupId>org.eclipse.tycho</groupId>

					<artifactId>tycho-compiler-plugin</artifactId>

					<version>${tycho-version}</version>

					<configuration>

						<compilerArgument>-err:-forbidden</compilerArgument>

						<useProjectSettings>false</useProjectSettings>

					</configuration>

				</plugin>

			

				<plugin>

					<groupId>org.apache.maven.plugins</groupId>
@@ -176,6 +189,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
				<extensions>true</extensions>

			</plugin>



			<plugin>

				<groupId>org.eclipse.tycho</groupId>

				<artifactId>tycho-p2-plugin</artifactId>

				<version>${tycho-version}</version>

				<executions>

					<execution>

						<id>attach-p2-metadata</id>

						<phase>package</phase>

						<goals>

							<goal>p2-metadata</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

			

			<plugin>

				<groupId>org.eclipse.tycho</groupId>

				<artifactId>target-platform-configuration</artifactId>
@@ -209,6 +237,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
							<arch>x86_64</arch>

						</environment>

					</environments>

					<dependency-resolution>

						<extraRequirements>

							<requirement>

								<type>eclipse-plugin</type>

								<id>org.eclipse.xtext.logging</id>

								<versionRange>1.2.24</versionRange>

							</requirement>

							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target

								platform is Luna or later. (backward compatible with kepler and previous

								versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->

							<requirement>

								<type>eclipse-feature</type>

								<id>org.eclipse.rcp</id>

								<versionRange>0.0.0</versionRange>

							</requirement>

						</extraRequirements>

					</dependency-resolution>

				</configuration>

			</plugin>

		</plugins>
@@ -289,4 +334,28 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
			</snapshots>

		</pluginRepository>

	</pluginRepositories>

		<profiles>

		<profile>

			<id>macos</id>

			<activation>

				<os>

					<family>mac</family>

				</os>

			</activation>

			<properties>

				<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->

				<platformSystemProperties>-XstartOnFirstThread</platformSystemProperties>

			</properties>

		</profile>

		<profile>

			<id>jdk9-or-newer</id>

			<activation>

				<jdk>[9,)</jdk>

			</activation>

			<properties>

				<moduleProperties>--add-modules=ALL-SYSTEM</moduleProperties>

			</properties>

		</profile>

	</profiles>



</project>

org.etsi.mts.tdl.parent/top.target

+12 −3
Original line number Diff line number Diff line
@@ -12,15 +12,15 @@ 
<unit id="com.google.gson" version="0.0.0"/>

<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>

<unit id="org.eclipse.sirius.aql.feature.group" version="0.0.0"/>

<repository location="https://download.eclipse.org/releases/2023-03"/>

<repository location="https://download.eclipse.org/releases/2023-09"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.14.0/"/>

<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>

<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.30.0/"/>

<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

<unit id="de.itemis.xtext.antlr.feature.feature.group" version="2.1.1.v201405091103"/>
@@ -40,6 +40,9 @@ 
</location>

	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

		<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>

		<unit id="org.apache.poi.ooxml" version="4.1.1.v20221112-0806"/>

		<unit id="org.apache.poi.ooxml.schemas" version="4.1.1.v20221112-0806"/>

		<unit id="org.apache.poi" version="4.1.1.v20221112-0806"/>

		<unit id="org.junit.jupiter.api" version="5.9.1.v20221103-2317"/>

		<unit id="org.junit.jupiter.engine" version="5.9.1.v20221103-2317"/>

		<unit id="org.junit.jupiter.params" version="5.9.1.v20221103-2317"/>
@@ -56,9 +59,15 @@ 
		<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>

		<unit id="org.junit" version="4.13.2.v20211018-1956"/>

		<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>

		<unit id="org.apache.xmlbeans" version="3.1.0.v20221112-0806"/>

		<unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>

		<unit id="com.fasterxml.jackson.core.jackson-core" version="2.13.2.v20220426-1653"/>

		<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.13.2.v20220426-1653"/>

		<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.13.2.v20220426-1653"/>

	</location>

	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

		<repository location="https://top.etsi.org/top-extras/updatesite/stable"/>

		<unit id="org.etsi.mts.tdl.extras.feature.feature.group" version="1.0.0.202311021145"/>

	</location>

</locations>

</target>
 
 No newline at end of file