Skip to content

Commit babe270

Browse files
dvojtisedvojtise
committed
pom cleanup
Signed-off-by: Didier Vojtisek <[email protected]>
1 parent cba983b commit babe270

File tree

3 files changed

+27
-96
lines changed
  • java_engine/pomfirst
    • org.eclipse.gemoc.execution.sequential.javaengine.headless
    • pom.xml
  • pomfirst

3 files changed

+27
-96
lines changed

‎java_engine/pomfirst/org.eclipse.gemoc.execution.sequential.javaengine.headless/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717
<maven.compiler.source>1.8</maven.compiler.source>
18-
<xtend.version>2.14.0</xtend.version>
18+
<xtend.version>2.19.0</xtend.version>
1919
</properties>
2020

2121
<dependencies>
@@ -175,7 +175,7 @@
175175
<url>https://repo.eclipse.org/content/groups/gemoc/</url>
176176
</repository>
177177
<repository>
178-
<id>>maven.inria.fr</id>
178+
<id>>maven-inria-fr</id>
179179
<name>Maven Inria</name>
180180
<releases>
181181
<enabled>true</enabled>

‎java_engine/pomfirst/pom.xml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,25 @@
99
<artifactId>org.eclipse.gemoc.execution.sequential.javaengine.pomfirst</artifactId>
1010
<version>1.0.0-SNAPSHOT</version>
1111

12-
<parent>
12+
<packaging>pom</packaging>
13+
<!-- <parent>
1314
<groupId>org.eclipse.gemoc</groupId>
1415
<artifactId>org.eclipse.gemoc.execution.sequential.java.pomfirst</artifactId>
1516
<version>1.0.0-SNAPSHOT</version>
1617
<relativePath>../../pomfirst/pom.xml</relativePath>
17-
</parent>
18-
19-
<packaging>pom</packaging>
18+
</parent> -->
2019

20+
<properties>
21+
<xtend.version>2.19.0</xtend.version>
22+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23+
<eclipse-repo.url>http://download.eclipse.org/releases/photon</eclipse-repo.url>
24+
<gemoc-repo.url>https://download.eclipse.org/gemoc/updates/nightly</gemoc-repo.url>
25+
<maven.compiler.source>1.8</maven.compiler.source>
26+
<maven.compiler.target>1.8</maven.compiler.target>
27+
<tycho.scmUrl>scm:git:https://github.com/eclipse/gemoc-studio-execution-java.git</tycho.scmUrl>
28+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29+
</properties>
30+
2131
<modules>
2232
<module>org.eclipse.gemoc.execution.sequential.javaengine.headless</module>
2333
</modules>

‎pomfirst/pom.xml

Lines changed: 11 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
4-
http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
4+
http://maven.apache.org/maven-v4_0_0.xsd">
55

6-
<modelVersion>4.0.0</modelVersion>
6+
<modelVersion>4.0.0</modelVersion>
77

88
<groupId>org.eclipse.gemoc</groupId>
9-
<artifactId>org.eclipse.gemoc.execution.sequential.java.pomfirst</artifactId>
9+
<artifactId>org.eclipse.gemoc.execution.sequential.java.pomfirst</artifactId>
1010
<version>1.0.0-SNAPSHOT</version>
11-
12-
<packaging>pom</packaging>
11+
12+
<packaging>pom</packaging>
1313

1414
<properties>
15-
<tycho.version>1.6.0</tycho.version>
1615
<xtend.version>2.19.0</xtend.version>
1716
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1817
<eclipse-repo.url>http://download.eclipse.org/releases/photon</eclipse-repo.url>
@@ -22,87 +21,9 @@
2221
<tycho.scmUrl>scm:git:https://github.com/eclipse/gemoc-studio-execution-java.git</tycho.scmUrl>
2322
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2423
</properties>
25-
26-
24+
2725
<modules>
28-
<module>../java_engine/pomfirst</module>
29-
</modules>
30-
31-
<build>
32-
<plugins>
33-
<!-- enable P2 layout for repositories -->
34-
<plugin>
35-
<groupId>org.eclipse.tycho</groupId>
36-
<artifactId>tycho-maven-plugin</artifactId>
37-
<version>${tycho.version}</version>
38-
<extensions>true</extensions>
39-
</plugin>
40-
<!-- enable xtend compilation -->
41-
<plugin>
42-
<groupId>org.eclipse.xtend</groupId>
43-
<artifactId>xtend-maven-plugin</artifactId>
44-
<version>${xtend.version}</version>
45-
<executions>
46-
<execution>
47-
<goals>
48-
<goal>compile</goal>
49-
<goal>xtend-install-debug-info</goal>
50-
<goal>testCompile</goal>
51-
<goal>xtend-test-install-debug-info</goal>
52-
</goals>
53-
<configuration>
54-
<outputDirectory>xtend-gen</outputDirectory>
55-
</configuration>
56-
</execution>
57-
</executions>
58-
<!-- workaround https://github.com/eclipse/xtext/issues/1231 -->
59-
<!-- workaround https://github.com/eclipse/xtext/issues/1373 -->
60-
<!-- Remove with upgrade to Xtext 2.15 -->
61-
<dependencies>
62-
<dependency>
63-
<groupId>org.eclipse.jdt</groupId>
64-
<artifactId>org.eclipse.jdt.core</artifactId>
65-
<version>3.13.102</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.eclipse.jdt</groupId>
69-
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
70-
<version>1.3.110</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.eclipse.jdt</groupId>
74-
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
75-
<version>1.2.101</version>
76-
</dependency>
77-
<dependency>
78-
<groupId>org.eclipse.emf</groupId>
79-
<artifactId>org.eclipse.emf.codegen</artifactId>
80-
<version>2.11.0</version>
81-
</dependency>
82-
</dependencies>
83-
</plugin>
26+
<module>../java_engine/pomfirst</module>
27+
</modules>
8428

85-
</plugins>
86-
</build>
87-
88-
<repositories>
89-
<repository>
90-
<id>nexus-eclipse-gemoc</id>
91-
<name>Nexus Eclipse GEMOC</name>
92-
<releases><enabled>true</enabled></releases>
93-
<snapshots><enabled>true</enabled></snapshots>
94-
<url>https://repo.eclipse.org/content/groups/gemoc/</url>
95-
</repository>
96-
97-
<repository>
98-
<id>eclipse-repo</id>
99-
<url>${eclipse-repo.url}</url>
100-
<layout>p2</layout>
101-
</repository>
102-
<repository>
103-
<id>gemoc-repo</id>
104-
<url>${gemoc-repo.url}</url>
105-
<layout>p2</layout>
106-
</repository>
107-
</repositories>
10829
</project>

0 commit comments

Comments
 (0)