Skip to content

Commit

Permalink
upgrade to xtext 2.33
Browse files Browse the repository at this point in the history
  • Loading branch information
mchlrch committed Dec 6, 2023
1 parent ccb6ac4 commit bbd733d
Show file tree
Hide file tree
Showing 46 changed files with 156 additions and 182 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.zazuko.rdfmapping.dsl.feature"
label="Expressive RDF Mapper (XRM)"
version="1.3.0.qualifier"
version="1.4.0.qualifier"
provider-name="zazuko.com">

<description url="https://github.com/zazuko/expressive-rdf-mapper">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.feature</artifactId>
<packaging>eclipse-feature</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ Automatic-Module-Name: com.zazuko.rdfmapping.dsl.ide.tests
Bundle-ManifestVersion: 2
Bundle-Name: com.zazuko.rdfmapping.dsl.ide.tests
Bundle-Vendor: zazuko.com
Bundle-Version: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-SymbolicName: com.zazuko.rdfmapping.dsl.ide.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.zazuko.rdfmapping.dsl.ide,
org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
org.junit.jupiter.params;bundle-version="[5.1.0,6.0.0)",
com.zazuko.rdfmapping.dsl,
org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.testing,
Expand All @@ -18,7 +16,9 @@ Require-Bundle: com.zazuko.rdfmapping.dsl.ide,
org.eclipse.xtext.ide,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc,
io.github.classgraph,
io.github.classgraph.classgraph,
com.google.gson
Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.zazuko.rdfmapping.dsl.ide.contentassist.omnimap;x-internal=true
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.ide.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: com.zazuko.rdfmapping.dsl.ide
Bundle-ManifestVersion: 2
Bundle-Name: com.zazuko.rdfmapping.dsl.ide
Bundle-Vendor: zazuko.com
Bundle-Version: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-SymbolicName: com.zazuko.rdfmapping.dsl.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.zazuko.rdfmapping.dsl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.ide</artifactId>
<packaging>eclipse-plugin</packaging>

<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
Expand All @@ -22,22 +22,6 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>


<!-- https://mvnrepository.com/artifact/io.github.classgraph/classgraph -->
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
</dependency>

</dependencies>
<build>
<plugins>
Expand All @@ -55,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<version>3.5.0</version>
<executions>
<execution>
<id>copy-dependencies</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Collection;
import java.util.Set;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.Keyword;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Collections;
import java.util.function.Predicate;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.Keyword;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.repository</artifactId>
<packaging>eclipse-repository</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,43 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-03"/>
<repository location="https://download.eclipse.org/releases/2023-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<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.12.2/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.9.v20220111-1409"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>
<unit id="org.junit.jupiter.api" version="5.8.1.v20211018-1956"/>
<unit id="org.junit.jupiter.engine" version="5.8.1.v20211018-1956"/>
<unit id="org.junit.platform.commons" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.engine" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.launcher" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.runner" version="1.8.1.v20211018-1956"/>
<unit id="org.junit.platform.suite.commons" version="1.8.1.v20211018-1956"/>
<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
<unit id="io.github.classgraph" version="4.8.138.v20211212-1642"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-03"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="junit-jupiter-api" version="0.0.0"/>
<unit id="junit-jupiter-engine" version="0.0.0"/>
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
<unit id="junit-jupiter-params" version="0.0.0"/>
<unit id="junit-platform-commons" version="0.0.0"/>
<unit id="junit-platform-engine" version="0.0.0"/>
<unit id="junit-platform-launcher" version="0.0.0"/>
<unit id="junit-platform-runner" version="0.0.0"/>
<unit id="junit-platform-suite-commons" version="0.0.0"/>
<unit id="junit-vintage-engine" version="0.0.0"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.12.0.v20210402-1310"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.12.0/"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.21.1.v20230829-0014"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
</location>
</locations>
</target>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.target</artifactId>
<packaging>eclipse-target-definition</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ Automatic-Module-Name: com.zazuko.rdfmapping.dsl.tests
Bundle-ManifestVersion: 2
Bundle-Name: com.zazuko.rdfmapping.dsl.tests
Bundle-Vendor: zazuko.com
Bundle-Version: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-SymbolicName: com.zazuko.rdfmapping.dsl.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.zazuko.rdfmapping.dsl,
org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
org.junit.jupiter.params;bundle-version="[5.1.0,6.0.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
org.junit.jupiter.params;version="[5.1.0,6.0.0)",
org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.zazuko.rdfmapping.dsl.tests;x-internal=true
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.zazuko.rdfmapping.dsl.tests.snippets.OutputTypeValidationDSLSnippets
import com.zazuko.rdfmapping.dsl.tests.snippets.PrefixSnippets
import com.zazuko.rdfmapping.dsl.tests.snippets.SourceGroupDSLSnippets
import com.zazuko.rdfmapping.dsl.tests.snippets.XmlNamespaceExtensionDSLSnippets
import javax.inject.Inject
import jakarta.inject.Inject
import org.eclipse.xtext.diagnostics.Severity
import org.eclipse.xtext.testing.InjectWith
import org.eclipse.xtext.testing.extensions.InjectionExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@ Automatic-Module-Name: com.zazuko.rdfmapping.dsl.ui.tests
Bundle-ManifestVersion: 2
Bundle-Name: com.zazuko.rdfmapping.dsl.ui.tests
Bundle-Vendor: zazuko.com
Bundle-Version: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-SymbolicName: com.zazuko.rdfmapping.dsl.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.zazuko.rdfmapping.dsl.ui,
org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
org.junit.jupiter.params;bundle-version="[5.1.0,6.0.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.ui.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.junit,
org.eclipse.xtext.xbase.ui.testing,
org.eclipse.core.runtime,
org.eclipse.ui.workbench;resolution:=optional,
org.eclipse.xtext.ui.testing,
com.zazuko.rdfmapping.dsl
Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
org.junit.jupiter.params;version="[5.1.0,6.0.0)",
org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.zazuko.rdfmapping.dsl.ui.tests;x-internal=true
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ Automatic-Module-Name: com.zazuko.rdfmapping.dsl.ui
Bundle-ManifestVersion: 2
Bundle-Name: com.zazuko.rdfmapping.dsl.ui
Bundle-Vendor: zazuko.com
Bundle-Version: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-SymbolicName: com.zazuko.rdfmapping.dsl.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.zazuko.rdfmapping.dsl,
com.zazuko.rdfmapping.dsl.ide,
org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.ui.editors;bundle-version="3.14.300",
org.eclipse.ui.ide;bundle-version="3.18.500",
org.eclipse.ui,
org.eclipse.compare,
org.eclipse.xtext.builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.zazuko.rdfmapping.dsl</groupId>
<artifactId>com.zazuko.rdfmapping.dsl.parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>com.zazuko.rdfmapping.dsl.ui</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.util.LinkedHashSet;
import java.util.Set;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.EList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="xtend-gen">
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
Loading

0 comments on commit bbd733d

Please sign in to comment.