Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2013-10-03 12:07:55 +0000
committerLaurent Goubet2013-10-03 12:38:08 +0000
commit44baa247da6ae88d24a25b043ecaa56f99229da6 (patch)
tree7b0702f52c8cc3558e01efe8ddf48ad79f5dfe4b
parentcf6560ec0244e93e36c968e5f149f82902c97c62 (diff)
downloadorg.eclipse.emf.compare-44baa247da6ae88d24a25b043ecaa56f99229da6.tar.gz
org.eclipse.emf.compare-44baa247da6ae88d24a25b043ecaa56f99229da6.tar.xz
org.eclipse.emf.compare-44baa247da6ae88d24a25b043ecaa56f99229da6.zip
Updating version numbers for 2.1.2
-rw-r--r--org.eclipse.emf.compare-parent/pom.xml2
-rw-r--r--packaging/org.eclipse.emf.compare-feature/feature.xml70
-rw-r--r--packaging/org.eclipse.emf.compare-feature/pom.xml78
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml8
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml30
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml96
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml30
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml10
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml30
-rw-r--r--packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml106
-rw-r--r--packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml78
-rw-r--r--packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml92
-rw-r--r--packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml30
-rw-r--r--packaging/org.eclipse.emf.compare.sysml-feature/feature.xml82
-rw-r--r--packaging/org.eclipse.emf.compare.sysml-feature/pom.xml30
-rw-r--r--packaging/org.eclipse.emf.compare.uml2-feature/feature.xml6
-rw-r--r--packaging/org.eclipse.emf.compare.uml2-feature/pom.xml30
-rw-r--r--packaging/org.eclipse.emf.compare.update/pom.xml366
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml66
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml66
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml66
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.edit/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/pom.xml84
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml84
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.compare.ide/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/pom.xml100
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/pom.xml68
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare/pom.xml2
42 files changed, 872 insertions, 872 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index cf3f5df9a..277790133 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
diff --git a/packaging/org.eclipse.emf.compare-feature/feature.xml b/packaging/org.eclipse.emf.compare-feature/feature.xml
index ae3ae846a..0b85d5cae 100644
--- a/packaging/org.eclipse.emf.compare-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare-feature/feature.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.compare"
- label="%featureName"
- version="2.1.1.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.emf.compare">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="com.google.guava"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.compare"
+ label="%featureName"
+ version="2.1.2.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.emf.compare">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="com.google.guava"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/packaging/org.eclipse.emf.compare-feature/pom.xml b/packaging/org.eclipse.emf.compare-feature/pom.xml
index a703091e6..c816d0b80 100644
--- a/packaging/org.eclipse.emf.compare-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare-feature/pom.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <id>source-feature</id>
- <goals>
- <goal>source-feature</goal>
- </goals>
- <configuration>
- <excludes>
- <plugin id="com.google.guava"/>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <id>source-feature</id>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <plugin id="com.google.guava"/>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
index f2d399253..fce49063d 100644
--- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.compare.diagram.ecoretools"
label="%featureName"
- version="2.1.1.qualifier"
+ version="2.1.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.compare.diagram.ide.ui.ecoretools">
@@ -19,10 +19,10 @@
</license>
<requires>
- <import feature="org.eclipse.emf.compare" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.1.qualifier"/>
+ <import feature="org.eclipse.emf.compare" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.2.qualifier"/>
<import feature="org.eclipse.emf.ecoretools" version="1.0.0"/>
- <import feature="org.eclipse.emf.compare.diagram.gmf" version="2.1.1.qualifier"/>
+ <import feature="org.eclipse.emf.compare.diagram.gmf" version="2.1.2.qualifier"/>
</requires>
<plugin
diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
index e5f2b44fe..62ca5f8a5 100644
--- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare.diagram.ecoretools</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.diagram.ecoretools</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
index 477c6ac16..09a4100fc 100644
--- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.compare.diagram.gmf"
- label="%featureName"
- version="2.1.1.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.emf.compare.diagram">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.emf.compare" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.gmf.runtime.notation" version="1.5.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.emf.compare.diagram"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.diagram.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.diagram.ide.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.compare.diagram.gmf"
+ label="%featureName"
+ version="2.1.2.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.emf.compare.diagram">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.emf.compare" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.gmf.runtime.notation" version="1.5.0"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.emf.compare.diagram"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.diagram.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.diagram.ide.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
index 179d2e8a8..5dd8c8e1d 100644
--- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare.diagram.gmf</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.diagram.gmf</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
index 8e72f252f..9a268d3a8 100644
--- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.compare.diagram.papyrus"
label="%featureName"
- version="2.1.1.qualifier"
+ version="2.1.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.compare.diagram.ide.ui.papyrus">
@@ -19,10 +19,10 @@
</license>
<requires>
- <import feature="org.eclipse.emf.compare" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.emf.compare.diagram.gmf" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.emf.compare.uml2" version="2.1.1.qualifier"/>
+ <import feature="org.eclipse.emf.compare" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.emf.compare.diagram.gmf" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.emf.compare.uml2" version="2.1.2.qualifier"/>
<import feature="org.eclipse.papyrus.infra.core.feature" version="0.9.1.v201209190809"/>
<import feature="org.eclipse.papyrus.infra.emf.feature" version="0.9.1.v201209190809"/>
<import feature="org.eclipse.papyrus.infra.gmfdiag.feature" version="0.9.1.v201209190809"/>
diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
index dff388c6d..d5d09b874 100644
--- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare.diagram.papyrus</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.diagram.papyrus</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
index 2e955e244..cc1aaf8a7 100644
--- a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.compare.ide.ui"
- label="%featureName"
- version="2.1.1.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.emf.compare.ide.ui">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.emf.compare" version="2.1.1.qualifier"/>
- </requires>
-
- <plugin
- id="org.eclipse.emf.compare.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.ide"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.ide.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.compare.ide.ui"
+ label="%featureName"
+ version="2.1.2.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.emf.compare.ide.ui">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.emf.compare" version="2.1.2.qualifier"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.emf.compare.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.ide"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.ide.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
index ec6fd14f1..2d8d3a1d4 100644
--- a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare.ide.ui</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <id>source-feature</id>
- <goals>
- <goal>source-feature</goal>
- </goals>
- <configuration>
- <excludes>
- <plugin id="org.eclipse.emf.compare.doc"/>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.ide.ui</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <id>source-feature</id>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <plugin id="org.eclipse.emf.compare.doc"/>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
index 461fde8d5..1e58f7d59 100644
--- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.compare.rcp.ui"
- label="%featureName"
- version="2.1.1.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.emf.compare.rcp.ui">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.emf.compare" version="2.1.1.qualifier"/>
- </requires>
-
- <plugin
- id="org.eclipse.emf.compare.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.rcp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.rcp.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.compare.rcp.ui"
+ label="%featureName"
+ version="2.1.2.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.emf.compare.rcp.ui">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.emf.compare" version="2.1.2.qualifier"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.emf.compare.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.rcp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.rcp.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
index 877dcef2d..9c6f49983 100644
--- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml b/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml
index 035d3d7f5..58ab53795 100644
--- a/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.compare.sysml"
- label="%featureName"
- version="2.1.1.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.emf.compare">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.emf.compare" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.papyrus.sysml.feature" version="0.9.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.emf.compare.sysml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.compare.sysml.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.compare.sysml"
+ label="%featureName"
+ version="2.1.2.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.emf.compare">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.emf.compare" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.papyrus.sysml.feature" version="0.9.0"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.emf.compare.sysml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.sysml.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml b/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml
index 2b80d9db3..ebf957188 100644
--- a/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare.sysml</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.sysml</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
index 591552152..d45d8564b 100644
--- a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.compare.uml2"
label="%featureName"
- version="2.1.1.qualifier"
+ version="2.1.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.compare.uml2">
@@ -19,8 +19,8 @@
</license>
<requires>
- <import feature="org.eclipse.emf.compare" version="2.1.1.qualifier"/>
- <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.1.qualifier"/>
+ <import feature="org.eclipse.emf.compare" version="2.1.2.qualifier"/>
+ <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.2.qualifier"/>
<import plugin="org.eclipse.uml2.uml" version="3.2.0" match="greaterOrEqual"/>
</requires>
diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
index b22efab0c..ec6d5e79f 100644
--- a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare.features</groupId>
- <artifactId>org.eclipse.emf.compare.uml2</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.uml2</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.update/pom.xml b/packaging/org.eclipse.emf.compare.update/pom.xml
index a75bd5b89..c0d3c080d 100644
--- a/packaging/org.eclipse.emf.compare.update/pom.xml
+++ b/packaging/org.eclipse.emf.compare.update/pom.xml
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2012 Obeo
-
- Cedric Brun <cedric.brun@obeo.fr>
-
--->
-
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.emf.compare.update</artifactId>
- <packaging>eclipse-repository</packaging>
-
- <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
- <version>2.1.1-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <createArtifactRepository>true</createArtifactRepository>
- <finalName>${project.artifactId}</finalName>
- <compress>true</compress>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/repository</outputDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>index.html</include>
- <include>web/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare_promotion</id>
- <phase>verify</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/promotion"/>
- <echo file="${project.build.directory}/promotion/promote.properties"
- message="#EMFCompare promotion process.${line.separator}
-build.alias=${BUILD_ALIAS}${line.separator}
-build.qualifier=${env.BUILD_TYPE}${buildQualifier}${line.separator}
-version=${unqualifiedVersion}"/>
- <copy file="p2.xsl" todir="${project.build.directory}/promotion"/>
- <copy file="promoter.xml" todir="${project.build.directory}/promotion" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>sign</id>
- <activation>
- <property>
- <name>BUILD_SIGN</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0.5</version>
- <executions>
- <execution>
- <!-- Pack the p2 repository. -->
- <id>pack</id>
- <configuration>
- <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <!-- Sign the p2 repository -->
- <id>sign</id>
- <configuration>
- <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/emf/compare</signerInputDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- <execution>
- <!-- Repack the p2 repository -->
- <id>repack</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <!-- Signing and packing alters checksums so fix them -->
- <id>fixCheckSums</id>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>replace-unsigned-repository-by-signed-one</id>
- <phase>verify</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!-- prepare zip repo and repo for archiving -->
- <move file="${project.build.directory}/repository" tofile="${project.build.directory}/repository-not-signed"/>
- <move file="${project.build.directory}/checksumFix" tofile="${project.build.directory}/repository"/>
- <move file="${project.build.directory}/${project.artifactId}.zip" tofile="${project.build.directory}/${project.artifactId}-not-signed.zip"/>
- <zip destfile="${project.build.directory}/${project.artifactId}.zip" basedir="${project.build.directory}/repository"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <pluginRepositories>
- <pluginRepository>
- <id>maven.eclipse.org</id>
- <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 Obeo
+
+ Cedric Brun <cedric.brun@obeo.fr>
+
+-->
+
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.emf.compare.update</artifactId>
+ <packaging>eclipse-repository</packaging>
+
+ <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
+ <version>2.1.2-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <createArtifactRepository>true</createArtifactRepository>
+ <finalName>${project.artifactId}</finalName>
+ <compress>true</compress>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/repository</outputDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>index.html</include>
+ <include>web/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare_promotion</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}/promotion"/>
+ <echo file="${project.build.directory}/promotion/promote.properties"
+ message="#EMFCompare promotion process.${line.separator}
+build.alias=${BUILD_ALIAS}${line.separator}
+build.qualifier=${env.BUILD_TYPE}${buildQualifier}${line.separator}
+version=${unqualifiedVersion}"/>
+ <copy file="p2.xsl" todir="${project.build.directory}/promotion"/>
+ <copy file="promoter.xml" todir="${project.build.directory}/promotion" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>sign</id>
+ <activation>
+ <property>
+ <name>BUILD_SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.dash.maven</groupId>
+ <artifactId>eclipse-signing-maven-plugin</artifactId>
+ <version>1.0.5</version>
+ <executions>
+ <execution>
+ <!-- Pack the p2 repository. -->
+ <id>pack</id>
+ <configuration>
+ <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- Sign the p2 repository -->
+ <id>sign</id>
+ <configuration>
+ <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
+ <signerInputDirectory>/home/data/httpd/download-staging.priv/emf/compare</signerInputDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- Repack the p2 repository -->
+ <id>repack</id>
+ <configuration>
+ <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- Signing and packing alters checksums so fix them -->
+ <id>fixCheckSums</id>
+ <phase>package</phase>
+ <goals>
+ <goal>fixCheckSums</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>replace-unsigned-repository-by-signed-one</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <!-- prepare zip repo and repo for archiving -->
+ <move file="${project.build.directory}/repository" tofile="${project.build.directory}/repository-not-signed"/>
+ <move file="${project.build.directory}/checksumFix" tofile="${project.build.directory}/repository"/>
+ <move file="${project.build.directory}/${project.artifactId}.zip" tofile="${project.build.directory}/${project.artifactId}-not-signed.zip"/>
+ <zip destfile="${project.build.directory}/${project.artifactId}.zip" basedir="${project.build.directory}/repository"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven.eclipse.org</id>
+ <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</project>
+
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml
index 2b4953250..ade7e4a93 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>org.eclipse.emf.compare.diagram.ecoretools.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.class</include>
- </includes>
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.diagram.ecoretools.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.class</include>
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml
index ec95bb02d..65e878a9b 100644
--- a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml
index e8a3b3c22..73c402d83 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>org.eclipse.emf.compare.diagram.ide.ecoretools.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.class</include>
- </includes>
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.diagram.ide.ecoretools.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.class</include>
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml
index 01063468e..173ce794d 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml
index 6b1bcc047..a028fe842 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml
index 906af875c..3862766ae 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml
index 532e62dcb..35949ee2d 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>org.eclipse.emf.compare.diagram.papyrus.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.class</include>
- </includes>
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.diagram.papyrus.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.class</include>
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/org.eclipse.emf.compare.diagram/pom.xml b/plugins/org.eclipse.emf.compare.diagram/pom.xml
index 4bfa69afb..5623325d0 100644
--- a/plugins/org.eclipse.emf.compare.diagram/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.doc/pom.xml b/plugins/org.eclipse.emf.compare.doc/pom.xml
index b05e6d858..3c68f376e 100644
--- a/plugins/org.eclipse.emf.compare.doc/pom.xml
+++ b/plugins/org.eclipse.emf.compare.doc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.edit/pom.xml b/plugins/org.eclipse.emf.compare.edit/pom.xml
index b234b6b31..c0e02970d 100644
--- a/plugins/org.eclipse.emf.compare.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
index d33336951..3d6818e6d 100644
--- a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>org.eclipse.emf.compare.ide.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>org/eclipse/emf/compare/ide/tests/suite/AllTests.class</include>
- </includes>
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.ide.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/ide/tests/suite/AllTests.class</include>
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
index 81a1a8dbe..21e39feaa 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>org.eclipse.emf.compare.ide.ui.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.class</include>
- </includes>
- <useUIHarness>true</useUIHarness>
- <useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.ide.ui.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.class</include>
+ </includes>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
index 1e4ab6d0c..89d1796b2 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.ide.ui;singleton:=true
-Bundle-Version: 3.0.1.qualifier
+Bundle-Version: 3.0.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
index 5147ff6ce..b7e1b8e57 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
@@ -5,12 +5,12 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.ide.ui</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.0.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.ide/pom.xml b/plugins/org.eclipse.emf.compare.ide/pom.xml
index ef89980ba..49f525fbe 100644
--- a/plugins/org.eclipse.emf.compare.ide/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
index b3243d688..99eeadd23 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.rcp/pom.xml b/plugins/org.eclipse.emf.compare.rcp/pom.xml
index e34d0550e..b4c447206 100644
--- a/plugins/org.eclipse.emf.compare.rcp/pom.xml
+++ b/plugins/org.eclipse.emf.compare.rcp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.tests/pom.xml b/plugins/org.eclipse.emf.compare.tests/pom.xml
index 069b73608..7bafff963 100644
--- a/plugins/org.eclipse.emf.compare.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.tests/pom.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>org.eclipse.emf.compare.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src-gen</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>org/eclipse/emf/compare/tests/suite/AllTests.class</include>
- <!--
- <include>org/eclipse/emf/compare/tests/suite/AllPluginTests.class</include>
- -->
- </includes>
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src-gen</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/tests/suite/AllTests.class</include>
+ <!--
+ <include>org/eclipse/emf/compare/tests/suite/AllPluginTests.class</include>
+ -->
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
index 9ba57de0c..1b459b432 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
index c591670d5..99f854440 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml
index 4612a1de1..adc0de6f4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
index 096ef52f3..a460a93f6 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>emf.compare-parent</artifactId>
- <groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
- </parent>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>org.eclipse.emf.compare.uml2.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>org/eclipse/emf/compare/uml2/tests/suite/AllTests.class</include>
- </includes>
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.uml2.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/uml2/tests/suite/AllTests.class</include>
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2/pom.xml b/plugins/org.eclipse.emf.compare.uml2/pom.xml
index f5e8899d4..f94aa1de7 100644
--- a/plugins/org.eclipse.emf.compare.uml2/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
diff --git a/plugins/org.eclipse.emf.compare/pom.xml b/plugins/org.eclipse.emf.compare/pom.xml
index 1235d7261..e58ac15ed 100644
--- a/plugins/org.eclipse.emf.compare/pom.xml
+++ b/plugins/org.eclipse.emf.compare/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>

Back to the top