Fix exc. 5 starting point

jsievers · Oct 16, 2012 · 5ffe549 · 5ffe549
1 parent 1647863
commit 5ffe549
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 101 deletions.
diff --git a/exercises/Exercise_05_Add_Product/tychodemo.bundle.tests/META-INF/MANIFEST.MF b/exercises/Exercise_05_Add_Product/tychodemo.bundle.tests/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: tychodemo.bundle.tests
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: tychodemo.bundle;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit
+Require-Bundle: org.junit;bundle-version="4.0.0"
diff --git a/exercises/Exercise_05_Add_Product/tychodemo.bundle.tests/pom.xml b/exercises/Exercise_05_Add_Product/tychodemo.bundle.tests/pom.xml
@@ -1,15 +1,11 @@
-<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>
-
-	<parent>
-		<groupId>tychodemo</groupId>
-		<artifactId>tychodemo.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../tychodemo.parent</relativePath>
-	</parent>
-
-	<artifactId>tychodemo.bundle.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
-
+<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>
+  <artifactId>tychodemo.bundle.tests</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+  <parent>
+  	<groupId>tychodemo</groupId>
+  	<artifactId>tychodemo.parent</artifactId>
+  	<version>1.0.0-SNAPSHOT</version>
+  	<relativePath>../tychodemo.parent</relativePath>
+  </parent>
 </project>
diff --git a/exercises/Exercise_05_Add_Product/tychodemo.bundle/Application.e4xmi b/exercises/Exercise_05_Add_Product/tychodemo.bundle/Application.e4xmi
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_XS7TUHHYEeGdaqKGFl0Tiw" elementId="org.eclipse.e4.ide.application" bindingContexts="_XS7TUXHYEeGdaqKGFl0Tiw">
-  <children xsi:type="basic:TrimmedWindow" xmi:id="_XS76Z3HYEeGdaqKGFl0Tiw" label="tychodemo.bundle" width="500" height="400">
-    <children xsi:type="advanced:PerspectiveStack" xmi:id="_XS76b3HYEeGdaqKGFl0Tiw">
-      <children xsi:type="advanced:Perspective" xmi:id="_XS76cHHYEeGdaqKGFl0Tiw">
-        <children xsi:type="basic:PartSashContainer" xmi:id="_XS76cXHYEeGdaqKGFl0Tiw">
-          <children xsi:type="basic:PartStack" xmi:id="_XS8hcHHYEeGdaqKGFl0Tiw"/>
+<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_I8ZGsBecEeKuGYX8YauIGQ" elementId="org.eclipse.e4.ide.application" bindingContexts="_I8ZGsRecEeKuGYX8YauIGQ">
+  <children xsi:type="basic:TrimmedWindow" xmi:id="_I8ZGxxecEeKuGYX8YauIGQ" label="tychodemo.bundle" width="500" height="400">
+    <children xsi:type="advanced:PerspectiveStack" xmi:id="_I8ZtxRecEeKuGYX8YauIGQ">
+      <children xsi:type="advanced:Perspective" xmi:id="_I8ZtxhecEeKuGYX8YauIGQ">
+        <children xsi:type="basic:PartSashContainer" xmi:id="_I8ZtxxecEeKuGYX8YauIGQ">
+          <children xsi:type="basic:PartStack" xmi:id="_I8ZtyBecEeKuGYX8YauIGQ"/>
         </children>
       </children>
     </children>
