diff options
33 files changed, 141 insertions, 454 deletions
diff --git a/org.eclipse.emf.compare-parent/bundle-parent/pom.xml b/org.eclipse.emf.compare-parent/bundle-parent/pom.xml new file mode 100644 index 000000000..6d15f7cfd --- /dev/null +++ b/org.eclipse.emf.compare-parent/bundle-parent/pom.xml @@ -0,0 +1,24 @@ +<?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>3.1.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/org.eclipse.emf.compare-parent/feature-parent/pom.xml b/org.eclipse.emf.compare-parent/feature-parent/pom.xml new file mode 100644 index 000000000..8f4291815 --- /dev/null +++ b/org.eclipse.emf.compare-parent/feature-parent/pom.xml @@ -0,0 +1,45 @@ +<?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>3.1.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <executions> + <execution> + <!-- Don't attach (default) metadata before the source-feature execution.--> + <id>default-p2-metadata-default</id> + <configuration> + <attachP2Metadata>false</attachP2Metadata> + </configuration> + </execution> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml index f42a42e3b..978e521b8 100644 --- a/org.eclipse.emf.compare-parent/pom.xml +++ b/org.eclipse.emf.compare-parent/pom.xml @@ -333,7 +333,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> @@ -379,7 +378,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> @@ -424,7 +422,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> @@ -460,7 +457,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> @@ -496,7 +492,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> @@ -521,7 +516,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> @@ -546,7 +540,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> @@ -737,7 +730,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <configuration> - <includePackedArtifacts>true</includePackedArtifacts> <target> <artifact> <groupId>org.eclipse.emf.compare</groupId> diff --git a/packaging/org.eclipse.emf.compare-feature/pom.xml b/packaging/org.eclipse.emf.compare-feature/pom.xml index ee4aa451a..807c7834b 100644 --- a/packaging/org.eclipse.emf.compare-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare-feature/pom.xml @@ -3,42 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> 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 efe8656ff..95c9fec1b 100644 --- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml @@ -3,42 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare.diagram.ecoretools</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> 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 506a14c28..d63a773b1 100644 --- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml @@ -3,42 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare.diagram.gmf</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> 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 cf90dfe2d..b2880070f 100644 --- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml @@ -3,42 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare.diagram.papyrus</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> 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 bc07ffa26..ba4fdda6a 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml @@ -3,10 +3,10 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare.ide.ui</artifactId> @@ -24,27 +24,6 @@ </excludes> </configuration> </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> - </project> 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 dada9e921..04f9ec08b 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml @@ -3,42 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml b/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml index 6263a9e54..5aa2366a2 100644 --- a/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml @@ -3,42 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare.subversive</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml index 1facc37fb..43f7a69bd 100644 --- a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml @@ -3,42 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-feature-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/feature-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare.features</groupId> <artifactId>org.eclipse.emf.compare.uml2</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <executions> - <execution> - <!-- Don't attach (default) metadata before the source-feature execution.--> - <id>default-p2-metadata-default</id> - <configuration> - <attachP2Metadata>false</attachP2Metadata> - </configuration> - </execution> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </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 c44e9bff8..20c642768 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml @@ -24,7 +24,6 @@ </includes> <useUIHarness>false</useUIHarness> <useUIThread>false</useUIThread> - <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine> </configuration> </plugin> </plugins> diff --git a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml index bf3344b2d..9ea2c00a3 100644 --- a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.edit</artifactId> <version>2.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> 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 62973a13c..155150840 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 @@ -24,7 +24,6 @@ </includes> <useUIHarness>false</useUIHarness> <useUIThread>false</useUIThread> - <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine> </configuration> </plugin> </plugins> 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 f5bf4d579..57e929516 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 @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ide.ui.ecoretools</artifactId> <version>2.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> 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 14f9260bc..5216f2b05 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 @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ide.ui.papyrus</artifactId> <version>2.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> 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 296d1c593..60a3829a7 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ide.ui</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> 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 aec2b990e..0342b2a27 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml @@ -24,7 +24,6 @@ </includes> <useUIHarness>false</useUIHarness> <useUIThread>false</useUIThread> - <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine> </configuration> </plugin> </plugins> diff --git a/plugins/org.eclipse.emf.compare.diagram/pom.xml b/plugins/org.eclipse.emf.compare.diagram/pom.xml index f83c39646..dfa465a3c 100644 --- a/plugins/org.eclipse.emf.compare.diagram/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram</artifactId> <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare.edit/pom.xml b/plugins/org.eclipse.emf.compare.edit/pom.xml index b1e74cf40..47fa2bd28 100644 --- a/plugins/org.eclipse.emf.compare.edit/pom.xml +++ b/plugins/org.eclipse.emf.compare.edit/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.edit</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml index c8c86ef82..6058bcad9 100644 --- a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml @@ -24,7 +24,6 @@ </includes> <useUIHarness>false</useUIHarness> <useUIThread>false</useUIThread> - <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine> </configuration> </plugin> </plugins> diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml index 690dd2622..7fa6002f0 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml @@ -24,7 +24,6 @@ </includes> <useUIHarness>true</useUIHarness> <useUIThread>false</useUIThread> - <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine> </configuration> </plugin> </plugins> 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 27a23572c..1807a361c 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml @@ -24,7 +24,6 @@ </includes> <useUIHarness>true</useUIHarness> <useUIThread>false</useUIThread> - <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine> </configuration> </plugin> </plugins> diff --git a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml index 0f9a67db2..d238f555d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide.ui</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare.ide/pom.xml b/plugins/org.eclipse.emf.compare.ide/pom.xml index 45a546f4f..0c193b245 100644 --- a/plugins/org.eclipse.emf.compare.ide/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml index c002d64cd..e9c2eb9ed 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare.rcp/pom.xml b/plugins/org.eclipse.emf.compare.rcp/pom.xml index 12a247d7d..b9050ecdf 100644 --- a/plugins/org.eclipse.emf.compare.rcp/pom.xml +++ b/plugins/org.eclipse.emf.compare.rcp/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.rcp</artifactId> <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare.subversive/pom.xml b/plugins/org.eclipse.emf.compare.subversive/pom.xml index 7df8e02c7..5be92a439 100644 --- a/plugins/org.eclipse.emf.compare.subversive/pom.xml +++ b/plugins/org.eclipse.emf.compare.subversive/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.subversive</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </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 f2f853c32..79dfd7e25 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.edit</artifactId> <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> 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 35e605ab4..af0bb75e1 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.rcp.ui</artifactId> <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml index 5b6d06d69..36eca1e8f 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.rcp</artifactId> <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </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 1545c88a4..8400f0e0d 100644 --- a/plugins/org.eclipse.emf.compare.uml2/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2</artifactId> <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/plugins/org.eclipse.emf.compare/pom.xml b/plugins/org.eclipse.emf.compare/pom.xml index aad3c193d..bc831cb13 100644 --- a/plugins/org.eclipse.emf.compare/pom.xml +++ b/plugins/org.eclipse.emf.compare/pom.xml @@ -3,22 +3,13 @@ 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>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <artifactId>emf.compare-bundle-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/bundle-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> </project> |