Author: kgilmer Date: Thu Oct 13 05:59:54 2011 New Revision: 1182669 URL: http://svn.apache.org/viewvc?rev=1182669&view=rev Log: httplite: updated pom.xml so that it would build against vanilla tree. Copied pom structure from log bundle since it's simple and I am new to maven. mvn clean install produces the httplite bundle, but it is not yet tested.
Modified: felix/trunk/httplite/pom.xml Modified: felix/trunk/httplite/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/httplite/pom.xml?rev=1182669&r1=1182668&r2=1182669&view=diff ============================================================================== --- felix/trunk/httplite/pom.xml (original) +++ felix/trunk/httplite/pom.xml Thu Oct 13 05:59:54 2011 @@ -17,38 +17,53 @@ under the License. --> <project> - <parent> - <groupId>org.apache.felix</groupId> - <artifactId>felix</artifactId> - <version>1.0.0</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>bundle</packaging> - <name>Apache Felix HTTP Server</name> - <description>A simple HTTP server.</description> - <artifactId>org.apache.felix.sandbox.httpserver</artifactId> - <dependencies> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>org.osgi.core</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>1.0.0</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Private-Package>org.apache.felix.sandbox.httpserver.*</Private-Package> - <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.apache.felix.sandbox.httpserver.Activator</Bundle-Activator> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <parent> + <groupId>org.apache.felix</groupId> + <artifactId>felix-parent</artifactId> + <version>1.2.1</version> + <relativePath>../pom/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>bundle</packaging> + <name>Apache Felix Light HTTP Server (httplite)</name> + <description>A minimal HTTP Service implementation.</description> + <artifactId>org.apache.felix.httplite</artifactId> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.4</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Private-Package>org.apache.felix.http.lightweight.* + </Private-Package> + <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> + <Bundle-Activator>org.apache.felix.http.lightweight.osgi.Activator + </Bundle-Activator> + <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor> + <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE</Include-Resource> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project>