diff options
author | Mikaël Barbero | 2014-08-07 15:51:48 +0000 |
---|---|---|
committer | Mikaël Barbero | 2014-08-07 15:51:48 +0000 |
commit | 97ee9edf7af26dc58b4f9597f88e3174a1b31904 (patch) | |
tree | ff077ed5a3cc8739e237b9cf53bc209921526e06 | |
parent | 50b4df2e6912c61be754c732419c779455956fbd (diff) | |
download | org.eclipse.emf.compare-97ee9edf7af26dc58b4f9597f88e3174a1b31904.tar.gz org.eclipse.emf.compare-97ee9edf7af26dc58b4f9597f88e3174a1b31904.tar.xz org.eclipse.emf.compare-97ee9edf7af26dc58b4f9597f88e3174a1b31904.zip |
Create a parent pom for test (decl Jacoco)
Change-Id: If26d5d7656c0222d06b2c71ed724862153848678
13 files changed, 83 insertions, 55 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml index 32df99f40..45224a7b5 100644 --- a/org.eclipse.emf.compare-parent/pom.xml +++ b/org.eclipse.emf.compare-parent/pom.xml @@ -663,28 +663,6 @@ <build> <plugins> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <configuration> - <destFile>${sonar.jacoco.reportPath}</destFile> - </configuration> - <executions> - <execution> - <id>jacoco-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>jacoco-report</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <executions> diff --git a/org.eclipse.emf.compare-parent/test-parent/pom.xml b/org.eclipse.emf.compare-parent/test-parent/pom.xml new file mode 100644 index 000000000..f61b2947f --- /dev/null +++ b/org.eclipse.emf.compare-parent/test-parent/pom.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>emf.compare-parent</artifactId> + <groupId>org.eclipse.emf.compare</groupId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>emf.compare-test-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <profiles> + <profile> + <id>quality</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <configuration> + <destFile>${sonar.jacoco.reportPath}</destFile> + </configuration> + <executions> + <execution> + <id>jacoco-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>jacoco-report</id> + <phase>verify</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml index 2abdeb305..1187dff7f 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ecoretools.tests</artifactId> 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 ffc13b8b8..eef691681 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 @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>emf.compare-parent</artifactId> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ide.ecoretools.tests</artifactId> 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 e03e78e3a..dc0157de9 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.papyrus.tests</artifactId> diff --git a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml index 6ce2f1e48..16f4a066f 100644 --- a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide.tests</artifactId> 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 7fa6002f0..36f910c1d 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 @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>emf.compare-parent</artifactId> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide.ui.tests.git</artifactId> 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 1807a361c..dee07ba56 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide.ui.tests</artifactId> diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml index 99a970733..8355eadd5 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.rcp.ui.tests</artifactId> diff --git a/plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml b/plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml index 2fb59c49b..01378771e 100644 --- a/plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml +++ b/plugins/org.eclipse.emf.compare.tests.fuzzy/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.tests.fuzzy</artifactId> diff --git a/plugins/org.eclipse.emf.compare.tests/pom.xml b/plugins/org.eclipse.emf.compare.tests/pom.xml index 4abf78f6b..ec28d1602 100644 --- a/plugins/org.eclipse.emf.compare.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.tests</artifactId> diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml index 3cdbb53c4..f69a86a4f 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.rcp.ui.tests</artifactId> diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml index 25a0bc88c..d2c9ddb6a 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.tests/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> + <artifactId>emf.compare-test-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.tests</artifactId> |