Merge branch 'master' of ssh://git.eclipse.org/gitroot/gmf-tooling/org.eclipse.gmf-tooling
Conflicts:
pom.xml
diff --git a/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF
index 890ea78..3401eaa 100644
--- a/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.bridge.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.1.qualifier
Bundle-Activator: org.eclipse.gmf.internal.bridge.ui.Plugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -19,8 +19,8 @@
org.eclipse.gmf.map.edit;bundle-version="[2.0.0,3.1.0)",
org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.3.0,3.0.0)",
org.eclipse.emf.importer;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.m2m.qvt.oml.runtime;bundle-version="[2.0.0,4.0.0)"
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.4.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.gmf.internal.bridge.resolver;x-internal:=true,
org.eclipse.gmf.internal.bridge.transform;
diff --git a/plugins/org.eclipse.gmf.bridge.ui/pom.xml b/plugins/org.eclipse.gmf.bridge.ui/pom.xml
index 2d64c11..0a1ed5e 100644
--- a/plugins/org.eclipse.gmf.bridge.ui/pom.xml
+++ b/plugins/org.eclipse.gmf.bridge.ui/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.plugins</groupId>
<artifactId>org.eclipse.gmf.bridge.ui</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF
index 8433576..dcda37d 100644
--- a/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.bridge;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
@@ -13,7 +13,7 @@
org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.gmf.graphdef.codegen;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
Export-Package: org.eclipse.gmf.internal.bridge;x-friends:="org.eclipse.gmf.tests,org.eclipse.gmf.bridge.trace,org.eclipse.gmf.codegen.ui,org.eclipse.gmf.bridge.ui",
org.eclipse.gmf.internal.bridge.genmodel;x-friends:="org.eclipse.gmf.tests,org.eclipse.gmf.codegen.ui,org.eclipse.gmf.tests.lite,org.eclipse.gmf.bridge.ui",
org.eclipse.gmf.internal.bridge.naming;x-friends:="org.eclipse.gmf.tests",
diff --git a/plugins/org.eclipse.gmf.bridge/pom.xml b/plugins/org.eclipse.gmf.bridge/pom.xml
index d27800a..d3c9900 100644
--- a/plugins/org.eclipse.gmf.bridge/pom.xml
+++ b/plugins/org.eclipse.gmf.bridge/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.plugins</groupId>
<artifactId>org.eclipse.gmf.bridge</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
index b9960d8..8a5f2d8 100644
--- a/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
org.eclipse.gmf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.gmf.validate;bundle-version="[1.1.0,2.0.0)",
org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/OrganizeImportsPostprocessor.java b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/OrganizeImportsPostprocessor.java
index db7817c..8277118 100644
--- a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/OrganizeImportsPostprocessor.java
+++ b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/codegen/OrganizeImportsPostprocessor.java
@@ -14,6 +14,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -27,6 +28,7 @@
import org.eclipse.gmf.internal.common.Activator;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.compiler.IProblem;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
@@ -46,6 +48,7 @@
import org.eclipse.text.edits.TextEdit;
public class OrganizeImportsPostprocessor {
+
private final boolean myRestoreExistingImports;
public OrganizeImportsPostprocessor() {
@@ -98,8 +101,9 @@
public void organizeImports(ICompilationUnit icu, String[] declaredImportsAsStrings, IProgressMonitor progress) throws CoreException {
IDocument document = new Document(icu.getBuffer().getContents());
- ASTParser parser = ASTParser.newParser(AST.JLS3);
+ ASTParser parser = ASTParser.newParser(AST.JLS4);
parser.setSource(icu);
+ parser.setCompilerOptions(createCompilerOptions("1.5"));
CompilationUnit cu = (CompilationUnit) parser.createAST(progress);
TextEdit importsEdit = organizeImports(cu, declaredImportsAsStrings, progress);
@@ -278,6 +282,7 @@
}
private class ReferencedTypesAwareImportRewriteContext extends ImportRewrite.ImportRewriteContext {
+
private Collection<SimpleName> mySimpleTypesReferenced;
private ImportRewrite myImportRewrite;
@@ -372,4 +377,14 @@
private static boolean isDebug() {
return Boolean.parseBoolean(Platform.getDebugOption(Activator.getID() + "/debug/organizeImports"));//$NON-NLS-1$
}
+
+ @SuppressWarnings("unchecked")
+ private final static HashMap<String, String> createCompilerOptions(String targetLevel) {
+ HashMap<String, String> result = new HashMap<String, String>(JavaCore.getOptions());
+ result.put(JavaCore.COMPILER_COMPLIANCE, targetLevel);
+ result.put(JavaCore.COMPILER_SOURCE, targetLevel);
+ result.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, targetLevel);
+ return result;
+ }
+
}
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
index 0d669ac..e552b26 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.graphdef.codegen;singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.10.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
@@ -12,7 +12,7 @@
org.eclipse.emf.codegen;bundle-version="[2.3.0,3.0.0)",
org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
Export-Package: org.eclipse.gmf.graphdef.codegen,
org.eclipse.gmf.internal.graphdef.codegen;x-friends:="org.eclipse.gmf.graphdef.codegen.ui,org.eclipse.gmf.tests"
Bundle-Activator: org.eclipse.gmf.internal.graphdef.codegen.Activator
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml b/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml
index 0ef47ea..7637ed1 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.plugins</groupId>
<artifactId>org.eclipse.gmf.graphdef.codegen</artifactId>
- <version>2.9.0-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/META-INF/MANIFEST.MF
index e1dc1cd..d968519 100644
--- a/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmf.tooling.simplemap.bridge.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.ui.ide;bundle-version="3.8.0",
@@ -11,7 +11,7 @@
org.eclipse.gmf.bridge.ui;bundle-version="1.5.0",
org.eclipse.gmf.bridge;bundle-version="1.3.0",
org.eclipse.gmf.tooling.simplemap.model;bundle-version="1.0.0",
- org.eclipse.m2m.qvt.oml;bundle-version="3.2.0",
- org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.1.0"
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.4.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/pom.xml b/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/pom.xml
index b147352..f2bfea7 100644
--- a/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/pom.xml
+++ b/plugins/org.eclipse.gmf.tooling.simplemap.bridge.ui/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.plugins</groupId>
<artifactId>org.eclipse.gmf.tooling.simplemap.bridge.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/plugins/org.eclipse.gmf.xpand.ant/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.xpand.ant/META-INF/MANIFEST.MF
index e071de0..a61fa71 100644
--- a/plugins/org.eclipse.gmf.xpand.ant/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.xpand.ant/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.xpand.ant;singleton:=true
-Bundle-Version: 0.9.100.qualifier
+Bundle-Version: 0.10.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -10,6 +10,6 @@
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
org.eclipse.ant.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.1.0,4.0.0)"
+ org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.4.0,4.0.0)"
Import-Package: org.eclipse.core.resources
Export-Package: org.eclipse.gmf.internal.xpand.ant;x-internal:=true
diff --git a/plugins/org.eclipse.gmf.xpand.ant/pom.xml b/plugins/org.eclipse.gmf.xpand.ant/pom.xml
index 8592083..436a168 100644
--- a/plugins/org.eclipse.gmf.xpand.ant/pom.xml
+++ b/plugins/org.eclipse.gmf.xpand.ant/pom.xml
@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.plugins</groupId>
<artifactId>org.eclipse.gmf.xpand.ant</artifactId>
- <version>0.9.100-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF
index e181805..f96f8f7 100644
--- a/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.xpand.editor;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.gmf.internal.xpand.editor.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
@@ -16,7 +16,7 @@
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.gmf.internal.xpand.codeassist;x-friends:="org.eclipse.gmf.tests.xpand",
org.eclipse.gmf.internal.xpand.editor;x-friends:="org.eclipse.gmf.tests.xpand",
diff --git a/plugins/org.eclipse.gmf.xpand.editor/pom.xml b/plugins/org.eclipse.gmf.xpand.editor/pom.xml
index 34b9d83..df1b490 100644
--- a/plugins/org.eclipse.gmf.xpand.editor/pom.xml
+++ b/plugins/org.eclipse.gmf.xpand.editor/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.tests</groupId>
<artifactId>org.eclipse.gmf.xpand.editor</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/plugins/org.eclipse.gmf.xpand.qvtlibrary/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.xpand.qvtlibrary/META-INF/MANIFEST.MF
index 8a86591..40ffcc2 100644
--- a/plugins/org.eclipse.gmf.xpand.qvtlibrary/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.xpand.qvtlibrary/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.xpand.qvtlibrary;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ocl.ecore,
- org.eclipse.m2m.qvt.oml
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.gmf.xpand.qvtlibrary/pom.xml b/plugins/org.eclipse.gmf.xpand.qvtlibrary/pom.xml
index ac73aa6..3ec6a7b 100644
--- a/plugins/org.eclipse.gmf.xpand.qvtlibrary/pom.xml
+++ b/plugins/org.eclipse.gmf.xpand.qvtlibrary/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.plugins</groupId>
<artifactId>org.eclipse.gmf.xpand.qvtlibrary</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF
index 06979f3..4d241d3 100644
--- a/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.xpand;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.m2m.qvt.oml.common;bundle-version="[2.1.0,4.0.0)",
- org.eclipse.m2m.qvt.oml.project;bundle-version="[2.1.0,4.0.0)",
- org.eclipse.m2m.qvt.oml.runtime;bundle-version="[2.1.0,4.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
+ org.eclipse.m2m.qvt.oml.common;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.m2m.qvt.oml.project;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.gmf.xpand.qvtlibrary;bundle-version="[1.0.0,2.0.0)",
lpg.runtime.java;bundle-version="[2.0.17,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.gmf.internal.xpand;
diff --git a/plugins/org.eclipse.gmf.xpand/pom.xml b/plugins/org.eclipse.gmf.xpand/pom.xml
index df3d327..67ac497 100644
--- a/plugins/org.eclipse.gmf.xpand/pom.xml
+++ b/plugins/org.eclipse.gmf.xpand/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gmf-tooling.plugins</groupId>
<artifactId>org.eclipse.gmf.xpand</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
diff --git a/pom.xml b/pom.xml
index 2d1d4ee..9c83542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,6 +239,11 @@
<layout>p2</layout>
<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20131024145017/repository/</url>
</repository>
+ <repository>
+ <id>ObjectTeamsRepository, see bug #350133 for details why we need that</id>
+ <name>Object Teams Repository</name>
+ <url>http://download.eclipse.org/objectteams/maven/3/repository</url>
+ </repository>
</repositories>
</profile>
<profile>
diff --git a/repository/pom.xml b/repository/pom.xml
index ad6487d..eccfe0f 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -6,65 +6,84 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Mickael istria (PetalsLink)
+ * Mickael istria (PetalsLink)
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.gmf-tooling</groupId>
- <artifactId>repository</artifactId>
- <packaging>eclipse-repository</packaging>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.gmf-tooling</groupId>
+ <artifactId>repository</artifactId>
+ <packaging>eclipse-repository</packaging>
- <parent>
- <groupId>org.eclipse.gmf-tooling</groupId>
- <artifactId>parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
+ <parent>
+ <groupId>org.eclipse.gmf-tooling</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
- <profiles>
- <profile>
- <id>deploy</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>verify</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <delete includeemptydirs="false" quiet="true">
- <fileset dir="${publish-path}">
- <include name="**" />
- </fileset>
- </delete>
- <copy includeemptydirs="false" todir="${publish-path}">
- <fileset dir="target/repository/">
- <include name="**" />
- </fileset>
- </copy>
- <ant
- antfile="/shared/modeling/tools/promotion/manage-composite.xml"
- target="add">
- <property name="user.dir" value="${composite-path}"/>
- <property name="composite.name" value="GMF Tooling"/>
- <property name="child.repository" value="${buildQualifier}"/>
- </ant>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <build>
+ <plugins>
+ <!-- this is an attempt to fix build #553, with respect to #350133, comment-40, but it did not worked -->
+ <!--
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <filters>
+ <filter>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.jdt.core</id>
+ <restrictTo>
+ <version>3.10.0.v20131212-1600</version>
+ </restrictTo>
+ </filter>
+ </filters>
+ </configuration>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>deploy</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <delete includeemptydirs="false" quiet="true">
+ <fileset dir="${publish-path}">
+ <include name="**" />
+ </fileset>
+ </delete>
+ <copy includeemptydirs="false" todir="${publish-path}">
+ <fileset dir="target/repository/">
+ <include name="**" />
+ </fileset>
+ </copy>
+ <ant
+ antfile="/shared/modeling/tools/promotion/manage-composite.xml"
+ target="add">
+ <property name="user.dir" value="${composite-path}"/>
+ <property name="composite.name" value="GMF Tooling"/>
+ <property name="child.repository" value="${buildQualifier}"/>
+ </ant>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
index d98fd32..bc3902e 100644
--- a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.tests;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
@@ -32,8 +32,7 @@
org.eclipse.gmf.graphdef.codegen.ui;bundle-version="[1.3.0,2.0.0)",
org.eclipse.gmf.tooling.runtime;bundle-version="[2.9.0,4.0.0)",
org.eclipse.gmf.xpand.qvtlibrary;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.bridge.trace;bundle-version="[1.0.0,2.0.0)",
- org.hamcrest;bundle-version="1.1.0"
+ org.eclipse.gmf.bridge.trace;bundle-version="[1.0.0,2.0.0)"
Bundle-Activator: org.eclipse.gmf.tests.Plugin
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.gmf.tests;x-friends:="org.eclipse.gmf.tests.lite",
diff --git a/tests/org.eclipse.gmf.tests/pom.xml b/tests/org.eclipse.gmf.tests/pom.xml
index ac7c6f6..2dd92a0 100644
--- a/tests/org.eclipse.gmf.tests/pom.xml
+++ b/tests/org.eclipse.gmf.tests/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.eclipse.gmf-tooling.tests</groupId>
<artifactId>org.eclipse.gmf.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<parent>
<groupId>org.eclipse.gmf-tooling</groupId>
@@ -22,7 +22,23 @@
<version>3.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
-
+
+ <properties>
+ <os-jvm-flags/>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>macosx-jvm-flags</id>
+ <activation>
+ <os><family>mac</family></os>
+ </activation>
+ <properties>
+ <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -53,7 +69,7 @@
</goals>
<configuration>
<testClass>org.eclipse.gmf.tests.AllSWTBotTests</testClass>
- <useUIThread>false</useUIThread>
+ <useUIThread>false</useUIThread>
</configuration>
</execution>
<execution>
@@ -63,7 +79,7 @@
</goals>
<configuration>
<testClass>org.eclipse.gmf.tests.AllTests</testClass>
- <useUIThread>true</useUIThread>
+ <useUIThread>true</useUIThread>
</configuration>
</execution>
</executions>
@@ -71,10 +87,7 @@
<configuration>
<useUIHarness>true</useUIHarness>
<testSuite>org.eclipse.gmf.tests</testSuite>
- <!--
- <argLine>${tycho.testArgLine} -Xmx2g -XX:MaxPermSize=256m -XstartOnFirstThread -DbuildingWithTycho=true</argLine>
- -->
- <argLine>${tycho.testArgLine} -Xmx768m -XX:MaxPermSize=128m -DbuildingWithTycho=true</argLine>
+ <argLine>${tycho.testArgLine} -Xmx2g -XX:MaxPermSize=256m -DbuildingWithTycho=true ${os-jvm-flags}</argLine>
<bundleStartLevel>
<bundle>
<id>org.eclipse.equinox.ds</id>
@@ -84,17 +97,33 @@
</bundleStartLevel>
<dependencies>
<dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.gmf.feature.group</artifactId>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.pde.feature.group</artifactId>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.emf.validation.ocl</artifactId>
- </dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.gmf.feature.group</artifactId>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.pde.feature.group</artifactId>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.emf.validation.ocl</artifactId>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.hamcrest</artifactId>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.equinox.event</artifactId>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId>
+ </dependency>
+ <dependency>
+ <type>eclipse-feature</type>
+ <artifactId>org.eclipse.jdt</artifactId>
+ </dependency>
</dependencies>
</configuration>
</plugin>
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/Utils.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/Utils.java
index aa95054..2732510 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/Utils.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/Utils.java
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier;
import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
@@ -167,6 +168,9 @@
targetDef.setNL(Platform.getNL());
// targetDef.setJREContainer()
tpService.saveTargetDefinition(targetDef);
- LoadTargetDefinitionJob.load(targetDef);
+
+ Job job = new LoadTargetDefinitionJob(targetDef);
+ job.schedule();
+ job.join();
}
}