-    <mainMenu xmi:id="_XS76aHHYEeGdaqKGFl0Tiw" elementId="menu:org.eclipse.ui.main.menu">
-      <children xsi:type="menu:Menu" xmi:id="_XS76aXHYEeGdaqKGFl0Tiw" label="File">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_XS76anHYEeGdaqKGFl0Tiw" label="Open" iconURI="platform:/plugin/tychodemo.bundle/icons/sample.gif" command="_XS7TXnHYEeGdaqKGFl0Tiw"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_XS76a3HYEeGdaqKGFl0Tiw" label="Save" iconURI="platform:/plugin/tychodemo.bundle/icons/save_edit.gif" command="_XS76YXHYEeGdaqKGFl0Tiw"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_XS76bHHYEeGdaqKGFl0Tiw" label="Quit" command="_XS7TWnHYEeGdaqKGFl0Tiw"/>
+    <mainMenu xmi:id="_I8ZGyBecEeKuGYX8YauIGQ" elementId="menu:org.eclipse.ui.main.menu">
+      <children xsi:type="menu:Menu" xmi:id="_I8ZGyRecEeKuGYX8YauIGQ" label="File">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_I8ZtwBecEeKuGYX8YauIGQ" label="Open" iconURI="platform:/plugin/tychodemo.bundle/icons/sample.gif" command="_I8ZGvhecEeKuGYX8YauIGQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_I8ZtwRecEeKuGYX8YauIGQ" label="Save" iconURI="platform:/plugin/tychodemo.bundle/icons/save_edit.gif" command="_I8ZGwRecEeKuGYX8YauIGQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_I8ZtwhecEeKuGYX8YauIGQ" label="Quit" command="_I8ZGuhecEeKuGYX8YauIGQ"/>
       </children>
-      <children xsi:type="menu:Menu" xmi:id="_XS76bXHYEeGdaqKGFl0Tiw" label="Help">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_XS76bnHYEeGdaqKGFl0Tiw" label="About" command="_XS76ZHHYEeGdaqKGFl0Tiw"/>
+      <children xsi:type="menu:Menu" xmi:id="_I8ZtwxecEeKuGYX8YauIGQ" label="Help">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_I8ZtxBecEeKuGYX8YauIGQ" label="About" command="_I8ZGxBecEeKuGYX8YauIGQ"/>
       </children>
     </mainMenu>
-    <trimBars xmi:id="_XS8hcXHYEeGdaqKGFl0Tiw">
-      <children xsi:type="menu:ToolBar" xmi:id="_XS8hcnHYEeGdaqKGFl0Tiw" elementId="toolbar:org.eclipse.ui.main.toolbar">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_XS8hc3HYEeGdaqKGFl0Tiw" iconURI="platform:/plugin/tychodemo.bundle/icons/sample.gif" command="_XS7TXnHYEeGdaqKGFl0Tiw"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_XS8hdHHYEeGdaqKGFl0Tiw" iconURI="platform:/plugin/tychodemo.bundle/icons/save_edit.gif" command="_XS76YXHYEeGdaqKGFl0Tiw"/>
+    <trimBars xmi:id="_I8ZtyRecEeKuGYX8YauIGQ">
+      <children xsi:type="menu:ToolBar" xmi:id="_I8ZtyhecEeKuGYX8YauIGQ" elementId="toolbar:org.eclipse.ui.main.toolbar">
+        <children xsi:type="menu:HandledToolItem" xmi:id="_I8ZtyxecEeKuGYX8YauIGQ" iconURI="platform:/plugin/tychodemo.bundle/icons/sample.gif" command="_I8ZGvhecEeKuGYX8YauIGQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_I8ZtzBecEeKuGYX8YauIGQ" iconURI="platform:/plugin/tychodemo.bundle/icons/save_edit.gif" command="_I8ZGwRecEeKuGYX8YauIGQ"/>
       </children>
     </trimBars>
   </children>
