Commit d1b4369a authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* integrated execution build in maven (TODO: check it works as expected) 

* fatjar build switched to package-single phase
parent f1f1a43f

plugins/org.etsi.mts.tdl.execution.java/.classpath

+4 −2
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ 
			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="src" path="src"/>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">

		<attributes>

			<attribute name="module" value="true"/>

			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>
@@ -20,17 +22,17 @@ 
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

	<classpathentry kind="src" path="target/generated-sources/annotations">

		<attributes>

			<attribute name="ignore_optional_problems" value="true"/>

			<attribute name="optional" value="true"/>

			<attribute name="maven.pomderived" value="true"/>

			<attribute name="ignore_optional_problems" value="true"/>

			<attribute name="m2e-apt" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">

		<attributes>

			<attribute name="ignore_optional_problems" value="true"/>

			<attribute name="optional" value="true"/>

			<attribute name="maven.pomderived" value="true"/>

			<attribute name="ignore_optional_problems" value="true"/>

			<attribute name="m2e-apt" value="true"/>

		</attributes>

	</classpathentry>

plugins/org.etsi.mts.tdl.execution.java/META-INF/MANIFEST.MF

+3 −1
Original line number Diff line number Diff line
@@ -13,4 +13,6 @@ Require-Bundle: org.eclipse.core.runtime, 
 org.eclipse.ui.ide,

 org.eclipse.emf,

 org.eclipse.emf.ecore,

 org.etsi.mts.tdl.model;bundle-version="1.4.0"
 
 org.etsi.mts.tdl.model,

 junit-jupiter-api,

 org.eclipse.equinox.p2.core

plugins/org.etsi.mts.tdl.execution.java/pom.xml

+19 −7
Original line number Diff line number Diff line
@@ -2,18 +2,20 @@ 
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>

	<groupId>org.etsi.mts.tdl.execution.java</groupId>

  <parent>

	  <groupId>org.etsi.mts.tdl</groupId>

    <artifactId>org.etsi.mts.tdl.parent</artifactId>

	  <version>1.0.0-SNAPSHOT</version>

	  <relativePath>../../org.etsi.mts.tdl.parent</relativePath>



  </parent>

	<artifactId>org.etsi.mts.tdl.execution.java</artifactId>

	<version>0.0.1-SNAPSHOT</version>

  	<packaging>eclipse-plugin</packaging>

	<build>

		<sourceDirectory>runtime-src</sourceDirectory>

		<plugins>

			<plugin>

				<artifactId>maven-compiler-plugin</artifactId>

				<version>3.8.1</version>

				<configuration>

					<release>11</release>

				</configuration>

			</plugin>

			<plugin>

				<artifactId>maven-assembly-plugin</artifactId>
@@ -25,7 +27,7 @@ 
				<executions>

					<execution>

						<id>make-assembly</id> <!-- this is used for inheritance merges -->

						<phase>package</phase> <!-- bind to the packaging phase -->

						<phase>package-single</phase> <!-- bind to the packaging phase -->

						<goals>

							<goal>single</goal>

						</goals>
@@ -40,6 +42,16 @@ 
			<artifactId>guice</artifactId>

			<version>5.1.0</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.core</groupId>

			<artifactId>jackson-core</artifactId>

			<version>2.14.1</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.core</groupId>

			<artifactId>jackson-databind</artifactId>

			<version>2.14.1</version>

		</dependency>

		<dependency>

			<groupId>org.junit.jupiter</groupId>

			<artifactId>junit-jupiter-api</artifactId>