Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2018-07-06 13:19:51 -0400
committerHenrik Rentz-Reichert2018-07-06 13:22:00 -0400
commit0509ac03bea494b08a92251e68e9efc92e415a20 (patch)
treed070ca8800c829827df8aff75c1b773fe1115908 /releng
parentc2dfdeabf15d7e367bcd92731e6ac8651ffb9cac (diff)
parentbed42b94fbf934db15e792b247ee747f0c37ebf4 (diff)
downloadorg.eclipse.etrice-0509ac03bea494b08a92251e68e9efc92e415a20.tar.gz
org.eclipse.etrice-0509ac03bea494b08a92251e68e9efc92e415a20.tar.xz
org.eclipse.etrice-0509ac03bea494b08a92251e68e9efc92e415a20.zip
Merge remote-tracking branch 'newfsmgen_finalize'
Conflicts: plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF Change-Id: Icc81a851cdcdb35081b8eaa3d5b025c1f850de54
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 1bb076cab..8ef673bc4 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -10,12 +10,12 @@
<properties>
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
-
<xtext.version>2.12.0</xtext.version>
<tycho.version>1.1.0</tycho.version>
<cbi.version>1.1.4</cbi.version>
<eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url>
+ <xtext.url>http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/</xtext.url>
<license.url>http://download.eclipse.org/cbi/updates/license</license.url>
<orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url>
<cbi.url>https://repo.eclipse.org/content/repositories/cbi-releases</cbi.url>
@@ -32,6 +32,11 @@
<layout>p2</layout>
</repository>
<repository>
+ <id>xtext</id>
+ <url>${xtext.url}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
<id>license</id>
<url>${license.url}</url>
<layout>p2</layout>

Back to the top