-  <handlers xmi:id="_XS7TW3HYEeGdaqKGFl0Tiw" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.QuitHandler" command="_XS7TWnHYEeGdaqKGFl0Tiw"/>
-  <handlers xmi:id="_XS7TX3HYEeGdaqKGFl0Tiw" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.OpenHandler" command="_XS7TXnHYEeGdaqKGFl0Tiw"/>
-  <handlers xmi:id="_XS76YnHYEeGdaqKGFl0Tiw" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.SaveHandler" command="_XS76YXHYEeGdaqKGFl0Tiw"/>
-  <handlers xmi:id="_XS76ZXHYEeGdaqKGFl0Tiw" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.AboutHandler" command="_XS76ZHHYEeGdaqKGFl0Tiw"/>
-  <bindingTables xmi:id="_XS7TXHHYEeGdaqKGFl0Tiw" bindingContext="_XS7TUXHYEeGdaqKGFl0Tiw">
-    <bindings xmi:id="_XS7TXXHYEeGdaqKGFl0Tiw" keySequence="Ctrl+Q" command="_XS7TWnHYEeGdaqKGFl0Tiw"/>
-    <bindings xmi:id="_XS76YHHYEeGdaqKGFl0Tiw" keySequence="Ctrl+O" command="_XS7TXnHYEeGdaqKGFl0Tiw"/>
-    <bindings xmi:id="_XS76Y3HYEeGdaqKGFl0Tiw" keySequence="Ctrl+S" command="_XS76YXHYEeGdaqKGFl0Tiw"/>
-    <bindings xmi:id="_XS76ZnHYEeGdaqKGFl0Tiw" keySequence="Ctrl+A" command="_XS76ZHHYEeGdaqKGFl0Tiw"/>
+  <handlers xmi:id="_I8ZGuxecEeKuGYX8YauIGQ" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.QuitHandler" command="_I8ZGuhecEeKuGYX8YauIGQ"/>
+  <handlers xmi:id="_I8ZGvxecEeKuGYX8YauIGQ" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.OpenHandler" command="_I8ZGvhecEeKuGYX8YauIGQ"/>
+  <handlers xmi:id="_I8ZGwhecEeKuGYX8YauIGQ" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.SaveHandler" command="_I8ZGwRecEeKuGYX8YauIGQ"/>
+  <handlers xmi:id="_I8ZGxRecEeKuGYX8YauIGQ" contributionURI="bundleclass://tychodemo.bundle/tychodemo.bundle.handlers.AboutHandler" command="_I8ZGxBecEeKuGYX8YauIGQ"/>
+  <bindingTables xmi:id="_I8ZGvBecEeKuGYX8YauIGQ" bindingContext="_I8ZGsRecEeKuGYX8YauIGQ">
+    <bindings xmi:id="_I8ZGvRecEeKuGYX8YauIGQ" keySequence="M1+Q" command="_I8ZGuhecEeKuGYX8YauIGQ"/>
+    <bindings xmi:id="_I8ZGwBecEeKuGYX8YauIGQ" keySequence="M1+O" command="_I8ZGvhecEeKuGYX8YauIGQ"/>
+    <bindings xmi:id="_I8ZGwxecEeKuGYX8YauIGQ" keySequence="M1+S" command="_I8ZGwRecEeKuGYX8YauIGQ"/>
+    <bindings xmi:id="_I8ZGxhecEeKuGYX8YauIGQ" keySequence="M1+A" command="_I8ZGxBecEeKuGYX8YauIGQ"/>
   </bindingTables>
-  <rootContext xmi:id="_XS7TUXHYEeGdaqKGFl0Tiw" elementId="org.eclipse.ui.contexts.dialogAndWindow" name="In Dialog and Windows">
-    <children xmi:id="_XS7TUnHYEeGdaqKGFl0Tiw" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>
-    <children xmi:id="_XS7TU3HYEeGdaqKGFl0Tiw" elementId="org.eclipse.ui.contexts.dialog" name="In Dialogs"/>
+  <rootContext xmi:id="_I8ZGsRecEeKuGYX8YauIGQ" elementId="org.eclipse.ui.contexts.dialogAndWindow" name="In Dialog and Windows">
+    <children xmi:id="_I8ZGshecEeKuGYX8YauIGQ" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>
+    <children xmi:id="_I8ZGsxecEeKuGYX8YauIGQ" elementId="org.eclipse.ui.contexts.dialog" name="In Dialogs"/>
   </rootContext>
