diff --git a/pom.xml b/pom.xml
index 7e6a959..1861d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,378 +1,378 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2013 IBM Corporation and others.
- 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
+  Copyright (c) 2013 IBM Corporation and others.
+  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
 
- Contributors:
-     David Williams - initial implementation
+  Contributors:
+  David Williams - initial implementation
 -->
 <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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.eclipse.platform</groupId>
-    <artifactId>eclipse.platform.releng.buildtools</artifactId>
-    <version>1.0.101-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <properties>
-        <tycho.version>0.25.0</tycho.version>
-        <tycho-extras.version>0.25.0</tycho-extras.version>
-        <cbi-plugins.version>1.1.3</cbi-plugins.version>
-        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
-        <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
-        <buildType>I</buildType>
-        <buildId>${buildType}${buildTimestamp}</buildId>
+  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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eclipse.platform</groupId>
+  <artifactId>eclipse.platform.releng.buildtools</artifactId>
+  <version>1.0.101-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <properties>
+    <tycho.version>0.25.0</tycho.version>
+    <tycho-extras.version>0.25.0</tycho-extras.version>
+    <cbi-plugins.version>1.1.3</cbi-plugins.version>
+    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+    <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
+    <buildType>I</buildType>
+    <buildId>${buildType}${buildTimestamp}</buildId>
 
-        <maven.test.skip>true</maven.test.skip>
-        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
-        <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
-        <buildType>I</buildType>
-        <buildId>${buildType}${buildTimestamp}</buildId>
-        <comparator.repo>http://download.eclipse.org/eclipse/updates/4.7-I-builds</comparator.repo>
-        <egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
-        <cbi-jdt-version>3.12.0.v20160516-2131</cbi-jdt-version>
-        <cbi-jdt-apt-version>1.2.100.v20160418-1457</cbi-jdt-apt-version>
-  
-        <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
-        <eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
-        <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.7-I-builds</eclipse-p2-repo.url>
+    <maven.test.skip>true</maven.test.skip>
+    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+    <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
+    <buildType>I</buildType>
+    <buildId>${buildType}${buildTimestamp}</buildId>
+    <comparator.repo>http://download.eclipse.org/eclipse/updates/4.7-I-builds</comparator.repo>
+    <egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
+    <cbi-jdt-version>3.12.0.v20160516-2131</cbi-jdt-version>
+    <cbi-jdt-apt-version>1.2.100.v20160418-1457</cbi-jdt-apt-version>
 
