diff --git a/examples/dictionaryclient/pom.xml b/examples/dictionaryclient/pom.xml
index 9b02615..1c271a4 100644
--- a/examples/dictionaryclient/pom.xml
+++ b/examples/dictionaryclient/pom.xml
@@ -6,15 +6,15 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: Dictionary Client</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example Dictionary Client</name>
   <artifactId>org.apache.felix.examples.dictionaryclient</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -27,24 +27,25 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>Dictionary Client Example</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Example Dictionary Client</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Description>
               A bundle using the dictionary service if it finds it at startup.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.dictionaryclient.Activator
-            </bundleActivator>
-            <importPackage>
-              org.osgi.framework, org.apache.felix.examples.dictionaryservice
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Private-Package>
+              org.apache.felix.examples.dictionaryclient.*
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/dictionaryclient2/pom.xml b/examples/dictionaryclient2/pom.xml
index 92845b0..fb10671 100644
--- a/examples/dictionaryclient2/pom.xml
+++ b/examples/dictionaryclient2/pom.xml
@@ -6,15 +6,15 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: Dynamic Dictionary Client</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example Dynamic Dictionary Client</name>
   <artifactId>org.apache.felix.examples.dictionaryclient2</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -27,24 +27,25 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>Dynamic Dictionary Client Example</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Example Dynamic Dictionary Client</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Description>
               A client bundle with more complex requirements for the dictionary.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.dictionaryclient2.Activator
-            </bundleActivator>
-            <importPackage>
-              org.osgi.framework, org.apache.felix.examples.dictionaryservice
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Private-Package>
+              org.apache.felix.examples.dictionaryclient2.*
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/dictionaryservice.itest/pom.xml b/examples/dictionaryservice.itest/pom.xml
index bcbec05..b8ade33 100644
--- a/examples/dictionaryservice.itest/pom.xml
+++ b/examples/dictionaryservice.itest/pom.xml
@@ -7,14 +7,14 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
-  <name>Apache Felix Examples: Dictionary Service Integration Test</name>
+  <name>Apache Felix Example Dictionary Service Integration Test</name>
   <artifactId>org.apache.felix.examples.dictionaryservice.itest</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -59,12 +59,15 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Private-Package>org.apache.felix.examples.dictionaryservice.itest.*</Private-Package>
-            <Bundle-Name>Dictionary Integration Test Example</Bundle-Name>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Private-Package>
+              org.apache.felix.examples.dictionaryservice.itest.*
+            </Private-Package>
+            <Bundle-Name>Example Dictionary Integration Test</Bundle-Name>
             <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle using the dictionary service to test it.
diff --git a/examples/dictionaryservice/pom.xml b/examples/dictionaryservice/pom.xml
index 9f82e70..56c8cc9 100644
--- a/examples/dictionaryservice/pom.xml
+++ b/examples/dictionaryservice/pom.xml
@@ -6,42 +6,43 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: English Dictionary Service</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example English Dictionary Service</name>
   <artifactId>org.apache.felix.examples.dictionaryservice</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>English Dictionary Example</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Example English Dictionary</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Description>
               A bundle that registersan English dictionary service.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.dictionaryservice.impl.Activator
-            </bundleActivator>
-            <exportPackage>
+            </Bundle-Activator>
+            <Export-Package>
               org.apache.felix.examples.dictionaryservice
-            </exportPackage>
-            <importPackage>
-            	 org.osgi.framework
-            </importPackage>
-          </osgiManifest>
+            </Export-Package>
+            <Private-Package>
+              org.apache.felix.examples.dictionaryservice.*
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/eventlistener/pom.xml b/examples/eventlistener/pom.xml
index 88a1dd7..05416a3 100644
--- a/examples/eventlistener/pom.xml
+++ b/examples/eventlistener/pom.xml
@@ -6,41 +6,39 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: Service Event Listener</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example Service Event Listener</name>
   <artifactId>org.apache.felix.examples.eventlistener</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>Service listener example</bundleName>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Example Service Listener</Bundle-Name>
+            <Bundle-Description>
               Bundle listening for service events: displays a message on startup and when service events occur.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.eventlistener.Activator
