Skip to content

Commit 4a4f703

Browse files
stefan-kastefan-ka
committed
Update frameworks / dependencies
1 parent 1ed25be commit 4a4f703

File tree

7 files changed

+40
-53
lines changed

7 files changed

+40
-53
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
def pomXml = new XmlSlurper().parse('pom.xml')
1212

1313
subprojects {
14-
ext.xtextVersion = '2.28.0'
14+
ext.xtextVersion = '2.32.0'
1515
repositories {
1616
mavenCentral()
1717
}

‎org.contextmapper.dsl.ide/pom.xml

+3-16
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,16 @@
1010

1111
<dependencies>
1212
<dependency>
13-
<groupId>log4j</groupId>
14-
<artifactId>log4j</artifactId>
15-
<version>1.2.16</version>
13+
<groupId>ch.qos.reload4j</groupId>
14+
<artifactId>reload4j</artifactId>
1615
</dependency>
1716
<dependency>
1817
<groupId>org.eclipse.lsp4j</groupId>
1918
<artifactId>org.eclipse.lsp4j</artifactId>
20-
<version>0.19.0</version>
2119
</dependency>
2220
<dependency>
2321
<groupId>org.ow2.asm</groupId>
2422
<artifactId>asm</artifactId>
25-
<version>6.2.1</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.ow2.asm</groupId>
29-
<artifactId>asm-commons</artifactId>
30-
<version>6.2.1</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>org.ow2.asm</groupId>
34-
<artifactId>asm-tree</artifactId>
35-
<version>6.2.1</version>
3623
</dependency>
3724
</dependencies>
3825
<build>
@@ -51,7 +38,7 @@
5138
<plugin>
5239
<groupId>org.apache.maven.plugins</groupId>
5340
<artifactId>maven-dependency-plugin</artifactId>
54-
<version>3.0.1</version>
41+
<version>3.5.0</version>
5542
<executions>
5643
<execution>
5744
<id>copy-dependencies</id>

‎org.contextmapper.dsl.repository/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@
214214
</jvmArgs>
215215
<repositories>
216216
<repository>
217-
<id>2022-09</id>
217+
<id>2023-03</id>
218218
<layout>p2</layout>
219-
<url>http://download.eclipse.org/releases/2022-09</url>
219+
<url>http://download.eclipse.org/releases/2023-03</url>
220220
</repository>
221221
</repositories>
222222
<dependencies>
@@ -280,9 +280,9 @@
280280
</jvmArgs>
281281
<repositories>
282282
<repository>
283-
<id>2022-09</id>
283+
<id>2023-03</id>
284284
<layout>p2</layout>
285-
<url>http://download.eclipse.org/releases/2022-09</url>
285+
<url>http://download.eclipse.org/releases/2023-03</url>
286286
</repository>
287287
</repositories>
288288
<dependencies>

‎org.contextmapper.dsl.target/org.contextmapper.dsl.target.target

+23-21
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,39 @@
99
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
1010
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
1111
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
12-
<repository location="https://download.eclipse.org/releases/2022-12"/>
12+
<repository location="https://download.eclipse.org/releases/2023-03"/>
1313
</location>
1414
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1515
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
16-
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
16+
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
1717
</location>
1818
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1919
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
20-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
20+
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>
2121
</location>
2222
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
23-
<unit id="com.google.gson" version="2.9.1.v20220915-1632"/>
24-
<unit id="com.google.inject" version="5.0.1.v20221112-0806"/>
25-
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
23+
<unit id="com.google.gson" version="2.10.1"/>
24+
<unit id="com.google.inject" version="7.0.0"/>
25+
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
2626
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
27-
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
28-
<unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>
29-
<unit id="org.junit.jupiter.api" version="5.9.1.v20221103-2317"/>
30-
<unit id="org.junit.jupiter.engine" version="5.9.1.v20221103-2317"/>
31-
<unit id="org.junit.jupiter.migrationsupport" version="5.9.1.v20221103-2317"/>
32-
<unit id="org.junit.jupiter.params" version="5.9.1.v20221103-2317"/>
33-
<unit id="org.junit.platform.commons" version="1.9.1.v20221103-2317"/>
34-
<unit id="org.junit.platform.engine" version="1.9.1.v20221103-2317"/>
35-
<unit id="org.junit.platform.launcher" version="1.9.1.v20221103-2317"/>
36-
<unit id="org.junit.platform.runner" version="1.9.1.v20221103-2317"/>
37-
<unit id="org.junit.platform.suite.commons" version="1.9.1.v20221103-2317"/>
38-
<unit id="org.junit.vintage.engine" version="5.9.1.v20221103-2317"/>
39-
<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
40-
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
27+
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
28+
<unit id="org.hamcrest" version="2.2.0"/>
29+
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
30+
<unit id="org.apiguardian.api" version="0.0.0"/>
31+
<unit id="junit-jupiter-api" version="0.0.0"/>
32+
<unit id="junit-jupiter-engine" version="0.0.0"/>
33+
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
34+
<unit id="junit-jupiter-params" version="0.0.0"/>
35+
<unit id="junit-platform-commons" version="0.0.0"/>
36+
<unit id="junit-platform-engine" version="0.0.0"/>
37+
<unit id="junit-platform-launcher" version="0.0.0"/>
38+
<unit id="junit-platform-runner" version="0.0.0"/>
39+
<unit id="junit-platform-suite-commons" version="0.0.0"/>
40+
<unit id="junit-vintage-engine" version="0.0.0"/>
41+
<unit id="org.opentest4j" version="0.0.0"/>
42+
<unit id="org.objectweb.asm" version="9.5.0"/>
4143
<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
42-
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
44+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
4345
</location>
4446
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4547
<repository location="https://contextmapper.org/p2-repos/context-map-generator-releases/"/>

‎org.contextmapper.dsl.ui.tests/META-INF/MANIFEST.MF

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ Bundle-Version: 6.9.1.qualifier
77
Bundle-SymbolicName: org.contextmapper.dsl.ui.tests; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.contextmapper.dsl.ui,
10-
org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
1110
org.eclipse.xtext.testing,
11+
org.eclipse.xtext.ui.testing,
1212
org.eclipse.xtext.xbase.testing,
13-
org.eclipse.xtext.junit4,
14-
org.eclipse.xtext.xbase.junit,
13+
org.eclipse.xtext.xbase.ui.testing,
1514
org.eclipse.core.runtime,
16-
org.eclipse.ui.workbench;resolution:=optional,
17-
org.eclipse.xtext.ui.testing,
18-
org.eclipse.xtext.xbase.ui.testing
15+
org.eclipse.ui.workbench;resolution:=optional
16+
Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
17+
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"
1918
Bundle-RequiredExecutionEnvironment: JavaSE-11
2019
Export-Package: org.contextmapper.dsl.ui.tests;x-internal=true,
2120
org.contextmapper.tactic.dsl.ui.tests;x-internal=true,

‎org.contextmapper.dsl/META-INF/MANIFEST.MF

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Bundle-SymbolicName: org.contextmapper.dsl; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.eclipse.xtext,
1010
org.eclipse.xtext.xbase,
11-
org.eclipse.equinox.common;bundle-version="3.5.0",
11+
org.eclipse.equinox.common;bundle-version="3.16.0",
1212
org.eclipse.emf.ecore,
1313
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
1414
org.eclipse.xtext.util,
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext,
1818
org.apache.commons.io;bundle-version="2.2.0",
1919
org.contextmapper.contextmap.generator;bundle-version="1.2.1",
2020
org.apache.commons.lang3;bundle-version="3.9.0",
21-
org.slf4j.api,
2221
org.apache.commons.exec;bundle-version="1.3.0",
2322
guru.nidi.com.kitfox.svgSalamander;bundle-version="1.1.2",
2423
org.contextmapper.servicecutter.library;bundle-version="1.2.1",

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<packaging>pom</packaging>
77

88
<properties>
9-
<xtextVersion>2.28.0</xtextVersion>
10-
<mwe2Version>2.13.0</mwe2Version>
9+
<xtextVersion>2.32.0</xtextVersion>
10+
<mwe2Version>2.15.0</mwe2Version>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<maven.compiler.source>11</maven.compiler.source>
1313
<maven.compiler.target>11</maven.compiler.target>
@@ -154,7 +154,7 @@
154154
<requirement>
155155
<type>eclipse-plugin</type>
156156
<id>org.eclipse.xtext.logging</id>
157-
<versionRange>1.2.19</versionRange>
157+
<versionRange>1.2.24</versionRange>
158158
</requirement>
159159
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
160160
platform is Luna or later. (backward compatible with kepler and previous

0 commit comments

Comments
 (0)