Skip to content

Commit

Permalink
Changes in parent pom.xml required for running integration tests:
Browse files Browse the repository at this point in the history
* Added JavaSE-1.7 to the toolchains.
* Added tycho-surefire-plugin configuration.
* Added jacoco-maven-plugin configuration for generating code coverage
reports.
  • Loading branch information
serguei-actuate committed May 14, 2015
1 parent 1a91bc9 commit 2b23511
Showing 1 changed file with 0 additions and 263 deletions.
263 changes: 0 additions & 263 deletions pom.xml
@@ -1,263 +1,3 @@
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
<?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>
<groupId>org.eclipse.birt</groupId>
<artifactId>org.eclipse.birt-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>0.21.0</tycho.version>
<<<<<<< HEAD
<eclipse.repo.url>http://download.eclipse.org/eclipse/updates/4.5-I-builds/</eclipse.repo.url>
<emf.repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.10/</emf.repo.url>
<wtp.repo.url>http://download.eclipse.org/webtools/repository/luna/</wtp.repo.url>
<gef.repo.url>http://download.eclipse.org/tools/gef/updates/releases/</gef.repo.url>
<orbit.repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository/</orbit.repo.url>
=======
<eclipse.repo.url>http://download.eclipse.org/eclipse/updates/4.4/</eclipse.repo.url>
<emf.repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.10/</emf.repo.url>
<wtp.repo.url>http://download.eclipse.org/webtools/repository/luna/</wtp.repo.url>
<gef.repo.url>http://download.eclipse.org/tools/gef/updates/releases/</gef.repo.url>
<orbit.repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</orbit.repo.url>
>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
<!-- use local dtp git -->
<dtp.repo.url>http://download.eclipse.org/datatools/updates/1.12</dtp.repo.url>
</properties>

<repositories>
<!-- BIRT need Eclipse/EMF/GEF/DTP/ORBIT/WTP-->
<repository>
<<<<<<< HEAD
<id>eclipse</id>
<url>${eclipse.repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
=======
>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
<id>emf</id>
<url>${emf.repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>wtp</id>
<url>${wtp.repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>gef</id>
<url>${gef.repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<<<<<<< HEAD
=======
<id>eclipse</id>
<url>${eclipse.repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
<id>orbit</id>
<url>${orbit.repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>dtp</id>
<url>${dtp.repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
</plugins>
</reporting>

<modules>
<!-- build issue inside -->
<module>build</module>
<module>chart</module>
<module>common</module>
<module>core</module>
<module>data</module>
<!-- build issue inside -->
<module>docs</module>
<module>engine</module>
<!-- sdk/test features build issue, test features installation -->
<module>features</module>
<module>model</module>
<!-- build issue inside -->
<module>nl</module>
<!-- report.viewer.tests build issue, and how to run tests.xxx plugins -->
<module>testsuites</module>
<module>UI</module>
<module>viewer</module>
<module>xtab</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<excludes>
<plugin id="org.apache.axis"/>
<plugin id="org.apache.batik.pdf"/>
<plugin id="org.apache.commons.discovery"/>
<plugin id="org.apache.xerces"/>
<plugin id="org.apache.xml.resolver"/>
<plugin id="org.apache.xml.serializer"/>
<plugin id="javax.xml"/>
<pluign id="javax.xml.stream"/>
<plugin id="javax.xml.rpc"/>
<plugin id="javax.xml.soap"/>
<plugin id="javax.wsdl"/>

</excludes>
</configuration>
<executions>
<execution>
<id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
<executions>
<execution>
<id>attached-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<pomDependencies>consider</pomDependencies>
<environments>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<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>tycho-versions-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-1.6</id>
</jdk>
</toolchains>
</configuration>
</plugin>

<!-- build source plugins -->
<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>

<!-- build update site -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
</plugins>
</build>
</project>
<<<<<<< HEAD
=======
<?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">
Expand Down Expand Up @@ -555,6 +295,3 @@
</plugins>
</build>
</project>
>>>>>>> Changes in parent pom.xml required for running integration tests:
=======
>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"

0 comments on commit 2b23511

Please sign in to comment.