-            </bundleActivator>
-            <bundleSymbolicName>
-              org.apache.felix.examples.eventlistener
-            </bundleSymbolicName>
-            <importPackage>
-              org.osgi.framework
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Private-Package>
+              org.apache.felix.examples.eventlistener.*
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/extenderbased.circle/pom.xml b/examples/extenderbased.circle/pom.xml
index 0535319..51784b2 100644
--- a/examples/extenderbased.circle/pom.xml
+++ b/examples/extenderbased.circle/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -61,19 +61,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/extenderbased.host/pom.xml b/examples/extenderbased.host/pom.xml
index 96bd81e..0ec0715 100644
--- a/examples/extenderbased.host/pom.xml
+++ b/examples/extenderbased.host/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -57,19 +57,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/extenderbased.square/pom.xml b/examples/extenderbased.square/pom.xml
index f488e6b..deaacf1 100644
--- a/examples/extenderbased.square/pom.xml
+++ b/examples/extenderbased.square/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -61,19 +61,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/extenderbased.triangle/pom.xml b/examples/extenderbased.triangle/pom.xml
index b04be8e..72539be 100644
--- a/examples/extenderbased.triangle/pom.xml
+++ b/examples/extenderbased.triangle/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -61,19 +61,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/frenchdictionary/pom.xml b/examples/frenchdictionary/pom.xml
index 4a112aa..cd6a732 100644
--- a/examples/frenchdictionary/pom.xml
+++ b/examples/frenchdictionary/pom.xml
@@ -6,15 +6,15 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: French Dictionary Service</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example French Dictionary Service</name>
   <artifactId>org.apache.felix.examples.frenchdictionary</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -27,24 +27,25 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>French Dictionary Example</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Example French Dictionary</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Description>
               A bundle that registers a French dictionary service.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.frenchdictionary.Activator
-            </bundleActivator>
-            <importPackage>
-              org.osgi.framework, org.apache.felix.examples.dictionaryservice
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Private-Package>
+              org.apache.felix.examples.frenchdictionary.*
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/pom.xml b/examples/pom.xml
index fc9d2ea..e62eea3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,15 +21,6 @@
         </property>
       </activation>
       <modules>
-          <module>eventlistener</module>
-          <module>dictionaryservice</module>
-          <module>dictionaryservice.itest</module>
-          <module>frenchdictionary</module>
-          <module>dictionaryclient</module>
-          <module>dictionaryclient2</module>
-          <module>spellcheckservice</module>
-          <module>spellcheckclient</module>
-          <module>spellcheckbinder</module>
       </modules>
     </profile>
     <profile>
@@ -41,6 +32,15 @@
         </property>
       </activation>
       <modules>
+          <module>eventlistener</module>
+          <module>dictionaryservice</module>
+          <module>dictionaryservice.itest</module>
+          <module>frenchdictionary</module>
+          <module>dictionaryclient</module>
+          <module>dictionaryclient2</module>
+          <module>spellcheckservice</module>
+          <module>spellcheckclient</module>
+          <module>spellcheckbinder</module>
           <module>spellcheckscr</module>
           <module>servicebased.host</module>
           <module>servicebased.circle</module>
diff --git a/examples/servicebased.circle/pom.xml b/examples/servicebased.circle/pom.xml
index d592297..10008bb 100644
--- a/examples/servicebased.circle/pom.xml
+++ b/examples/servicebased.circle/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -59,19 +59,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/servicebased.host/pom.xml b/examples/servicebased.host/pom.xml
index 93c9968..a934d69 100644
--- a/examples/servicebased.host/pom.xml
+++ b/examples/servicebased.host/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -57,19 +57,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/servicebased.square/pom.xml b/examples/servicebased.square/pom.xml
index 189f429..2a5fc47 100644
--- a/examples/servicebased.square/pom.xml
+++ b/examples/servicebased.square/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -59,19 +59,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/servicebased.triangle/pom.xml b/examples/servicebased.triangle/pom.xml
index e2e9d2f..88c96c8 100644
--- a/examples/servicebased.triangle/pom.xml
+++ b/examples/servicebased.triangle/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -59,19 +59,4 @@
       </plugin>
     </plugins>
   </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>snapshot plugins</name>
-      <url>
-        http://people.apache.org/repo/m2-snapshot-repository
-      </url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/examples/spellcheckbinder/pom.xml b/examples/spellcheckbinder/pom.xml
index 2ad1a1a..3215909 100644
--- a/examples/spellcheckbinder/pom.xml
+++ b/examples/spellcheckbinder/pom.xml
@@ -6,15 +6,15 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: Spell Check w/ Service Binder</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example Spell Check w/ Service Binder</name>
   <artifactId>org.apache.felix.examples.spellcheckbinder</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -39,30 +39,26 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <entries>
