You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2012/03/16 14:35:43 UTC
svn commit: r1301499 - /sling/trunk/launchpad/base/pom.xml
Author: fmeschbe
Date: Fri Mar 16 13:35:42 2012
New Revision: 1301499
URL: http://svn.apache.org/viewvc?rev=1301499&view=rev
Log:
SLING-2439 Move Launchpad API into the launchpad base bundle to expose it into the framework
Modified:
sling/trunk/launchpad/base/pom.xml
Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1301499&r1=1301498&r2=1301499&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Fri Mar 16 13:35:42 2012
@@ -74,7 +74,8 @@
<DynamicImport-Package>*</DynamicImport-Package>
<Embed-Dependency>
org.apache.felix.framework;inline=org/**|META-INF/**,
- org.apache.felix.http.proxy;inline=org/apache/**
+ org.apache.felix.http.proxy;inline=org/apache/**,
+ org.apache.sling.launchpad.api;inline=org/apache/sling/launchpad/api/**
</Embed-Dependency>
</instructions>
</configuration>
@@ -111,20 +112,6 @@
</outputDirectory>
</configuration>
</execution>
- <!-- Embed code from launchpad.api -->
- <execution>
- <id>extract-sling-launchpad-api</id>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeArtifactIds>org.apache.sling.launchpad.api</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- <outputDirectory>
- ${project.build.directory}/classes
- </outputDirectory>
- </configuration>
- </execution>
<!-- Embed osgi Version class from framework-->
<execution>
<id>extract-osgi-framework</id>
@@ -163,7 +150,6 @@
</archive>
<classifier>app</classifier>
<includes>
- <include>org/apache/sling/launchpad/api/**</include>
<include>org/apache/sling/launchpad/base/shared/**</include>
<include>org/apache/sling/launchpad/app/**</include>
<include>org/apache/sling/commons/osgi/bundleversion/**</include>
@@ -194,7 +180,6 @@
<classifier>webapp</classifier>
<packagingIncludes>
META-INF/**,
- WEB-INF/classes/org/apache/sling/launchpad/api/**,
WEB-INF/classes/org/apache/sling/launchpad/base/shared/**,
WEB-INF/classes/org/apache/sling/launchpad/webapp/**,
WEB-INF/classes/org/apache/sling/commons/osgi/bundleversion/**,