Skip to content

Commit e50353d

Browse files
authored
Use tpd for defining target platform (#216)
* use tpd as targetplatform definition * make sure that 2 commitCurrentTransaction cannot occurs at the same time contributes to eclipse-gemoc/gemoc-studio#123 Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
1 parent 8b913a2 commit e50353d

File tree

5 files changed

+13
-38
lines changed

5 files changed

+13
-38
lines changed

commons/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@
4040
</build>
4141

4242
<repositories>
43-
<repository>
44-
<id>Eclipse release</id>
45-
<layout>p2</layout>
46-
<url>${eclipse.release.p2.url}</url>
47-
</repository>
43+
4844
</repositories>
4945
</project>

framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ private void cleanCurrentTransactionCommand() {
386386
currentTransaction.getCommand().dispose();
387387
}
388388

389-
private void commitCurrentTransaction() {
389+
private synchronized void commitCurrentTransaction() {
390390
if (currentTransaction != null) {
391391
try {
392392
currentTransaction.commit();

framework/pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
</modules>
1919

2020
<repositories>
21-
<repository>
22-
<id>Eclipse release</id>
23-
<layout>p2</layout>
24-
<url>${eclipse.release.p2.url}</url>
25-
</repository>
21+
2622
<repository>
2723
<id>K3</id>
2824
<layout>p2</layout>
@@ -33,11 +29,5 @@
3329
<layout>p2</layout>
3430
<url>${melange.p2.url}</url>
3531
</repository>
36-
<!-- e(fxc)lipse updatesite is currently required because they dropped from the release train -->
37-
<repository>
38-
<id>efxclipse</id>
39-
<layout>p2</layout>
40-
<url>${efxclipse.p2.url}</url>
41-
</repository>
4232
</repositories>
4333
</project>

pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,14 @@
158158
<artifactId>target-platform-configuration</artifactId>
159159
<version>${tycho-version}</version>
160160
<configuration>
161+
<target>
162+
<artifact>
163+
<groupId>org.eclipse.gemoc.gemoc-studio.bundle</groupId>
164+
<artifactId>org.eclipse.gemoc.gemoc_studio.targetplatform</artifactId>
165+
<version>3.5.0-SNAPSHOT</version>
166+
<classifier>gemoc_studio</classifier>
167+
</artifact>
168+
</target>
161169
<!-- environments that will be built -->
162170
<environments>
163171
<environment>

trace/pom.xml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,7 @@
6565
</dependencies>
6666

6767
<repositories>
68-
<repository>
69-
<id>Eclipse release</id>
70-
<layout>p2</layout>
71-
<url>${eclipse.release.p2.url}</url>
72-
</repository>
68+
7369
<repository>
7470
<id>K3</id>
7571
<layout>p2</layout>
@@ -80,21 +76,6 @@
8076
<layout>p2</layout>
8177
<url>${melange.p2.url}</url>
8278
</repository>
83-
<repository>
84-
<id>ELK</id>
85-
<layout>p2</layout>
86-
<url>${elk.p2.url}</url>
87-
</repository>
88-
<!-- e(fxc)lipse updatesite is currently required because they dropped from the release train -->
89-
<repository>
90-
<id>efxclipse</id>
91-
<layout>p2</layout>
92-
<url>${efxclipse.p2.url}</url>
93-
</repository>
94-
<repository>
95-
<id>efxclipse2</id>
96-
<layout>p2</layout>
97-
<url>${efxclipse2.p2.url}</url>
98-
</repository>
79+
9980
</repositories>
10081
</project>

0 commit comments

Comments
 (0)