Commit 32e95376 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ updated manifest and pom for ide 

* added dependencies, switched from shade to assemble (shade as alternative)
parent 05515f20

plugins/org.etsi.mts.tdl.tx.ide/META-INF/MANIFEST.MF

+5 −2
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ Require-Bundle: org.etsi.mts.tdl.tx, 
 org.etsi.mts.tdl.model,

 org.eclipse.xtext.ide,

 org.eclipse.xtext.xbase.ide,

 org.aopalliance,

 io.github.classgraph,

 org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"

Bundle-RequiredExecutionEnvironment: JavaSE-11

Export-Package: org.etsi.mts.tdl.ide.contentassist.antlr.internal,

 org.etsi.mts.tdl.ide.contentassist.antlr
 
Export-Package: org.etsi.mts.tdl.ide,

 org.etsi.mts.tdl.ide.contentassist.antlr,

 org.etsi.mts.tdl.ide.contentassist.antlr.internal

plugins/org.etsi.mts.tdl.tx.ide/pom-ls.xml

0 → 100644
+197 −0
Original line number Diff line number Diff line 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

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

	

	<modelVersion>4.0.0</modelVersion>



	<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.tx.ide</artifactId>

	<packaging>eclipse-plugin</packaging>



	<name>TDLtx Brace-Based Textual Syntax IDE</name>



    <dependencies>

		<dependency>

			<groupId>ch.qos.reload4j</groupId>

			<artifactId>reload4j</artifactId>

            <version>1.2.25</version>

		</dependency>

		<dependency>

			<groupId>org.eclipse.lsp4j</groupId>

			<artifactId>org.eclipse.lsp4j</artifactId>

            <version>0.22.0</version>

		</dependency>

		<dependency>

			<groupId>org.ow2.asm</groupId>

			<artifactId>asm</artifactId>

            <version>9.6</version>

		</dependency>

	</dependencies>

	<build>

		<plugins>

			<!-- <plugin>

				<groupId>org.eclipse.xtend</groupId>

				<artifactId>xtend-maven-plugin</artifactId>

			</plugin> -->

			<plugin>

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

				<artifactId>target-platform-configuration</artifactId>

				<configuration>

					<pomDependencies>consider</pomDependencies>

				</configuration>

			</plugin>

			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-dependency-plugin</artifactId>

				<version>3.5.0</version>

				<executions>

					<execution>

						<id>copy-dependencies</id>

						<phase>package</phase>

						<goals>

							<goal>copy-dependencies</goal>

						</goals>

						<configuration>

							<excludeGroupIds>p2.eclipse-feature</excludeGroupIds>

							<outputDirectory>${project.build.directory}/libs</outputDirectory>

							<overWriteReleases>false</overWriteReleases>

							<overWriteSnapshots>false</overWriteSnapshots>

							<overWriteIfNewer>true</overWriteIfNewer>

							<!-- 

                                Exclude transitive? Reference says true, but prototype says false

                                <excludeTransitive>true</excludeTransitive>

                             -->

                            <excludeTransitive>false</excludeTransitive>

							<excludeArtifactIds>

								com.ibm.icu,

								org.apache.ant,

								org.apache.commons.lang,

								org.apache.commons.logging,

								org.eclipse.core.commands,

								org.eclipse.core.contenttype,

								org.eclipse.core.expressions,

								org.eclipse.core.filesystem,

								org.eclipse.core.jobs,

								org.eclipse.core.resources,

                                <!-- 

                                    Include runtime? (Reference yes, prototype no)

                                    org.eclipse.core.runtime,

                                 -->

								org.eclipse.core.variables,

								org.eclipse.debug.core,

								org.eclipse.emf.codegen.ecore,

								org.eclipse.emf.codegen,

								org.eclipse.emf.mwe.core,

								org.eclipse.emf.mwe.utils,

								org.eclipse.emf.mwe2.lib,

								org.eclipse.emf.mwe2.runtime,

								org.eclipse.equinox.app,

								org.eclipse.equinox.preferences,

								org.eclipse.equinox.registry,

								org.eclipse.jdt.core,

								org.eclipse.jdt.debug,

								org.eclipse.jdt.launching,

								org.eclipse.text,

							</excludeArtifactIds>

						</configuration>

					</execution>

				</executions>

			</plugin>

			<plugin>

				<groupId>com.googlecode.addjars-maven-plugin</groupId>

				<artifactId>addjars-maven-plugin</artifactId>

				<version>1.0.5</version>

				<executions>

					<execution>

						<phase>package</phase>

						<goals>

							<goal>add-jars</goal>

						</goals>

						<configuration>

							<resources>

								<resource>

									<directory>${project.build.directory}/libs</directory>

								</resource>

							</resources>

						</configuration>

					</execution>

				</executions>

			</plugin>

			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-shade-plugin</artifactId>

				<version>3.4.1</version>

				<configuration>

					<transformers>

						<transformer

							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

							<mainClass>org.eclipse.xtext.ide.server.ServerLauncher</mainClass>

						</transformer>

						<transformer

							implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

							<resource>plugin.properties</resource>

						</transformer>

						<transformer 

							implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">

						</transformer>

					</transformers>

					<artifactSet>

						<excludes><!-- avoid duplicate inclusion due to addjars plugin -->

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.lsp4j*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.xtext.xbase.lib*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.xtend.lib*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-com.google.guava*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-asm*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-log4j*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-reload4j*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.objectweb.asm*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.apache.log4j*</exclude>

						</excludes>

					</artifactSet>

					<filters>

						<filter>

							<artifact>*:*</artifact>

							<excludes>

								<exclude>META-INF/INDEX.LIST</exclude>

								<exclude>META-INF/*.SF</exclude>

								<exclude>META-INF/*.DSA</exclude>

								<exclude>META-INF/*.RSA</exclude>

								<exclude>.options</exclude>

								<exclude>.api_description</exclude>

								<exclude>*.profile</exclude>

								<exclude>*.html</exclude>

								<exclude>about.*</exclude>

								<exclude>about_files/*</exclude>

								<exclude>plugin.xml</exclude>

								<exclude>systembundle.properties</exclude>

								<exclude>profile.list</exclude>

								<exclude>**/*._trace</exclude>

								<exclude>**/*.g</exclude>

								<exclude>**/*.mwe2</exclude>

								<exclude>**/*.xtext</exclude>

							</excludes>

						</filter>

					</filters>

					<shadedArtifactAttached>true</shadedArtifactAttached>

					<shadedClassifierName>ls</shadedClassifierName>

					<minimizeJar>false</minimizeJar>

				</configuration>

				<executions>

					<execution>

						<phase>package</phase>

						<goals>

							<goal>shade</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

		</plugins>

	</build>



</project>

plugins/org.etsi.mts.tdl.tx.ide/pom.xml

+48 −68
Original line number Diff line number Diff line
@@ -32,13 +32,26 @@ 
			<artifactId>asm</artifactId>

            <version>9.6</version>

		</dependency>

		<dependency>

			<groupId>org.eclipse.lsp4j</groupId>

			<artifactId>org.eclipse.lsp4j.jsonrpc</artifactId>

            <version>0.22.0</version>

		</dependency>

		<dependency>

			<groupId>org.eclipse.emf</groupId>

			<artifactId>org.eclipse.emf.ecore</artifactId>

            <version>2.35.0</version>

		</dependency>

	</dependencies>



	<build>

		<plugins>

			<!-- <plugin>

			<!-- 

			<plugin>

				<groupId>org.eclipse.xtend</groupId>

				<artifactId>xtend-maven-plugin</artifactId>

			</plugin> -->

			</plugin> 

			-->

			<plugin>

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

				<artifactId>target-platform-configuration</artifactId>
@@ -49,7 +62,7 @@ 
			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-dependency-plugin</artifactId>

				<version>3.5.0</version>

				<version>3.6.1</version>

				<executions>

					<execution>

						<id>copy-dependencies</id>
@@ -98,6 +111,7 @@ 
								org.eclipse.jdt.debug,

								org.eclipse.jdt.launching,

								org.eclipse.text,

								<!-- additional -->

							</excludeArtifactIds>

						</configuration>

					</execution>
@@ -124,70 +138,36 @@ 
				</executions>

			</plugin>

			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-shade-plugin</artifactId>

				<version>3.4.1</version>

				<configuration>

					<transformers>

						<transformer

							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

							<mainClass>org.eclipse.xtext.ide.server.ServerLauncher</mainClass>

						</transformer>

						<transformer

							implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

							<resource>plugin.properties</resource>

						</transformer>

						<transformer 

							implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">

						</transformer>

					</transformers>

					<artifactSet>

						<excludes><!-- avoid duplicate inclusion due to addjars plugin -->

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.lsp4j*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.xtext.xbase.lib*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.xtend.lib*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-com.google.guava*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-asm*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-log4j*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-reload4j*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.objectweb.asm*</exclude>

							<exclude>*:org.etsi.mts.tdl.tx.ide-org.apache.log4j*</exclude>

						</excludes>

					</artifactSet>

					<filters>

						<filter>

							<artifact>*:*</artifact>

							<excludes>

								<exclude>META-INF/INDEX.LIST</exclude>

								<exclude>META-INF/*.SF</exclude>

								<exclude>META-INF/*.DSA</exclude>

								<exclude>META-INF/*.RSA</exclude>

								<exclude>.options</exclude>

								<exclude>.api_description</exclude>

								<exclude>*.profile</exclude>

								<exclude>*.html</exclude>

								<exclude>about.*</exclude>

								<exclude>about_files/*</exclude>

								<exclude>plugin.xml</exclude>

								<exclude>systembundle.properties</exclude>

								<exclude>profile.list</exclude>

								<exclude>**/*._trace</exclude>

								<exclude>**/*.g</exclude>

								<exclude>**/*.mwe2</exclude>

								<exclude>**/*.xtext</exclude>

							</excludes>

						</filter>

					</filters>

					<shadedArtifactAttached>true</shadedArtifactAttached>

					<shadedClassifierName>ls</shadedClassifierName>

					<minimizeJar>false</minimizeJar>

				</configuration>

				<groupId>org.codehaus.mojo</groupId>

				<artifactId>appassembler-maven-plugin</artifactId>

				<version>2.1.0</version>

				<executions>

					<execution>

						<phase>package</phase>

						<goals>

							<goal>shade</goal>

							<goal>assemble</goal>

						</goals>

						<configuration>

							<assembleDirectory>${project.build.directory}/languageserver</assembleDirectory>

							<repositoryLayout>flat</repositoryLayout>

							<useWildcardClassPath>true</useWildcardClassPath>

							<!-- uncomment to enable remote debugging

							<extraJvmArguments>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000</extraJvmArguments>

							-->

							<programs>

								<program>

									<id>tdltx-ls</id>

									<mainClass>org.eclipse.xtext.ide.server.ServerLauncher</mainClass>

									<!-- uncomment to enable options

									<commandLineArguments>

										<commandLineArgument>-trace</commandLineArgument>

										<commandLineArgument>-log</commandLineArgument>

										<commandLineArgument>-noValidate</commandLineArgument>

									</commandLineArguments>

									-->

								</program>

							</programs>

						</configuration>

					</execution>

				</executions>

			</plugin>