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

* transition to newer versions of dependencies, fixes for logging, #89, #177

parent 6cf9abc0

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

+51 −21
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
<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"/>

<unit id="org.osgi.service.component" version="0.0.0"/>

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

</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -39,28 +40,7 @@ 
</location>

	<location includeAllPlatforms="false" includeConfigurePhase="false" 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"/>

		<unit id="org.junit.platform.commons" version="1.9.1.v20221103-2317"/>

		<unit id="org.junit.platform.engine" version="1.9.1.v20221103-2317"/>

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

		<unit id="org.junit.platform.launcher" version="1.9.1.v20221103-2317"/>

		<unit id="org.junit.platform.runner" version="1.9.1.v20221103-2317"/>

		<unit id="org.junit.platform.suite.api" version="1.9.1.v20221103-2317"/>

		<unit id="org.junit.platform.suite.commons" version="1.9.1.v20221103-2317"/>

		<unit id="org.junit.platform.suite.engine" version="1.9.1.v20221103-2317"/>

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

		<unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>

		<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="org.apache.commons.logging" version="0.0.0"/>

		<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"/>
@@ -69,6 +49,56 @@ 
		<repository location="https://top.etsi.org/top-extras/updatesite/stable"/>

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

	</location>

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

		<!-- poi 4, does work in eclipse

		

		<unit id="org.apache.poi.ooxml" version="0.0.0"/>

		<unit id="org.apache.poi.ooxml.schemas" version="0.0.0"/>

		<unit id="org.apache.poi" version="0.0.0"/>

		-->

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

		<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.xmlbeans" version="3.1.0.v20221112-0806"/>

		<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>

	</location>

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

		<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12"/>

		<!-- poi 5, does not work in eclipse

		

		<unit id="org.apache.poi.ooxml" version="0.0.0"/>

		<unit id="org.apache.poi.ooxml.schemas" version="0.0.0"/>

		<unit id="org.apache.poi" version="0.0.0"/>

		-->

		<unit id="org.apache.commons.math3" version="0.0.0"/>

		<unit id="org.hamcrest.core" version="0.0.0"/>

		<unit id="org.junit" version="0.0.0"/>

		<unit id="org.objectweb.asm" version="0.0.0"/>

		<!-- are these needed -->

		<unit id="junit-jupiter-api" version="5.14.1"/>

		<unit id="junit-jupiter-engine" version="5.14.1"/>

		<unit id="junit-jupiter-params" version="5.14.1"/>

		<unit id="junit-jupiter-migrationsupport" version="5.14.1"/>

		<unit id="junit-platform-commons" version="1.14.1"/>

		<unit id="junit-platform-engine" version="1.14.1"/>

		<unit id="junit-platform-launcher" version="1.14.1"/>

		<unit id="junit-platform-runner" version="1.14.1"/>

		<unit id="junit-platform-suite-api" version="1.14.1"/>

		<unit id="junit-platform-suite-engine" version="1.14.1"/>

		<unit id="junit-platform-suite-commons" version="1.14.1"/>

		<unit id="org.apiguardian.api" version="1.1.2"/>

		<!-- - -->

		<unit id="org.opentest4j" version="0.0.0"/>

		<unit id="org.apache.commons.commons-collections4" version="0.0.0"/>

		<!-- too much logging -->

		<unit id="org.apache.commons.logging" version="0.0.0"/>

		<unit id="org.apache.logging.log4j.core" version="0.0.0"/>

		<unit id="org.apache.logging.log4j.api" version="0.0.0"/>

		<unit id="org.apache.logging.log4j.slf4j2.impl" version="0.0.0"/>

		<unit id="org.apache.logging.log4j.to.slf4j" version="0.0.0"/>

		<unit id="slf4j.api" version="0.0.0"/>

		<unit id="slf4j.simple" version="0.0.0"/>

	</location>

      <!--

        For development only

      -->

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.core.runtime, 
 org.eclipse.emf.codegen.ecore;resolution:=optional,

 org.apache.log4j;resolution:=optional,

 org.apache.commons.logging;resolution:=optional,

 org.objectweb.asm;bundle-version="[9.8.0,9.9.0)";resolution:=optional,

 org.objectweb.asm;resolution:=optional,

 org.etsi.mts.tdl.model.gen;resolution:=optional

Eclipse-LazyStart: true

Bundle-ActivationPolicy: lazy

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

+10 −6
Original line number Diff line number Diff line
@@ -11,13 +11,17 @@ Require-Bundle: org.eclipse.core.runtime, 
 org.eclipse.emf.ecore,

 org.eclipse.xtext,

 org.etsi.mts.tdl.model,

 org.eclipse.emf.mwe.utils,

 org.etsi.mts.tdl.common,

 org.apache.poi,

 org.apache.poi.ooxml,

 org.apache.poi.ooxml.schemas,

 org.apache.xmlbeans,

 org.apache.commons.compress

 org.apache.commons.commons-io,

 org.apache.logging.log4j.api,

 org.apache.logging.log4j.core,

 org.apache.logging.log4j.slf4j2.impl,

 org.apache.commons.lang3,

 org.apache.commons.commons-collections4,

 org.apache.poi;bundle-version="[4.0.0,5.0.0)",

 org.apache.poi.ooxml;bundle-version="[4.0.0,5.0.0)",

 org.apache.poi.ooxml.schemas;bundle-version="[4.0.0,5.0.0)",

 org.apache.xmlbeans

Bundle-RequiredExecutionEnvironment: JavaSE-21

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

Bundle-ActivationPolicy: lazy

updatesite/org.etsi.mts.tdl.updatesite/category.xml

+3 −0
Original line number Diff line number Diff line
@@ -54,4 +54,7 @@ 
   <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/" name="" enabled="true" />

   <repository-reference location="https://download.eclipse.org/releases/2024-09" name="" enabled="true" />

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

   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12/" name="" enabled="true" />

   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-legacy/2025-12" name="" enabled="true" />

   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-legacy/2023-09" name="" enabled="true" />

</site>