You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2011/12/17 12:16:13 UTC
svn commit: r1215459 - /felix/trunk/webconsole/pom.xml
Author: fmeschbe
Date: Sat Dec 17 11:16:13 2011
New Revision: 1215459
URL: http://svn.apache.org/viewvc?rev=1215459&view=rev
Log:
FELIX-3279 Replace full build with bare build importing Commins IO and FileUpload and JSON dependencies
Modified:
felix/trunk/webconsole/pom.xml
Modified: felix/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=1215459&r1=1215458&r2=1215459&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Sat Dec 17 11:16:13 2011
@@ -119,29 +119,13 @@
org.apache.felix.bundlerepository,
org.osgi.service.obr
</DynamicImport-Package>
+ <Include-Resource>
+ {maven-resources},META-INF=src/main/bare-resources
+ </Include-Resource>
<Embed-Dependency>
- <!-- Import/Export-Package parsing -->
org.apache.felix.utils;inline=org/apache/felix/utils/manifest/**,
- org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**,
-
- <!-- ServiceTracker -->
- org.osgi.compendium;
- inline=org/osgi/util/tracker/*,
-
- <!-- Required for JSON data transfer -->
- json;inline=org/json/*,
-
- <!-- File Upload functionality -->
- commons-fileupload;inline=org/apache/commons/fileupload/*|
- org/apache/commons/fileupload/disk/*|
- org/apache/commons/fileupload/servlet/*,
-
- <!-- Required by FileUpload and Util -->
- commons-io;inline=org/apache/commons/io/*|
- org/apache/commons/io/filefilter/*|
- org/apache/commons/io/output/*
+ org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**
</Embed-Dependency>
-
<_removeheaders>
Embed-Dependency,Private-Package,Include-Resource
</_removeheaders>
@@ -151,60 +135,6 @@
</plugins>
</build>
- <profiles>
- <!--
- The "bare-bundle" profile builds a bundle not including certain
- 3rd party libraries and classes, namely: Commons IO, Commons
- FileUpload, JSON, and the OSGi ServiceTracker. These are imported
- by this bundle. The classes from the bundlerepository bundle are
- still included because they are not exported from the
- bundlerepository bundle and thus cannot be imported.
- The "bare-bundle" can be used if the non-embedded libraries are
- provided by the framework in which the web console is installed.
- -->
- <profile>
- <id>bare-bundle</id>
- <activation><activeByDefault>true</activeByDefault></activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bare-bundle</id>
- <goals>
- <goal>bundle</goal>
- </goals>
- <configuration>
- <classifier>bare</classifier>
- <instructions>
- <Bundle-Name>
- ${project.name} (Bare)
- </Bundle-Name>
- <Bundle-SymbolicName>
- ${project.artifactId}.bare
- </Bundle-SymbolicName>
- <Include-Resource>
- {maven-resources},META-INF=src/main/bare-resources
- </Include-Resource>
- <Embed-Dependency>
- org.apache.felix.utils;inline=org/apache/felix/utils/manifest/**,
- org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**
- </Embed-Dependency>
- <_removeheaders>
- Embed-Dependency,Private-Package,Include-Resource
- </_removeheaders>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -246,17 +176,8 @@
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20070829</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.0</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>