felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1094897 - in /felix/trunk/dependencymanager/shell: DEPENDENCIES NOTICE pom.xml
Date Tue, 19 Apr 2011 07:15:28 GMT
Author: marrs
Date: Tue Apr 19 07:15:28 2011
New Revision: 1094897

URL: http://svn.apache.org/viewvc?rev=1094897&view=rev
Log:
Updated notice file, made pom.xml independent from its old parent so we don't need to release
that one.

Added:
    felix/trunk/dependencymanager/shell/DEPENDENCIES
Modified:
    felix/trunk/dependencymanager/shell/NOTICE
    felix/trunk/dependencymanager/shell/pom.xml

Added: felix/trunk/dependencymanager/shell/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/DEPENDENCIES?rev=1094897&view=auto
==============================================================================
--- felix/trunk/dependencymanager/shell/DEPENDENCIES (added)
+++ felix/trunk/dependencymanager/shell/DEPENDENCIES Tue Apr 19 07:15:28 2011
@@ -0,0 +1,24 @@
+Apache Felix Dependency Manager Shell
+Copyright 2011 The Apache Software Foundation
+
+
+I. Included Third-Party Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Eclipse ... TODO
+
+III. Overall License Summary
+
+- Apache License 2.0

Modified: felix/trunk/dependencymanager/shell/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/NOTICE?rev=1094897&r1=1094896&r2=1094897&view=diff
==============================================================================
--- felix/trunk/dependencymanager/shell/NOTICE (original)
+++ felix/trunk/dependencymanager/shell/NOTICE Tue Apr 19 07:15:28 2011
@@ -1,21 +1,7 @@
 Apache Felix Dependency Manager Shell
-Copyright 2009 The Apache Software Foundation
+Copyright 2011 The Apache Software Foundation
 
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0

Modified: felix/trunk/dependencymanager/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/pom.xml?rev=1094897&r1=1094896&r2=1094897&view=diff
==============================================================================
--- felix/trunk/dependencymanager/shell/pom.xml (original)
+++ felix/trunk/dependencymanager/shell/pom.xml Tue Apr 19 07:15:28 2011
@@ -22,11 +22,18 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.felix</groupId>
-		<artifactId>dependencymanager-reactor</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+	    <groupId>org.apache.felix</groupId>
+	    <artifactId>felix-parent</artifactId>
+	    <version>1.2.0</version>
+	    <relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 
+	<properties>
+		<felix.dependencymanager.version>3.0.0-SNAPSHOT</felix.dependencymanager.version>
+		<osgi.version>4.2.0</osgi.version>
+		<pax.exam.version>1.2.0</pax.exam.version>
+	</properties>
+
 	<name>Apache Felix Dependency Manager Shell</name>
 	<artifactId>org.apache.felix.dependencymanager.shell</artifactId>
 	<packaging>bundle</packaging>
@@ -35,35 +42,57 @@
 		<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.shell</artifactId>
+			<version>1.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
 			<artifactId>org.apache.felix.dependencymanager</artifactId>
+			<version>${felix.dependencymanager.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
 			<artifactId>org.apache.felix.gogo.runtime</artifactId>
+			<version>0.6.0</version>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>osgi</artifactId>
+			<version>3.1.1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<version>1.4.0</version>
+					<extensions>true</extensions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<target>1.3</target>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
@@ -75,7 +104,7 @@
 						<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 						<Export-Package></Export-Package>
 						<Private-Package>org.apache.felix.dm.shell</Private-Package>
-						<Import-Package>org.apache.felix.dm;version="[3.0.0,4.0.0)",org.apache.felix.shell;version="1.0";resolution:=optional,org.osgi.framework;version="1.3",org.eclipse.osgi.framework.console;resolution:=optional,org.apache.felix.service.command;resolution:=optional</Import-Package>
+						<Import-Package>org.apache.felix.dm;version="[3.0.0,4.0.0)", org.apache.felix.shell;version="[1.0,2.0)";resolution:=optional,
org.osgi.framework;version="[1.3,2.0)", org.eclipse.osgi.framework.console;resolution:=optional,
org.apache.felix.service.command;resolution:=optional</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>



Mime
View raw message