Commit 77d65601 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* switch to POI from orbit, update dependency versions, POM 

- remove unused dependencies
parent ee674a55

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

+72 −2
Original line number Original line Diff line number Diff line
@@ -77,9 +77,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
	<properties>

	<properties>

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

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

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

		<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>

		<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>

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

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

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

		<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>

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

						<skipPomGeneration>true</skipPomGeneration>

					</configuration>

					</configuration>

				</plugin>

				</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>

				<plugin>

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

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

				<extensions>true</extensions>

			</plugin>

			</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>

			<plugin>

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

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

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

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

							<arch>x86_64</arch>

						</environment>

						</environment>

					</environments>

					</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>

				</configuration>

			</plugin>

			</plugin>

		</plugins>

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

			</snapshots>

		</pluginRepository>

		</pluginRepository>

	</pluginRepositories>

	</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>
 
</project>

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

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

<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.specifier.feature.group" version="0.0.0"/>

<unit id="org.eclipse.sirius.aql.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>

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

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

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

<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>

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

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

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

<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>

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

<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"/>

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

</location>

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

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

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

		<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.api" version="5.9.1.v20221103-2317"/>

		<unit id="org.junit.jupiter.engine" 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"/>

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

		<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>

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

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

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

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

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

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

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

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

		<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>

	</location>

</locations>

</locations>

</target>
 
</target>
 
 No newline at end of file

plugins/org.etsi.mts.tdl.tools.to.docx.poi/.classpath

+0 −19
Original line number Original line Diff line number Diff line
@@ -7,24 +7,5 @@ 
	</classpathentry>

	</classpathentry>

	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

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

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

	<classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>

	<classpathentry kind="lib" path="lib/commons-codec-1.11.jar"/>

	<classpathentry kind="lib" path="lib/commons-collections4-4.2.jar"/>

	<classpathentry kind="lib" path="lib/commons-compress-1.18.jar"/>

	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>

	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>

	<classpathentry kind="lib" path="lib/curvesapi-1.05.jar"/>

	<classpathentry kind="lib" path="lib/jaxb-api-2.3.0.jar"/>

	<classpathentry kind="lib" path="lib/jaxb-core-2.3.0.1.jar"/>

	<classpathentry kind="lib" path="lib/jaxb-impl-2.3.0.1.jar"/>

	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>

	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>

	<classpathentry kind="lib" path="lib/poi-4.0.1.jar"/>

	<classpathentry kind="lib" path="lib/poi-examples-4.0.1.jar"/>

	<classpathentry kind="lib" path="lib/poi-excelant-4.0.1.jar"/>

	<classpathentry kind="lib" path="lib/poi-ooxml-4.0.1.jar"/>

	<classpathentry kind="lib" path="lib/poi-ooxml-schemas-4.0.1.jar"/>

	<classpathentry kind="lib" path="lib/poi-scratchpad-4.0.1.jar"/>

	<classpathentry kind="lib" path="lib/xmlbeans-3.0.2.jar"/>

	<classpathentry kind="output" path="target/classes"/>

	<classpathentry kind="output" path="target/classes"/>

</classpath>
 
</classpath>

plugins/org.etsi.mts.tdl.tools.to.docx.poi/META-INF/MANIFEST.MF

+5 −21
Original line number Original line Diff line number Diff line
@@ -13,28 +13,12 @@ Require-Bundle: org.eclipse.core.runtime, 
 org.etsi.mts.tdl.TPLan2,

 org.etsi.mts.tdl.TPLan2,

 org.eclipse.emf.mwe.utils,

 org.eclipse.emf.mwe.utils,

 org.eclipse.ocl.xtext.essentialocl,

 org.eclipse.ocl.xtext.essentialocl,

 org.etsi.mts.tdl.common

 org.etsi.mts.tdl.common,

 org.apache.poi,

 org.apache.poi.ooxml,

 org.apache.poi.ooxml.schemas,

 org.apache.xmlbeans

Bundle-RequiredExecutionEnvironment: JavaSE-11

Bundle-RequiredExecutionEnvironment: JavaSE-11

Automatic-Module-Name: org.etsi.mts.tdl.tools.to.docx.poi

Automatic-Module-Name: org.etsi.mts.tdl.tools.to.docx.poi

Bundle-ActivationPolicy: lazy

Bundle-ActivationPolicy: lazy

Export-Package: org.etsi.mts.tdl.tools.to.docx.poi
 
Export-Package: org.etsi.mts.tdl.tools.to.docx.poi
 
Bundle-ClassPath: lib/activation-1.1.1.jar,

 lib/commons-codec-1.11.jar,

 lib/commons-collections4-4.2.jar,

 lib/commons-compress-1.18.jar,

 lib/commons-logging-1.2.jar,

 lib/commons-math3-3.6.1.jar,

 lib/curvesapi-1.05.jar,

 lib/jaxb-api-2.3.0.jar,

 lib/jaxb-core-2.3.0.1.jar,

 lib/jaxb-impl-2.3.0.1.jar,

 lib/junit-4.12.jar,

 lib/log4j-1.2.17.jar,

 lib/poi-4.0.1.jar,

 lib/poi-examples-4.0.1.jar,

 lib/poi-excelant-4.0.1.jar,

 lib/poi-ooxml-4.0.1.jar,

 lib/poi-ooxml-schemas-4.0.1.jar,

 lib/poi-scratchpad-4.0.1.jar,

 lib/xmlbeans-3.0.2.jar,

 .

plugins/org.etsi.mts.tdl.tools.to.docx.poi/build.properties

+0 −19
Original line number Original line Diff line number Diff line
@@ -2,24 +2,5 @@ source.. = src/ 
output.. = target/classes/

output.. = target/classes/

bin.includes = META-INF/,\

bin.includes = META-INF/,\

               .,\

               .,\

               lib/activation-1.1.1.jar,\

               lib/commons-codec-1.11.jar,\

               lib/commons-collections4-4.2.jar,\

               lib/commons-compress-1.18.jar,\

               lib/commons-logging-1.2.jar,\

               lib/commons-math3-3.6.1.jar,\

               lib/curvesapi-1.05.jar,\

               lib/jaxb-api-2.3.0.jar,\

               lib/jaxb-core-2.3.0.1.jar,\

               lib/jaxb-impl-2.3.0.1.jar,\

               lib/junit-4.12.jar,\

               lib/log4j-1.2.17.jar,\

               lib/poi-4.0.1.jar,\

               lib/poi-examples-4.0.1.jar,\

               lib/poi-excelant-4.0.1.jar,\

               lib/poi-ooxml-4.0.1.jar,\

               lib/poi-ooxml-schemas-4.0.1.jar,\

               lib/poi-scratchpad-4.0.1.jar,\

               lib/xmlbeans-3.0.2.jar,\

               resource/

               resource/

src.includes = resource/
 
src.includes = resource/