Skip to content

Commit

Permalink
Merge pull request #29 from cdietrich/cd_232
Browse files Browse the repository at this point in the history
update to Xtext 2.32
  • Loading branch information
cdietrich authored Aug 27, 2023
2 parents 308ced8 + 2b7e195 commit bc5be7d
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.xtext.example.mydsl.tests

import javax.inject.Inject
import jakarta.inject.Inject
import org.eclipse.xtext.junit4.InjectWith
import org.eclipse.xtext.junit4.XtextRunner
import org.eclipse.xtext.junit4.util.ParseHelper
Expand Down
2 changes: 1 addition & 1 deletion org.xtext.example.mydsl/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mydsl; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="[2.31.0,2.32.0)";visibility:=reexport,
Require-Bundle: org.eclipse.xtext;bundle-version="[2.32.0,2.33.0)";visibility:=reexport,
org.eclipse.xtext.generator;resolution:=optional,
com.ibm.icu;resolution:=optional,
org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
Expand Down
4 changes: 2 additions & 2 deletions org.xtext.example.mydsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<version>3.0.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down Expand Up @@ -124,7 +124,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.14.0</version>
<version>2.15.0</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
58 changes: 53 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
<tycho-version>2.7.5</tycho-version>
<xtext-version>2.31.0</xtext-version>
<xtext-version>2.32.0</xtext-version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
Expand All @@ -27,17 +27,17 @@
<repositories>
<repository>
<id>eclipse</id>
<url>https://download.eclipse.org/releases/2023-06</url>
<url>https://download.eclipse.org/releases/2023-09</url>
<layout>p2</layout>
</repository>
<repository>
<id>xtext</id>
<url>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/</url>
<url>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/</url>
<layout>p2</layout>
</repository>
<repository>
<id>mwe</id>
<url>https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.14.0/</url>
<url>https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/</url>
<layout>p2</layout>
</repository>
<repository>
Expand All @@ -47,7 +47,7 @@
</repository>
<repository>
<id>xpand</id>
<url>http://download.eclipse.org/modeling/m2t/xpand/updates/releases/</url>
<url>https://download.eclipse.org/modeling/m2t/xpand/updates/releases/</url>
<layout>p2</layout>
</repository>
<repository>
Expand All @@ -61,6 +61,32 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand All @@ -74,6 +100,28 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<build>
Expand Down

0 comments on commit bc5be7d

Please sign in to comment.