-  <commands xmi:id="_XS7TWnHYEeGdaqKGFl0Tiw" elementId="tychodemo.bundle.quitCommand" commandName="quitCommand"/>
-  <commands xmi:id="_XS7TXnHYEeGdaqKGFl0Tiw" elementId="tychodemo.bundle.openCommand" commandName="openCommand"/>
-  <commands xmi:id="_XS76YXHYEeGdaqKGFl0Tiw" elementId="tychodemo.bundle.saveCommand" commandName="saveCommand"/>
-  <commands xmi:id="_XS76ZHHYEeGdaqKGFl0Tiw" elementId="tychodemo.bundle.aboutCommand" commandName="aboutCommand"/>
-  <addons xmi:id="_XS7TVHHYEeGdaqKGFl0Tiw" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
-  <addons xmi:id="_XS7TVXHYEeGdaqKGFl0Tiw" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
-  <addons xmi:id="_XS7TVnHYEeGdaqKGFl0Tiw" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
-  <addons xmi:id="_XS7TV3HYEeGdaqKGFl0Tiw" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
-  <addons xmi:id="_XS7TWHHYEeGdaqKGFl0Tiw" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
-  <addons xmi:id="_XS7TWXHYEeGdaqKGFl0Tiw" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
+  <commands xmi:id="_I8ZGuhecEeKuGYX8YauIGQ" elementId="org.eclipse.ui.file.exit" commandName="quitCommand"/>
+  <commands xmi:id="_I8ZGvhecEeKuGYX8YauIGQ" elementId="tychodemo.bundle.open" commandName="openCommand"/>
+  <commands xmi:id="_I8ZGwRecEeKuGYX8YauIGQ" elementId="org.eclipse.ui.file.save" commandName="saveCommand"/>
+  <commands xmi:id="_I8ZGxBecEeKuGYX8YauIGQ" elementId="org.eclipse.ui.help.aboutAction" commandName="aboutCommand"/>
+  <addons xmi:id="_I8ZGtBecEeKuGYX8YauIGQ" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
+  <addons xmi:id="_I8ZGtRecEeKuGYX8YauIGQ" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
+  <addons xmi:id="_I8ZGthecEeKuGYX8YauIGQ" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
+  <addons xmi:id="_I8ZGtxecEeKuGYX8YauIGQ" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
+  <addons xmi:id="_I8ZGuBecEeKuGYX8YauIGQ" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
+  <addons xmi:id="_I8ZGuRecEeKuGYX8YauIGQ" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
 </application:Application>
diff --git a/exercises/Exercise_05_Add_Product/tychodemo.bundle/META-INF/MANIFEST.MF b/exercises/Exercise_05_Add_Product/tychodemo.bundle/META-INF/MANIFEST.MF
@@ -5,24 +5,23 @@ Bundle-SymbolicName: tychodemo.bundle; singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: tychodemo.bundle.Activator
 Require-Bundle: javax.inject;bundle-version="1.0.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
  org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.swt;bundle-version="3.8.0",
+ org.eclipse.swt;bundle-version="3.100.1",
  org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.core.databinding.beans;bundle-version="1.2.100",
- org.eclipse.jface;bundle-version="3.8.0",
+ org.eclipse.core.databinding.beans;bundle-version="1.2.200",
+ org.eclipse.jface;bundle-version="3.8.101",
  org.eclipse.jface.databinding;bundle-version="1.6.0",
- org.eclipse.e4.ui.services;bundle-version="0.10.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.10.1",
+ org.eclipse.e4.ui.services;bundle-version="0.10.2",
+ org.eclipse.e4.ui.workbench;bundle-version="0.10.3",
  org.eclipse.e4.core.services;bundle-version="1.0.0",
  org.eclipse.e4.core.di;bundle-version="1.1.0",
- org.eclipse.e4.core.contexts;bundle-version="1.0.0",
- org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.0",
- org.eclipse.core.databinding.property;bundle-version="1.4.0",
- org.eclipse.e4.ui.css.core;bundle-version="0.10.0",
+ org.eclipse.e4.core.contexts;bundle-version="1.1.0",
+ org.eclipse.e4.ui.workbench.swt;bundle-version="0.10.2",
+ org.eclipse.core.databinding.property;bundle-version="1.4.100",
+ org.eclipse.e4.ui.css.core;bundle-version="0.10.2",
  org.w3c.css.sac;bundle-version="1.3.1",
