refinement: backing out change to common parent pom due to unexpected issues. damn maven.
diff --git a/org.eclipse.ote.mavenbuild/pom.xml b/org.eclipse.ote.mavenbuild/pom.xml index f63d87a..5fc0e1c 100644 --- a/org.eclipse.ote.mavenbuild/pom.xml +++ b/org.eclipse.ote.mavenbuild/pom.xml
@@ -1,328 +1,323 @@ <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>org.eclipse.ote</groupId> - <artifactId>org.eclipse.ote.mavenbuild</artifactId> - <packaging>pom</packaging> - <name>Eclipse OTE Maven Repos Parent</name> - <version>0.11.0-SNAPSHOT</version> + <groupId>org.eclipse.ote</groupId> + <artifactId>org.eclipse.ote.mavenbuild</artifactId> + <packaging>pom</packaging> + <name>Eclipse OTE Maven Repos Parent</name> + <version>0.11.0-SNAPSHOT</version> - <properties> - <build-alias>-DEV</build-alias> - <tycho-version>0.17.0</tycho-version> - <tychoExtrasVersion>0.17.0</tychoExtrasVersion> - <platform-version-name>juno</platform-version-name> - <orbit-version>R20120119162704</orbit-version> - <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site> - <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> - <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site> - <nebula-site>http://download.eclipse.org/technology/nebula/snapshot</nebula-site> - </properties> + <properties> + <build-alias>-DEV</build-alias> + <tycho-version>0.17.0</tycho-version> + <tychoExtrasVersion>0.17.0</tychoExtrasVersion> + <platform-version-name>juno</platform-version-name> + <orbit-version>R20120119162704</orbit-version> + <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site> + <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> + <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site> + <nebula-site>http://download.eclipse.org/technology/nebula/snapshot</nebula-site> + </properties> - <repositories> - <repository> - <id>eclipse-site</id> - <layout>p2</layout> - <url>${eclipse-site}</url> - </repository> - <repository> - <id>orbit-site</id> - <layout>p2</layout> - <url>${orbit-site}</url> - </repository> - <repository> - <id>nebula-site</id> - <layout>p2</layout> - <url>${nebula-site}</url> - </repository> - <repository> - <id>osee</id> - <layout>p2</layout> - <url>${osee-site}</url> - </repository> - </repositories> + <repositories> + <repository> + <id>eclipse-site</id> + <layout>p2</layout> + <url>${eclipse-site}</url> + </repository> + <repository> + <id>orbit-site</id> + <layout>p2</layout> + <url>${orbit-site}</url> + </repository> + <repository> + <id>nebula-site</id> + <layout>p2</layout> + <url>${nebula-site}</url> + </repository> + <repository> + <id>osee</id> + <layout>p2</layout> + <url>${osee-site}</url> + </repository> + </repositories> - <profiles> - <profile> - <id>sonar</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <sonar.jdbc.url></sonar.jdbc.url> - <sonar.jdbc.driverClassName>org.postgresql.Driver</sonar.jdbc.driverClassName> - <sonar.jdbc.username>sonar</sonar.jdbc.username> - <sonar.jdbc.password>sonar</sonar.jdbc.password> - <!-- SERVER ON A REMOTE HOST --> - <sonar.host.url></sonar.host.url> - </properties> - </profile> + <profiles> + <profile> + <id>sonar</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <sonar.jdbc.url></sonar.jdbc.url> + <sonar.jdbc.driverClassName>org.postgresql.Driver</sonar.jdbc.driverClassName> + <sonar.jdbc.username>sonar</sonar.jdbc.username> + <sonar.jdbc.password>sonar</sonar.jdbc.password> + <!-- SERVER ON A REMOTE HOST --> + <sonar.host.url></sonar.host.url> + </properties> + </profile> - <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>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>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> - - <profile> - <id>auto-source-feature</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tychoExtrasVersion}</version> - <executions> - <execution> - <id>source-feature</id> - <phase>package</phase> - <goals> - <goal>source-feature</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </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> + <build> + <sourceDirectory>src</sourceDirectory> - <build> - <sourceDirectory>src</sourceDirectory> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> - <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>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <format>'v'yyyyMMddHHmm'${build-alias}'</format> + <archiveSite>true</archiveSite> + <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</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + <!-- + --> + </environments> + </configuration> + </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <format>'v'yyyyMMddHHmm'${build-alias}'</format> - <archiveSite>true</archiveSite> - <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</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - </environments> - </configuration> - </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <resolver>p2</resolver> + <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</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + <!-- + --> + </environments> + </configuration> + </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <resolver>p2</resolver> - <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</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - </environments> - </configuration> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>2.0-beta-2</version> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>2.0-beta-2</version> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attached-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <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> + <executions> + <execution> + <id>attached-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-compiler-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> + </plugins> - <!-- 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> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - </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.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-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-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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> - </build> + <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> </project>