Cleaned up poms in preparation for release.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1097061 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/samples.annotation/pom.xml b/dependencymanager/samples.annotation/pom.xml
index d6d4c68..36fa344 100644
--- a/dependencymanager/samples.annotation/pom.xml
+++ b/dependencymanager/samples.annotation/pom.xml
@@ -1,77 +1,80 @@
-<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">

-	<modelVersion>4.0.0</modelVersion>

-	

-	<parent>

-		<groupId>org.apache.felix</groupId>

-		<artifactId>dependencymanager-reactor</artifactId>

-		<version>3.0.0-SNAPSHOT</version>

-	</parent>

-	

-	<name>Apache Felix Dependency Manager Annotation Samples</name>

-	<artifactId>org.apache.felix.dependencymanager.samples.annotation</artifactId>

-	<packaging>bundle</packaging>

-

-	<dependencies>

-		<dependency>

-			<groupId>org.osgi</groupId>

-			<artifactId>org.osgi.core</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.osgi</groupId>

-			<artifactId>org.osgi.compendium</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>${pom.groupId}</groupId>

-			<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>${pom.groupId}</groupId>

-			<artifactId>org.apache.felix.gogo.runtime</artifactId>

-		</dependency>

-	</dependencies>

-

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-compiler-plugin</artifactId>

-				<configuration>

-					<source>1.5</source>

-					<target>1.5</target>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.felix</groupId>

-				<artifactId>maven-bundle-plugin</artifactId>

-				<version>1.4.0</version>

-				<extensions>true</extensions>

-				<configuration>

-					<instructions>

-						<Bundle-Name>Apache Felix Dependency Manager Annotation Sample</Bundle-Name>

-						<Bundle-SymbolicName>org.apache.felix.dependencymanager.samples.annotation</Bundle-SymbolicName>

-						<Import-Package>org.apache.felix.service.command;status=provisional,*</Import-Package>

-						<Private-Package>org.apache.felix.dm.samples.annotation</Private-Package>

-					</instructions>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.felix</groupId>

-				<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>

-				<version>3.0.0-SNAPSHOT</version>

-				<executions>

-					<execution>

-						<goals>

-							<goal>scan</goal>

-						</goals>

-						<configuration>

-							<log>warn</log>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

+<?xml version="1.0"?>

+<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">

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.felix</groupId>

+        <artifactId>felix-parent</artifactId>

+        <version>1.2.0</version>

+        <relativePath>../../pom/pom.xml</relativePath>

+    </parent>

+    <properties>

+        <osgi.version>4.2.0</osgi.version>

+    </properties>

+    <name>Apache Felix Dependency Manager Annotation Samples</name>

+    <artifactId>org.apache.felix.dependencymanager.samples.annotation</artifactId>

+    <version>3.0.0-SNAPSHOT</version>

+    <packaging>bundle</packaging>

+    <dependencies>

+        <dependency>

+            <groupId>org.osgi</groupId>

+            <artifactId>org.osgi.core</artifactId>

+            <version>${osgi.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.osgi</groupId>

+            <artifactId>org.osgi.compendium</artifactId>

+            <version>${osgi.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>${pom.groupId}</groupId>

+            <artifactId>org.apache.felix.dependencymanager.annotation</artifactId>

+            <version>3.0.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

+            <groupId>${pom.groupId}</groupId>

+            <artifactId>org.apache.felix.gogo.runtime</artifactId>

+            <version>0.6.0</version>

+        </dependency>

+    </dependencies>

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-compiler-plugin</artifactId>

+                <configuration>

+                    <source>1.5</source>

+                    <target>1.5</target>

+                </configuration>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.felix</groupId>

+                <artifactId>maven-bundle-plugin</artifactId>

+                <version>2.3.4</version>

+                <extensions>true</extensions>

+                <configuration>

+                    <instructions>

+                        <Bundle-Name>Apache Felix Dependency Manager Annotation Sample</Bundle-Name>

+                        <Bundle-SymbolicName>org.apache.felix.dependencymanager.samples.annotation</Bundle-SymbolicName>

+                        <Import-Package>org.apache.felix.service.command;status=provisional,*</Import-Package>

+                        <Private-Package>org.apache.felix.dm.samples.annotation</Private-Package>

+                    </instructions>

+                </configuration>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.felix</groupId>

+                <artifactId>org.apache.felix.dependencymanager.annotation</artifactId>

+                <version>3.0.0-SNAPSHOT</version>

+                <executions>

+                    <execution>

+                        <goals>

+                            <goal>scan</goal>

+                        </goals>

+                        <configuration>

+                            <log>warn</log>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

 </project>