Author: marrs
Date: Wed Apr 27 11:07:19 2011
New Revision: 1097083
URL: http://svn.apache.org/viewvc?rev=1097083&view=rev
Log:
More pom changes for release.
Modified:
felix/trunk/dependencymanager/samples/pom.xml
Modified: felix/trunk/dependencymanager/samples/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/samples/pom.xml?rev=1097083&r1=1097082&r2=1097083&view=diff
==============================================================================
--- felix/trunk/dependencymanager/samples/pom.xml (original)
+++ felix/trunk/dependencymanager/samples/pom.xml Wed Apr 27 11:07:19 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,48 +14,50 @@
License for the specific language governing permissions and
limitations under the License.
-->
-<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 Samples</name>
- <artifactId>org.apache.felix.dependencymanager.samples</artifactId>
-
- <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</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
-
<useDefaultManifestFile>false</useDefaultManifestFile>
- <compilerArgument>-g</compilerArgument>
- <compilerVersion>1.5</compilerVersion>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<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 Samples</name>
+ <artifactId>org.apache.felix.dependencymanager.samples</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <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</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <useDefaultManifestFile>false</useDefaultManifestFile>
+ <compilerArgument>-g</compilerArgument>
+ <compilerVersion>1.5</compilerVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>