-              <property>
-                <name>Metadata-Location</name>
-                <value>metadata.xml</value>
-              </property>
-            </entries>
-            <bundleName>Spell Check w/ ServiceBinder Example</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Metadata-Location>metadata.xml</Metadata-Location>
+            <Bundle-Name>Example Spell Check w/ Service Binder</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Description>
               A bundle that registers a spell checking service based on service binder.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.spellcheckbinder.Activator
-            </bundleActivator>
-            <importPackage>
-              org.osgi.framework, org.apache.felix.examples.dictionaryservice, org.apache.felix.servicebinder, org.apache.felix.examples.spellcheckservice
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Private-Package>
+              org.apache.felix.examples.spellcheckbinder.*
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/spellcheckclient/pom.xml b/examples/spellcheckclient/pom.xml
index 33dd853..5e9e497 100644
--- a/examples/spellcheckclient/pom.xml
+++ b/examples/spellcheckclient/pom.xml
@@ -6,15 +6,15 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: Spell Check Client</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example Spell Check Client</name>
   <artifactId>org.apache.felix.examples.spellcheckclient</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -27,24 +27,25 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>Spell Check Client Example</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Example Spell Check Client</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Description>
               A bundle using the spell check service.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.spellcheckclient.Activator
-            </bundleActivator>
-            <importPackage>
-              org.osgi.framework, org.apache.felix.examples.spellcheckservice
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Private-Package>
+              org.apache.felix.examples.spellcheckclient.*
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/examples/spellcheckscr/pom.xml b/examples/spellcheckscr/pom.xml
index 29da5e4..c8d3e68 100644
--- a/examples/spellcheckscr/pom.xml
+++ b/examples/spellcheckscr/pom.xml
@@ -30,7 +30,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
-  <name>Apache Felix Examples: Spell Check w/ SCR</name>
+  <name>Apache Felix Example Spell Check w/ SCR</name>
   <artifactId>org.apache.felix.examples.spellcheckscr</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <description>${description}</description>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -61,11 +61,10 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <!-- docs in http://cwiki.apache.org/FELIX/bundle-plugin-for-maven-bnd.html and http://cwiki.apache.org/FELIX/osgi-plugin-for-maven-2.html -->
             <Private-Package>${pom.artifactId}.*</Private-Package>
             <Import-Package>*</Import-Package>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
diff --git a/examples/spellcheckservice/pom.xml b/examples/spellcheckservice/pom.xml
index b0b49be..ece9665 100644
--- a/examples/spellcheckservice/pom.xml
+++ b/examples/spellcheckservice/pom.xml
@@ -6,15 +6,15 @@
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix Examples: Spell Check Service</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Example Spell Check Service</name>
   <artifactId>org.apache.felix.examples.spellcheckservice</artifactId>
   <version>0.9.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -27,27 +27,25 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>Spell Check Service Example</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Example Spell Check Service</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Description>
               A bundle that registers a spell checking service.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.examples.spellcheckservice.impl.Activator
-            </bundleActivator>
-            <importPackage>
-              org.osgi.framework, org.apache.felix.examples.dictionaryservice
-            </importPackage>
-            <exportPackage>
-              org.apache.felix.examples.spellcheckservice
-            </exportPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Export-Package>
+              org.apache.felix.examples.spellcheckservice.*
+            </Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/org.apache.felix.daemon/pom.xml b/org.apache.felix.daemon/pom.xml
index d3a51a3..b45f7f2 100644
--- a/org.apache.felix.daemon/pom.xml
+++ b/org.apache.felix.daemon/pom.xml
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
+      <version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
diff --git a/pom/pom.xml b/pom/pom.xml
index 7aa1103..95a7500 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -153,6 +153,8 @@
         <module>../ipojo/arch</module>
 
         <module>../mosgi</module> 
+
+        <module>../examples</module>
       </modules>
     </profile>
     
@@ -167,8 +169,6 @@
       <modules>
         <module>../org.apache.felix.daemon</module>
 
-        <module>../examples</module>
-
         <module>../upnp.extra</module>
         <module>../upnp.basedriver</module>
         <module>../upnp.tester</module>