-        <!-- CBI provided common license feature. (bug 394793) -->
-        <license-repo.url>http://download.eclipse.org/cbi/updates/license/</license-repo.url>
+    <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
+    <eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
+
+    <!-- CBI provided common license feature. (bug 394793) -->
+    <license-repo.url>http://download.eclipse.org/cbi/updates/license/</license-repo.url>
 
 
-        <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.buildtools</tycho.scmUrl>
+    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.buildtools</tycho.scmUrl>
 
 
-    </properties>
-    <modules>
-        <module>features</module>
-        <module>bundles</module>
-        <module>repository</module>
-    </modules>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>cbi-jdt</id>
-            <url>${cbi-jdt-repo.url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>eclipse</id>
-            <url>${eclipse-repo.url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>cbi-snapshots</id>
-            <url>${cbi-snapshots-repo.url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-    <repositories>
-        <repository>
-            <id>eclipse-platform-repository</id>
-            <layout>p2</layout>
-            <url>http://download.eclipse.org/eclipse/updates/4.6milestones/</url>
-        </repository>
-        <repository>
-            <id>eclipse-derby-buildtools-repository</id>
-            <layout>p2</layout>
-            <url>http://build.eclipse.org/eclipse/buildtools/derbyCore-10.11.1.1-B/</url>
-        </repository>        
-         <repository>
-            <id>cbi-common-license</id>
-            <layout>p2</layout>
-            <url>${license-repo.url}</url>
-        </repository>
-    </repositories>
-    <build>
+  </properties>
+  <modules>
+    <module>features</module>
+    <module>bundles</module>
+    <module>repository</module>
+  </modules>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>cbi-jdt</id>
+      <url>${cbi-jdt-repo.url}</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>eclipse</id>
+      <url>${eclipse-repo.url}</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>cbi-snapshots</id>
+      <url>${cbi-snapshots-repo.url}</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+  <repositories>
+    <repository>
+      <id>eclipse-platform-repository</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/eclipse/updates/4.6milestones/</url>
+    </repository>
+    <repository>
+      <id>eclipse-derby-buildtools-repository</id>
+      <layout>p2</layout>
+      <url>http://build.eclipse.org/eclipse/buildtools/derbyCore-10.11.1.1-B/</url>
+    </repository>
+    <repository>
+      <id>cbi-common-license</id>
+      <layout>p2</layout>
+      <url>${license-repo.url}</url>
+    </repository>
+  </repositories>
+  <build>
+    <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-source-plugin</artifactId>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>plugin-source</id>
+            <goals>
+              <goal>plugin-source</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-source-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <configuration>
+            <distinctSourceRoots>true</distinctSourceRoots>
+            <strictSrcIncludes>false</strictSrcIncludes>
+            <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <configuration>
+            <baselineMode>warn</baselineMode>
+            <baselineReplace>all</baselineReplace>
+            <baselineRepositories>
+              <repository>
+                <url>${comparator.repo}</url>
+              </repository>
+            </baselineRepositories>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-compiler-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.eclipse.jdt</groupId>
+              <artifactId>org.eclipse.jdt.core</artifactId>
+              <version>${cbi-jdt-version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.jdt</groupId>
+              <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+              <version>${cbi-jdt-apt-version}</version>
+            </dependency>
+          </dependencies>
+          <configuration>
+            <compilerArgs>
+              <args>${code.ignoredWarnings}</args>
+              <args>-verbose</args>
+              <args>-inlineJSR</args>
+              <args>-enableJavadoc</args>
+              <args>-encoding</args>
+              <args>${project.build.sourceEncoding}</args>
+              <args>-proceedOnError</args>
+              <!-- Use this form, for Tycho 22 or less.
+                <args>-log</args>
+                <args>${project.build.directory}/@dot.xml</args>
+              -->
+            </compilerArgs>
+            <!-- Use this form for Tycho 23 or greater -->
+            <log>xml</log>
+            <logDirectory>${project.build.directory}/compilelogs</logDirectory>
+            <showWarnings>true</showWarnings>
+            <excludeResources>
+              <exclude>**/package.html</exclude>
+            </excludeResources>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-source-feature-plugin</artifactId>
+          <version>${tycho-extras.version}</version>
+          <configuration>
+            <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-packaging-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.eclipse.tycho.extras</groupId>
+              <artifactId>tycho-buildtimestamp-jgit</artifactId>
+              <version>${tycho-extras.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.tycho.extras</groupId>
+              <artifactId>tycho-sourceref-jgit</artifactId>
+              <version>${tycho-extras.version}</version>
+            </dependency>
+          </dependencies>
+          <configuration>
+            <strictBinIncludes>false</strictBinIncludes>
+            <format>'v'yyyyMMdd-HHmm</format>
+            <timestampProvider>jgit</timestampProvider>
+            <jgit.ignore>
+              pom.xml
+            </jgit.ignore>
+            <sourceReferences>
+              <generate>true</generate>
+            </sourceReferences>
+            <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
+            </archive>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <profiles>
+    <profile>
+      <id>eclipse-sign</id>
+      <build>
         <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-source-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>plugin-source</id>
-                        <goals>
-                            <goal>plugin-source</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho.version}</version>
+            <configuration>
+              <includePackedArtifacts>false</includePackedArtifacts>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200a-plugin</artifactId>
+            <version>${tycho-extras.version}</version>
+            <executions>
+              <execution>
+                <id>pack200-normalize</id>
+                <goals>
+                  <goal>normalize</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-jarsigner-plugin</artifactId>
+            <version>${cbi-plugins.version}</version>
+            <executions>
+              <execution>
+                <id>sign</id>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200b-plugin</artifactId>
+            <version>${tycho-extras.version}</version>
+            <executions>
+              <execution>
+                <id>pack200-pack</id>
+                <goals>
+                  <goal>pack</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <version>${tycho.version}</version>
+            <executions>
+              <execution>
+                <id>p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <defaultP2Metadata>false</defaultP2Metadata>
+            </configuration>
+          </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-source-plugin</artifactId>
-                    <version>${tycho.version}</version>
-                    <configuration>
-                        <distinctSourceRoots>true</distinctSourceRoots>
-                        <strictSrcIncludes>false</strictSrcIncludes>
-                        <archive>
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-p2-plugin</artifactId>
-                    <version>${tycho.version}</version>
-                    <configuration>
-                        <baselineMode>warn</baselineMode>
-                        <baselineReplace>all</baselineReplace>
-                        <baselineRepositories>
-                            <repository>
-                                <url>${comparator.repo}</url>
-                            </repository>
-                        </baselineRepositories>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-compiler-plugin</artifactId>
-                    <version>${tycho.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.eclipse.jdt</groupId>
-                            <artifactId>org.eclipse.jdt.core</artifactId>
-                            <version>${cbi-jdt-version}</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <failOnError>true</failOnError>
-                        <compilerArgument>-warn:-deprecation,raw,unchecked</compilerArgument>
-                        <compilerArguments>
-                            <verbose />
-                            <inlineJSR />
-                            <enableJavadoc />
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <proceedOnError />
-                            <log>${project.build.directory}/@dot.xml</log>
-                        </compilerArguments>
-                        <showWarnings>true</showWarnings>
-                        <excludeResources>
-                            <exclude>**/package.html</exclude>
-                        </excludeResources>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho.extras</groupId>
-                    <artifactId>tycho-source-feature-plugin</artifactId>
-                    <version>${tycho-extras.version}</version>
-                    <configuration>
-                        <archive>
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-packaging-plugin</artifactId>
-                    <version>${tycho.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.eclipse.tycho.extras</groupId>
-                            <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                            <version>${tycho-extras.version}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.eclipse.tycho.extras</groupId>
-                            <artifactId>tycho-sourceref-jgit</artifactId>
-                            <version>${tycho-extras.version}</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <strictBinIncludes>false</strictBinIncludes>
-                        <format>'v'yyyyMMdd-HHmm</format>
-                        <timestampProvider>jgit</timestampProvider>
-                        <jgit.ignore>
-                            pom.xml
-                        </jgit.ignore>
-                        <sourceReferences>
-                            <generate>true</generate>
-                        </sourceReferences>
-                        <archive>
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    <profiles>
-        <profile>
-            <id>build-individual-bundles</id>
-            <repositories>
-                <repository>
-                    <id>eclipse-p2-repo</id>
-                    <url>${eclipse-p2-repo.url}</url>
-                    <layout>p2</layout>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>eclipse-sign</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>target-platform-configuration</artifactId>
-                        <version>${tycho.version}</version>
-                        <configuration>
-                            <includePackedArtifacts>false</includePackedArtifacts>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>tycho-pack200a-plugin</artifactId>
-                        <version>${tycho-extras.version}</version>
-                        <executions>
-                            <execution>
-                                <id>pack200-normalize</id>
-                                <goals>
-                                    <goal>normalize</goal>
-                                </goals>
-                                <phase>verify</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.cbi.maven.plugins</groupId>
-                        <artifactId>eclipse-jarsigner-plugin</artifactId>
-                        <version>${cbi-plugins.version}</version>
-                        <executions>
-                            <execution>
-                                <id>sign</id>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <phase>verify</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>tycho-pack200b-plugin</artifactId>
-                        <version>${tycho-extras.version}</version>
-                        <executions>
-                            <execution>
-                                <id>pack200-pack</id>
-                                <goals>
-                                    <goal>pack</goal>
-                                </goals>
-                                <phase>verify</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-p2-plugin</artifactId>
-                        <version>${tycho.version}</version>
-                        <executions>
-                            <execution>
-                                <id>p2-metadata</id>
-                                <goals>
-                                    <goal>p2-metadata</goal>
-                                </goals>
-                                <phase>verify</phase>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <defaultP2Metadata>false</defaultP2Metadata>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>eclipse-pack</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>target-platform-configuration</artifactId>
-                        <version>${tycho.version}</version>
-                        <configuration>
-                            <includePackedArtifacts>true</includePackedArtifacts>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>tycho-pack200a-plugin</artifactId>
-                        <version>${tycho-extras.version}</version>
-                        <executions>
-                            <execution>
-                                <id>pack200-normalize</id>
-                                <goals>
-                                    <goal>normalize</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>tycho-pack200b-plugin</artifactId>
-                        <version>${tycho-extras.version}</version>
-                        <executions>
-                            <execution>
-                                <id>pack200-pack</id>
-                                <goals>
-                                    <goal>pack</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-p2-plugin</artifactId>
-                        <version>${tycho.version}</version>
-                        <executions>
-                            <execution>
-                                <id>p2-metadata</id>
-                                <goals>
-                                    <goal>p2-metadata</goal>
-                                </goals>
-                                <phase>package</phase>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <defaultP2Metadata>false</defaultP2Metadata>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+    <profile>
+      <id>eclipse-pack</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho.version}</version>
+            <configuration>
+              <includePackedArtifacts>true</includePackedArtifacts>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200a-plugin</artifactId>
+            <version>${tycho-extras.version}</version>
+            <executions>
+              <execution>
+                <id>pack200-normalize</id>
+                <goals>
+                  <goal>normalize</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200b-plugin</artifactId>
+            <version>${tycho-extras.version}</version>
+            <executions>
+              <execution>
+                <id>pack200-pack</id>
+                <goals>
+                  <goal>pack</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <version>${tycho.version}</version>
+            <executions>
+              <execution>
+                <id>p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <defaultP2Metadata>false</defaultP2Metadata>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file