Skip to content
This repository has been archived by the owner on Sep 17, 2019. It is now read-only.

Commit

Permalink
version that seem to work with Mars, however it use the global xtend
Browse files Browse the repository at this point in the history
repository that may retreive unwanted xtend/xtext versions
  • Loading branch information
dvojtise committed Apr 14, 2016
1 parent 0b8cd77 commit 3b180bf
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 17 deletions.
22 changes: 11 additions & 11 deletions gemoc_studio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@
</repository>

<!-- *********** Xtext related update site -->
<!-- <repository> -->
<!-- <id>xtext all releases</id> -->
<!-- <layout>p2</layout> -->
<!-- <url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/</url> -->
<!-- </repository> -->
<!-- refinement from "xtext all releases" -->
<repository> <!-- strange : required by fr.inria.aoste.timesquare.ccslkernel.solver.priorities.editor.feature.feature.group -->
<id>xtext releases 2.8.4</id>
<repository>
<id>xtext all releases</id>
<layout>p2</layout>
<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.4/</url>
<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/</url>
</repository>
<!-- refinement from "xtext all releases" -->
<!-- <repository> strange : required by fr.inria.aoste.timesquare.ccslkernel.solver.priorities.editor.feature.feature.group -->
<!-- <id>xtext releases 2.8.4</id> -->
<!-- <layout>p2</layout> -->
<!-- <url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.4/</url> -->
<!-- </repository> -->

<!-- *********** -->
<repository>
Expand Down Expand Up @@ -135,8 +135,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
Expand Down
19 changes: 13 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@
</modules>

<properties>
<tycho-version>0.21.0</tycho-version>
<tycho-version>0.22.0</tycho-version>
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
</properties>

<repositories>
<!-- List of P2 repositories of external tool used to build the components -->
<!-- must NOT include the repositories of the tools included in the Studio has it has its own complementary list -->

<!-- Luna is maintained only for compilation, must be removed ASAP -->
<repository>
<id>Luna release</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/luna/201502271000</url>
</repository>
<repository>
<id>Mars release</id>
<layout>p2</layout>
Expand Down Expand Up @@ -46,11 +53,11 @@
<layout>p2</layout>
<url>http://melange-lang.org/updatesite/</url>
</repository>
<!-- <repository>
<repository>
<id>Sirius</id>
<layout>p2</layout>
<url>http://download.eclipse.org/sirius/updates/nightly/2.0.x/luna</url>
</repository>-->
<url>http://download.eclipse.org/sirius/updates/releases/3.1.4/mars</url>
</repository>
<repository>
<id>umldesigner</id>
<layout>p2</layout>
Expand Down Expand Up @@ -185,8 +192,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
Expand Down

0 comments on commit 3b180bf

Please sign in to comment.