Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratischenko2015-11-12 12:35:16 -0500
committeratischenko2015-11-13 06:49:26 -0500
commit5c535eb58db41d02e4468637aab07ab39c37a8d9 (patch)
tree1d309e44e8e1ebe292f57a4a486116fd172e134a
parentc2ad23bf9a4b5a9d0c35844507856f9c3546c8ad (diff)
downloadorg.eclipse.gmf-tooling-5c535eb58db41d02e4468637aab07ab39c37a8d9.tar.gz
org.eclipse.gmf-tooling-5c535eb58db41d02e4468637aab07ab39c37a8d9.tar.xz
org.eclipse.gmf-tooling-5c535eb58db41d02e4468637aab07ab39c37a8d9.zip
Update build
- update tycho - update xtend version - remove from build old tests - remove experimental sdk Change-Id: I68fd23976e5cf43257dcf791c0bf3220effcdfb2 Signed-off-by: atischenko <tischenko@montages.com>
-rw-r--r--features/org.eclipse.gmf.tooling.codegen.xtend2-feature/feature.xml4
-rw-r--r--features/pom.xml4
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/META-INF/MANIFEST.MF4
-rw-r--r--pom.xml9
-rw-r--r--repository/category.xml4
-rw-r--r--repository/site.xml4
-rw-r--r--tests/pom.xml4
7 files changed, 19 insertions, 14 deletions
diff --git a/features/org.eclipse.gmf.tooling.codegen.xtend2-feature/feature.xml b/features/org.eclipse.gmf.tooling.codegen.xtend2-feature/feature.xml
index 3b6379416..529e992df 100644
--- a/features/org.eclipse.gmf.tooling.codegen.xtend2-feature/feature.xml
+++ b/features/org.eclipse.gmf.tooling.codegen.xtend2-feature/feature.xml
@@ -36,8 +36,8 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.gmf.validate" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.gmf.codegen" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.graphdef" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.xtext" version="2.3.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.builder" version="2.3.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.xtext" version="2.9.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.xtext.builder" version="2.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.lib"/>
<import plugin="org.eclipse.ocl.ecore"/>
<import plugin="com.google.guava"/>
diff --git a/features/pom.xml b/features/pom.xml
index 15193ce7a..c1d8d9e72 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -26,9 +26,9 @@
<!-- features -->
<module>org.eclipse.gmf.doc-feature</module>
<!-- module>org.eclipse.gmf.europa-feature</module>
- <module>org.eclipse.gmf.platform-feature</module-->
+ <module>org.eclipse.gmf.platform-feature</module>
<module>org.eclipse.gmf.sdk.experimental.source-feature</module>
- <module>org.eclipse.gmf.sdk.experimental-feature</module>
+ <module>org.eclipse.gmf.sdk.experimental-feature</module-->
<module>org.eclipse.gmf.sdk-feature</module>
<module>org.eclipse.gmf.tooling.source-feature</module>
<module>org.eclipse.gmf.tooling-feature</module>
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen.xtend/META-INF/MANIFEST.MF
index 68dbabc74..9c3d36cd3 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen.xtend/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.gmf.validate;bundle-version="[1.1.0,2.0.0)",
org.eclipse.gmf.codegen;bundle-version="[2.0.0,3.1.0)",
org.eclipse.gmf.graphdef;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.xtext;bundle-version="2.3.1",
- org.eclipse.xtext.builder;bundle-version="2.3.1",
+ org.eclipse.xtext;bundle-version="2.9.0",
+ org.eclipse.xtext.builder;bundle-version="2.9.0",
org.eclipse.xtend.lib,
org.eclipse.ocl.ecore,
com.google.guava,
diff --git a/pom.xml b/pom.xml
index d33435bfc..023c72284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,9 @@
</prerequisites>
<properties>
- <tycho-version>0.19.0</tycho-version>
+ <tycho-version>0.23.1</tycho-version>
<jar-signer-version>1.0.4</jar-signer-version>
- <xtend-version>2.5.0</xtend-version>
+ <xtend-version>2.7.3</xtend-version>
<base-composite-path>/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/</base-composite-path>
<composite-path>${base-composite-path}dev-snapshots/3.3/</composite-path>
<publish-path>${composite-path}${buildQualifier}</publish-path>
@@ -150,6 +150,11 @@
<layout>p2</layout>
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
</repository>
+ <repository>
+ <id>xtext</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/</url>
+ </repository>
</repositories>
</profile>
<profile>
diff --git a/repository/category.xml b/repository/category.xml
index f5b94cb3c..844de7f94 100644
--- a/repository/category.xml
+++ b/repository/category.xml
@@ -16,9 +16,9 @@
<feature url="features/org.eclipse.gmf.tooling.simplemap_1.0.0.qualifier.jar" id="org.eclipse.gmf.tooling.simplemap" version="1.0.0.qualifier">
<category name="GMF Tooling"/>
</feature>
- <feature url="features/org.eclipse.gmf.sdk.experimental_1.3.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.3.0.qualifier">
+ <!--feature url="features/org.eclipse.gmf.sdk.experimental_1.3.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.3.0.qualifier">
<category name="GMF Tooling - Experimental"/>
- </feature>
+ </feature-->
<feature url="features/org.eclipse.gmf.tooling.codegen.xtend2_3.3.0.qualifier.jar" id="org.eclipse.gmf.tooling.codegen.xtend2" version="3.3.0.qualifier">
<category name="GMF Tooling"/>
</feature>
diff --git a/repository/site.xml b/repository/site.xml
index f5b94cb3c..844de7f94 100644
--- a/repository/site.xml
+++ b/repository/site.xml
@@ -16,9 +16,9 @@
<feature url="features/org.eclipse.gmf.tooling.simplemap_1.0.0.qualifier.jar" id="org.eclipse.gmf.tooling.simplemap" version="1.0.0.qualifier">
<category name="GMF Tooling"/>
</feature>
- <feature url="features/org.eclipse.gmf.sdk.experimental_1.3.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.3.0.qualifier">
+ <!--feature url="features/org.eclipse.gmf.sdk.experimental_1.3.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.3.0.qualifier">
<category name="GMF Tooling - Experimental"/>
- </feature>
+ </feature-->
<feature url="features/org.eclipse.gmf.tooling.codegen.xtend2_3.3.0.qualifier.jar" id="org.eclipse.gmf.tooling.codegen.xtend2" version="3.3.0.qualifier">
<category name="GMF Tooling"/>
</feature>
diff --git a/tests/pom.xml b/tests/pom.xml
index bf05b6843..fe08bfd73 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -25,9 +25,9 @@
<modules>
<module>org.eclipse.gmf.tests</module>
<module>org.eclipse.gmf.tooling.tests.xtend</module>
- <module>org.eclipse.gmf.tests.lite</module>
+ <!--module>org.eclipse.gmf.tests.lite</module>
<module>org.eclipse.gmf.tests.xpand</module>
- <module>org.eclipse.gmf.tests.xpand.migration</module>
+ <module>org.eclipse.gmf.tests.xpand.migration</module-->
</modules>
<profiles>

Back to the top