diff options
| author | Cedric Brun | 2011-08-04 16:57:12 +0000 |
|---|---|---|
| committer | Cedric Brun | 2011-08-04 17:01:49 +0000 |
| commit | a2744097db6f6367b8a3dfc9d4dbab511478c457 (patch) | |
| tree | ffd11fabf2f4aad6dea01bf9eddb9f952885501b | |
| parent | 83b452e8d7ae52764a3364cdf6ac99736ea642f9 (diff) | |
| download | org.eclipse.emf.compare-a2744097db6f6367b8a3dfc9d4dbab511478c457.tar.gz org.eclipse.emf.compare-a2744097db6f6367b8a3dfc9d4dbab511478c457.tar.xz org.eclipse.emf.compare-a2744097db6f6367b8a3dfc9d4dbab511478c457.zip | |
353919: [Build] Providing a Tycho based build https://bugs.eclipse.org/bugs/show_bug.cgi?id=353919
The build is working, produces an update site and is launching the tests.
If you want to try, just type 'mvn clean package' to build the artifacts and 'mvn clean verify' to launch all the tests.
Remaining work items are:
- making the UML2 tests pass, right now we have 20 errors and 9 failures, I disabled the plugin in the main pom.xml
- adding signing
- enabling back the UML2 tests.
66 files changed, 1249 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 2db576b4a..d41112c2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ bin/ +target *~ *.rej *.bak diff --git a/packaging/org.eclipse.emf.compare-feature/pom.xml b/packaging/org.eclipse.emf.compare-feature/pom.xml new file mode 100644 index 000000000..42a783769 --- /dev/null +++ b/packaging/org.eclipse.emf.compare-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.all-feature/pom.xml b/packaging/org.eclipse.emf.compare.all-feature/pom.xml new file mode 100644 index 000000000..988434055 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.all-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.all</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.build-feature/pom.xml b/packaging/org.eclipse.emf.compare.build-feature/pom.xml new file mode 100644 index 000000000..339bb4120 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.build-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.build</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.diff.edit.nl1/pom.xml b/packaging/org.eclipse.emf.compare.diff.edit.nl1/pom.xml new file mode 100644 index 000000000..4d2ca2e7b --- /dev/null +++ b/packaging/org.eclipse.emf.compare.diff.edit.nl1/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.diff.edit.nl1</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.diff.nl1/pom.xml b/packaging/org.eclipse.emf.compare.diff.nl1/pom.xml new file mode 100644 index 000000000..3d070023b --- /dev/null +++ b/packaging/org.eclipse.emf.compare.diff.nl1/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.diff.nl1</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.doc-feature/pom.xml b/packaging/org.eclipse.emf.compare.doc-feature/pom.xml new file mode 100644 index 000000000..d7368edbb --- /dev/null +++ b/packaging/org.eclipse.emf.compare.doc-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.doc-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.examples-feature/pom.xml b/packaging/org.eclipse.emf.compare.examples-feature/pom.xml new file mode 100644 index 000000000..cf7ffd1d4 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.examples-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.examples-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.match.nl1/pom.xml b/packaging/org.eclipse.emf.compare.match.nl1/pom.xml new file mode 100644 index 000000000..97bec1a0f --- /dev/null +++ b/packaging/org.eclipse.emf.compare.match.nl1/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.match.nl1</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.mpatch-feature/pom.xml b/packaging/org.eclipse.emf.compare.mpatch-feature/pom.xml new file mode 100644 index 000000000..bb2eecda1 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.mpatch-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.nl1-feature/pom.xml b/packaging/org.eclipse.emf.compare.nl1-feature/pom.xml new file mode 100644 index 000000000..7640e0ba6 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.nl1-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.nl1-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.nl1/pom.xml b/packaging/org.eclipse.emf.compare.nl1/pom.xml new file mode 100644 index 000000000..bead2e223 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.nl1/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.nl1</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.sdk-feature/pom.xml b/packaging/org.eclipse.emf.compare.sdk-feature/pom.xml new file mode 100644 index 000000000..6d80a7a84 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.sdk-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.sdk-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.team.subversive-feature/feature.xml b/packaging/org.eclipse.emf.compare.team.subversive-feature/feature.xml index a415e3f08..6de3102e5 100644 --- a/packaging/org.eclipse.emf.compare.team.subversive-feature/feature.xml +++ b/packaging/org.eclipse.emf.compare.team.subversive-feature/feature.xml @@ -23,9 +23,6 @@ <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.emf.compare.team.subversive.source"
- version="0.0.0"/>
<requires>
<import plugin="org.eclipse.core.runtime"/>
diff --git a/packaging/org.eclipse.emf.compare.team.subversive-feature/pom.xml b/packaging/org.eclipse.emf.compare.team.subversive-feature/pom.xml new file mode 100644 index 000000000..f7f3bd9fd --- /dev/null +++ b/packaging/org.eclipse.emf.compare.team.subversive-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.team.subversive-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.tests-feature/pom.xml b/packaging/org.eclipse.emf.compare.tests-feature/pom.xml new file mode 100644 index 000000000..eec28b15e --- /dev/null +++ b/packaging/org.eclipse.emf.compare.tests-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.tests</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.ui.capabilities-feature/pom.xml b/packaging/org.eclipse.emf.compare.ui.capabilities-feature/pom.xml new file mode 100644 index 000000000..b8c95d0d2 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.ui.capabilities-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.ui.capabilities-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.ui.nl1/build.properties b/packaging/org.eclipse.emf.compare.ui.nl1/build.properties index 438c37d43..f16ee1e7f 100644 --- a/packaging/org.eclipse.emf.compare.ui.nl1/build.properties +++ b/packaging/org.eclipse.emf.compare.ui.nl1/build.properties @@ -5,7 +5,5 @@ bin.includes = META-INF/,\ bin/,\ plugin_fr.properties,\ src/org/eclipse/emf/compare/ui/emfcompareuimessages_fr.properties -src.includes = src/,\ - plugin_fr.properties,\ - META-INF/,\ +src.includes = plugin_fr.properties,\ bin/ diff --git a/packaging/org.eclipse.emf.compare.ui.nl1/pom.xml b/packaging/org.eclipse.emf.compare.ui.nl1/pom.xml new file mode 100644 index 000000000..117c24568 --- /dev/null +++ b/packaging/org.eclipse.emf.compare.ui.nl1/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.ui.nl1</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml new file mode 100644 index 000000000..1a6ae8b2e --- /dev/null +++ b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.uml2-feature</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/packaging/org.eclipse.emf.compare.update/.project b/packaging/org.eclipse.emf.compare.update/.project new file mode 100644 index 000000000..5ec18e98c --- /dev/null +++ b/packaging/org.eclipse.emf.compare.update/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.emf.compare.update</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.UpdateSiteBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.UpdateSiteNature</nature> + </natures> +</projectDescription> diff --git a/packaging/org.eclipse.emf.compare.update/category.xml b/packaging/org.eclipse.emf.compare.update/category.xml new file mode 100644 index 000000000..7cbbea10a --- /dev/null +++ b/packaging/org.eclipse.emf.compare.update/category.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <description url="http://www.obeo.fr"> + Viewpoint + </description> + <feature url="features/org.eclipse.emf.compare_1.2.0.qualifier.jar" id="org.eclipse.emf.compare" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <feature url="features/org.eclipse.emf.compare.doc_1.2.0.qualifier.jar" id="org.eclipse.emf.compare.doc" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <feature url="features/org.eclipse.emf.compare.examples_1.2.0.qualifier.jar" id="org.eclipse.emf.compare.examples" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <feature url="features/org.eclipse.emf.compare.mpatch_1.2.0.qualifier.jar" id="org.eclipse.emf.compare.mpatch" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <feature url="features/org.eclipse.emf.compare.nl1_1.2.0.qualifier.jar" id="org.eclipse.emf.compare.nl1" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <feature url="features/org.eclipse.emf.compare.sdk_1.2.0.qualifier.jar" id="org.eclipse.emf.compare.sdk" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <feature url="features/org.eclipse.emf.compare.team.subversive_1.2.0.qualifier.jar" id="org.eclipse.emf.compare.team.subversive" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <feature url="features/org.eclipse.emf.compare.ui.capabilities_1.2.0.qualifier.jar" id="org.eclipse.emf.compare.ui.capabilities" version="1.2.0.qualifier"> + <category name="EMF Compare"/> + </feature> + <category-def name="EMF Compare" label="EMF Compare"> + <description> + Model Comparison Support + </description> + </category-def> +</site> diff --git a/packaging/org.eclipse.emf.compare.update/index.html b/packaging/org.eclipse.emf.compare.update/index.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packaging/org.eclipse.emf.compare.update/index.html diff --git a/packaging/org.eclipse.emf.compare.update/pom.xml b/packaging/org.eclipse.emf.compare.update/pom.xml new file mode 100644 index 000000000..2f987d24a --- /dev/null +++ b/packaging/org.eclipse.emf.compare.update/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2011 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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + + <artifactId>org.eclipse.emf.compare.update</artifactId> + <packaging>eclipse-repository</packaging> + + <!-- see http://issues.sonatype.org/browse/TYCHO-313 --> + <version>1.2.0-SNAPSHOT</version> + + <build> + <plugins> + <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> + </plugins> + </build> + +</project> diff --git a/packaging/org.eclipse.emf.compare.update/site.xml b/packaging/org.eclipse.emf.compare.update/site.xml new file mode 100644 index 000000000..8c5965b2c --- /dev/null +++ b/packaging/org.eclipse.emf.compare.update/site.xml @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> +</site> diff --git a/plugins/org.eclipse.emf.compare.diff.edit/pom.xml b/plugins/org.eclipse.emf.compare.diff.edit/pom.xml new file mode 100644 index 000000000..edf862d92 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.diff.edit/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.diff.edit</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.diff/pom.xml b/plugins/org.eclipse.emf.compare.diff/pom.xml new file mode 100644 index 000000000..6d4d206a2 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.diff/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.diff</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.doc/pom.xml b/plugins/org.eclipse.emf.compare.doc/pom.xml new file mode 100644 index 000000000..ae15ec978 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.doc/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.doc</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.epatch.dsl.tests/pom.xml b/plugins/org.eclipse.emf.compare.epatch.dsl.tests/pom.xml new file mode 100644 index 000000000..4f686bae6 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.epatch.dsl.tests/pom.xml @@ -0,0 +1,14 @@ +<?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>plugins</artifactId> + <groupId>org.eclipse.emf.compare</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.epatch.dsl.tests</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.epatch.dsl/pom.xml b/plugins/org.eclipse.emf.compare.epatch.dsl/pom.xml new file mode 100644 index 000000000..a3ee43d8a --- /dev/null +++ b/plugins/org.eclipse.emf.compare.epatch.dsl/pom.xml @@ -0,0 +1,14 @@ +<?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>plugins</artifactId> + <groupId>org.eclipse.emf.compare</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.epatch.dsl</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.epatch.tests/pom.xml b/plugins/org.eclipse.emf.compare.epatch.tests/pom.xml new file mode 100644 index 000000000..c0993c1b4 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.epatch.tests/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.epatch.tests</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.epatch/build.properties b/plugins/org.eclipse.emf.compare.epatch/build.properties index 217206c86..9da8c5e47 100644 --- a/plugins/org.eclipse.emf.compare.epatch/build.properties +++ b/plugins/org.eclipse.emf.compare.epatch/build.properties @@ -18,7 +18,4 @@ jars.compile.order = . source.. = src/,\ src-gen/ output.. = bin/ -src.includes = plugin.xml,\ - plugin.properties,\ - META-INF/,\ - about.html +src.includes = about.html diff --git a/plugins/org.eclipse.emf.compare.epatch/pom.xml b/plugins/org.eclipse.emf.compare.epatch/pom.xml new file mode 100644 index 000000000..cd8aea330 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.epatch/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.epatch</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.examples.addressbook/pom.xml b/plugins/org.eclipse.emf.compare.examples.addressbook/pom.xml new file mode 100644 index 000000000..8935ccac0 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.examples.addressbook/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.examples.addressbook</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.examples.diff.extension/pom.xml b/plugins/org.eclipse.emf.compare.examples.diff.extension/pom.xml new file mode 100644 index 000000000..b58cc426a --- /dev/null +++ b/plugins/org.eclipse.emf.compare.examples.diff.extension/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.examples.diff.extension</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.examples.export.library/pom.xml b/plugins/org.eclipse.emf.compare.examples.export.library/pom.xml new file mode 100644 index 000000000..db4438946 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.examples.export.library/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.examples.export.library</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.examples.export.xslt/build.properties b/plugins/org.eclipse.emf.compare.examples.export.xslt/build.properties index 7d63dfe9d..da6865301 100644 --- a/plugins/org.eclipse.emf.compare.examples.export.xslt/build.properties +++ b/plugins/org.eclipse.emf.compare.examples.export.xslt/build.properties @@ -13,8 +13,7 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ about.html,\ - plugin.xml -src.includes = src/,\ plugin.xml,\ - about.html,\ - META-INF/ + icons/,\ + plugin.properties +src.includes = about.html diff --git a/plugins/org.eclipse.emf.compare.examples.export.xslt/pom.xml b/plugins/org.eclipse.emf.compare.examples.export.xslt/pom.xml new file mode 100644 index 000000000..8fa3b2699 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.examples.export.xslt/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.examples.export.xslt</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.examples/pom.xml b/plugins/org.eclipse.emf.compare.examples/pom.xml new file mode 100644 index 000000000..802b19a6c --- /dev/null +++ b/plugins/org.eclipse.emf.compare.examples/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.examples</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.match/pom.xml b/plugins/org.eclipse.emf.compare.match/pom.xml new file mode 100644 index 000000000..e08186a50 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.match/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.match</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.apply.generic/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.apply.generic/pom.xml new file mode 100644 index 000000000..01fc0ff82 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.apply.generic/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.apply.generic</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.apply/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.apply/pom.xml new file mode 100644 index 000000000..b90eb7b1d --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.apply/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.apply</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.binding/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.binding/pom.xml new file mode 100644 index 000000000..197a4b0b1 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.binding/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.binding</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.common/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.common/pom.xml new file mode 100644 index 000000000..89d427483 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.common/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.common</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.doc/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.doc/pom.xml new file mode 100644 index 000000000..99a878ecf --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.doc/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.doc</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.edit/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.edit/pom.xml new file mode 100644 index 000000000..18ea124d1 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.edit/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.edit</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.editor/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.editor/pom.xml new file mode 100644 index 000000000..4f0f10147 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.editor/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.editor</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/pom.xml new file mode 100644 index 000000000..4ac617659 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/pom.xml new file mode 100644 index 000000000..f544c555f --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/pom.xml new file mode 100644 index 000000000..72c191a35 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.emfdiff2mpatch</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.example/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.example/pom.xml new file mode 100644 index 000000000..fc9d56e75 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.example/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.example</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.test.eachonce/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.test.eachonce/pom.xml new file mode 100644 index 000000000..42cf58396 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.test.eachonce/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.test.eachonce</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.test/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.test/pom.xml new file mode 100644 index 000000000..449901388 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.test/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.test</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch.transform/pom.xml b/plugins/org.eclipse.emf.compare.mpatch.transform/pom.xml new file mode 100644 index 000000000..65d39effd --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch.transform/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch.transform</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.mpatch/pom.xml b/plugins/org.eclipse.emf.compare.mpatch/pom.xml new file mode 100644 index 000000000..ac3708170 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.mpatch/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.mpatch</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.team.subversive/pom.xml b/plugins/org.eclipse.emf.compare.team.subversive/pom.xml new file mode 100644 index 000000000..8f1ed734d --- /dev/null +++ b/plugins/org.eclipse.emf.compare.team.subversive/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.team.subversive</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.tests/build.properties b/plugins/org.eclipse.emf.compare.tests/build.properties index 500d0da78..61d14baa5 100644 --- a/plugins/org.eclipse.emf.compare.tests/build.properties +++ b/plugins/org.eclipse.emf.compare.tests/build.properties @@ -8,7 +8,8 @@ # Contributors: # Obeo - initial API and implementation ############################################################################### -source.. = src/ +source.. = src/,\ + src-gen/ output.. = bin/ bin.includes = plugin.xml,\ plugin.properties,\ diff --git a/plugins/org.eclipse.emf.compare.tests/pom.xml b/plugins/org.eclipse.emf.compare.tests/pom.xml new file mode 100644 index 000000000..9e78f0478 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.tests/pom.xml @@ -0,0 +1,49 @@ +<?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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.tests</artifactId> + <version>1.2.0-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> + </includes> + <useUIHarness>false</useUIHarness> + <useUIThread>false</useUIThread> + <argLine>-Xmx1024m</argLine> + <argLine>-XX:MaxPermSize=256m</argLine> + <testFailureIgnore>true</testFailureIgnore> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/plugins/org.eclipse.emf.compare.ui.capabilities/pom.xml b/plugins/org.eclipse.emf.compare.ui.capabilities/pom.xml new file mode 100644 index 000000000..225bea2b2 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.ui.capabilities/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.ui.capabilities</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.ui/pom.xml b/plugins/org.eclipse.emf.compare.ui/pom.xml new file mode 100644 index 000000000..02802c1c7 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.ui/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.ui</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml new file mode 100644 index 000000000..5df648270 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../../</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.uml2.edit</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml new file mode 100644 index 000000000..8ed40980b --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.uml2.tests</artifactId> + <version>1.2.0</version> + <packaging>eclipse-test-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare.uml2/pom.xml b/plugins/org.eclipse.emf.compare.uml2/pom.xml new file mode 100644 index 000000000..be7b37228 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.uml2</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare/pom.xml b/plugins/org.eclipse.emf.compare/pom.xml new file mode 100644 index 000000000..be90df3a9 --- /dev/null +++ b/plugins/org.eclipse.emf.compare/pom.xml @@ -0,0 +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>1.2.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/org.eclipse.emf.compare/target_platforms/indigo-sdk.target b/plugins/org.eclipse.emf.compare/target_platforms/indigo-sdk.target new file mode 100644 index 000000000..b82327c52 --- /dev/null +++ b/plugins/org.eclipse.emf.compare/target_platforms/indigo-sdk.target @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.6"?> + +<target name="EMF Compare based on Indigo SDK" sequenceNumber="25"> +<locations> +<location includeAllPlatforms="false" includeMode="planner" includeSource="false" type="InstallableUnit"> +<unit id="org.eclipse.platform.sdk" version="3.7.0.I20110613-1736"/> +<repository location="http://download.eclipse.org/eclipse/updates/3.7"/> +</location> +<location includeAllPlatforms="false" includeMode="planner" includeSource="false" type="InstallableUnit"> +<unit id="com.google.collect" version="1.0.0.v201003051000"/> +<unit id="org.junit" version="4.8.1.v4_8_1_v20100427-1100"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/updateSite"/> +</location> +<location includeAllPlatforms="false" includeMode="planner" includeSource="false" type="InstallableUnit"> +<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20110602-1700"/> +<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.0.v20110606-0949"/> +<unit id="org.eclipse.ocl.all.sdk.feature.group" version="3.1.0.v20110606-1427"/> +<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.5.0.v20110502-1600-67O-95GFz03DQEiNLXRMK_NPj507"/> +<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.5.0.v20110607-1200-67N09E9QnChoWswz-3wf_rz0kQ8Y"/> +<unit id="org.eclipse.uml2.sdk.feature.group" version="3.2.0.v201105231350"/> +<repository location="http://download.eclipse.org/releases/indigo"/> +</location> +</locations> +</target> diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..9de947ee5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,278 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (C) 2011, Obeo + + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html +--> + +<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> + + <prerequisites> + <maven>3.0</maven> + </prerequisites> + + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>emf.compare-parent</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <licenses> + <license> + <name>Eclipse Public License v1.0</name> + <comments> + All rights reserved. + + This program and the accompanying materials are made + available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.htm + </comments> + </license> + </licenses> + + <properties> + <tycho-version>0.12.0</tycho-version> + </properties> + + + <modules> + <module>plugins/org.eclipse.emf.compare.mpatch.binding</module> + <module>plugins/org.eclipse.emf.compare.mpatch.example</module> + <module>plugins/org.eclipse.emf.compare.examples.export.library</module> + <module>plugins/org.eclipse.emf.compare.mpatch.doc</module> + <module>plugins/org.eclipse.emf.compare.uml2.edit</module> + <module>plugins/org.eclipse.emf.compare.match</module> + <module>plugins/org.eclipse.emf.compare.tests</module> + <module>plugins/org.eclipse.emf.compare.uml2</module> + <module>plugins/org.eclipse.emf.compare.examples.addressbook</module> + <module>plugins/org.eclipse.emf.compare.epatch</module> + <module>plugins/org.eclipse.emf.compare.ui</module> + <module>plugins/org.eclipse.emf.compare.mpatch.transform</module> + <module>plugins/org.eclipse.emf.compare</module> + <module>plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic</module> + <module>plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch</module> + <module>plugins/org.eclipse.emf.compare.epatch.tests</module> + <module>plugins/org.eclipse.emf.compare.mpatch.edit</module> +<!-- <module>plugins/org.eclipse.emf.compare.uml2.tests</module> --> + <module>plugins/org.eclipse.emf.compare.mpatch.apply</module> + <module>plugins/org.eclipse.emf.compare.mpatch.apply.generic</module> + <module>plugins/org.eclipse.emf.compare.mpatch.editor</module> + + <module>plugins/org.eclipse.emf.compare.diff</module> + <module>plugins/org.eclipse.emf.compare.diff.edit</module> + <module>plugins/org.eclipse.emf.compare.mpatch.common</module> + <module>plugins/org.eclipse.emf.compare.team.subversive</module> + <module>plugins/org.eclipse.emf.compare.mpatch.test</module> + + <module>plugins/org.eclipse.emf.compare.examples</module> + <module>plugins/org.eclipse.emf.compare.doc</module> + <module>plugins/org.eclipse.emf.compare.mpatch</module> + <module>plugins/org.eclipse.emf.compare.examples.diff.extension</module> + <module>plugins/org.eclipse.emf.compare.examples.export.xslt</module> + + <module>plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit</module> + + <module>plugins/org.eclipse.emf.compare.mpatch.test.eachonce</module> + <module>plugins/org.eclipse.emf.compare.ui.capabilities</module> + + <module>packaging/org.eclipse.emf.compare-feature</module> + + + <module>packaging/org.eclipse.emf.compare.diff.edit.nl1</module> + <module>packaging/org.eclipse.emf.compare.diff.nl1</module> + <module>packaging/org.eclipse.emf.compare.doc-feature</module> + <module>packaging/org.eclipse.emf.compare.examples-feature</module> + + <module>packaging/org.eclipse.emf.compare.match.nl1</module> + <module>packaging/org.eclipse.emf.compare.mpatch-feature</module> + <module>packaging/org.eclipse.emf.compare.nl1</module> + <module>packaging/org.eclipse.emf.compare.nl1-feature</module> + <module>packaging/org.eclipse.emf.compare.sdk-feature</module> + <module>packaging/org.eclipse.emf.compare.team.subversive-feature</module> + + <module>packaging/org.eclipse.emf.compare.ui.capabilities-feature</module> + <module>packaging/org.eclipse.emf.compare.ui.nl1</module> + <module>packaging/org.eclipse.emf.compare.uml2-feature</module> + + <module>packaging/org.eclipse.emf.compare.update</module> + + </modules> + + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <resolver>p2</resolver> + <ignoreTychoRepositories>true</ignoreTychoRepositories> + <target> + <artifact> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare</artifactId> + <version>1.2.0-SNAPSHOT</version> + <classifier>target_platforms/indigo-sdk</classifier> + </artifact> + </target> + <environments> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <!-- enable source bundle generation --> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>plugin-source</id> + <goals> + <goal>plugin-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.1</version> + <configuration> + <encoding>ISO-8859-1</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <findbugsXmlOutput>true</findbugsXmlOutput> + <failOnError>false</failOnError> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.5</version> + <configuration> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + <format>xml</format> + <failOnViolation>false</failOnViolation> + </configuration> + <executions> + <execution> + <goals> + <goal>cpd-check</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <id>checkstyle</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>check my sources</id> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>verify</phase> + <configuration> + <failOnErrors>false</failOnErrors> + <consoleOutput>true</consoleOutput> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>coverage</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>org.eclemma.runtime.equinox</module> + </modules> + </profile> + <profile> + <id>static-checks</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> |