- org.eclipse.e4.core.commands;bundle-version="0.10.0",
- org.eclipse.e4.ui.bindings;bundle-version="0.10.0"
+ org.eclipse.e4.core.commands;bundle-version="0.10.1",
+ org.eclipse.e4.ui.bindings;bundle-version="0.10.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/.../Exercise_05_Add_Product/tychodemo.bundle/src/tychodemo/bundle/handlers/AboutHandler.java b/.../Exercise_05_Add_Product/tychodemo.bundle/src/tychodemo/bundle/handlers/AboutHandler.java
@@ -24,6 +24,6 @@ public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell) {
 	}
 
 	String getGreeting() {
-		return "Hello Tycho Demo RCP!";
+		return "Tycho Demo RCP";
 	}
 }
diff --git a/exercises/Exercise_05_Add_Product/tychodemo.bundle/tychodemo.bundle.product b/exercises/Exercise_05_Add_Product/tychodemo.bundle/tychodemo.bundle.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="tychodemo.bundle" uid="tychodemo.product" id="tychodemo.bundle.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="tychodemo.bundle" id="tychodemo.bundle.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -16,6 +16,7 @@
       <plugin id="com.ibm.icu"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
+      <plugin id="javax.xml"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.util"/>
       <plugin id="org.apache.batik.util.gui"/>

diff --git a/exercises/Exercise_05_Add_Product/tychodemo.feature/pom.xml b/exercises/Exercise_05_Add_Product/tychodemo.feature/pom.xml
@@ -1,15 +1,11 @@
-<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>
-
-	<parent>
-		<groupId>tychodemo</groupId>
-		<artifactId>tychodemo.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../tychodemo.parent</relativePath>
-	</parent>
-
-	<artifactId>tychodemo.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-
+<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>
+  <artifactId>tychodemo.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+  <parent>
+  	<groupId>tychodemo</groupId>
+  	<artifactId>tychodemo.parent</artifactId>
+  	<version>1.0.0-SNAPSHOT</version>
+  	<relativePath>../tychodemo.parent</relativePath>
+  </parent>
 </project>
diff --git a/exercises/Exercise_05_Add_Product/tychodemo.parent/pom.xml b/exercises/Exercise_05_Add_Product/tychodemo.parent/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>tychodemo</groupId>
 	<artifactId>tychodemo.parent</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
@@ -17,15 +17,15 @@
 
 	<!-- common settings for all modules -->
 	<properties>
-		<tycho-version>0.14.1</tycho-version>
+		<tycho-version>0.16.0</tycho-version>
 	</properties>
 
 	<repositories>
 		<!-- configure p2 repository to resolve against -->
 		<repository>
 			<id>juno</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/juno/</url>
+			<url>http://download.eclipse.org/releases/juno/</url>   
 		</repository>
 	</repositories>
 
@@ -41,4 +41,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
diff --git a/exercises/Exercise_05_Add_Product/tychodemo.repository/pom.xml b/exercises/Exercise_05_Add_Product/tychodemo.repository/pom.xml
@@ -1,15 +1,11 @@
-<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>
-
-	<parent>
-		<groupId>tychodemo</groupId>
-		<artifactId>tychodemo.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../tychodemo.parent</relativePath>
-	</parent>
-
-	<artifactId>tychodemo.repository</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-</project>
+<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>
+  <artifactId>tychodemo.repository</artifactId>
+  <packaging>eclipse-repository</packaging>
+  <parent>
+  	<groupId>tychodemo</groupId>
+  	<artifactId>tychodemo.parent</artifactId>
+  	<version>1.0.0-SNAPSHOT</version>
+  	<relativePath>../tychodemo.parent</relativePath>
+  </parent>
+</project>