You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by kg...@apache.org on 2011/12/21 16:09:16 UTC
svn commit: r1221759 - in /felix/trunk/httplite: complete/pom.xml
minimum/pom.xml
Author: kgilmer
Date: Wed Dec 21 15:09:16 2011
New Revision: 1221759
URL: http://svn.apache.org/viewvc?rev=1221759&view=rev
Log:
httplite: fix versioning errors in pom, provided by patch from Yann Diorcet. See FELIX-3287
Modified:
felix/trunk/httplite/complete/pom.xml
felix/trunk/httplite/minimum/pom.xml
Modified: felix/trunk/httplite/complete/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/complete/pom.xml?rev=1221759&r1=1221758&r2=1221759&view=diff
==============================================================================
--- felix/trunk/httplite/complete/pom.xml (original)
+++ felix/trunk/httplite/complete/pom.xml Wed Dec 21 15:09:16 2011
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.httplite</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -62,7 +62,7 @@
<instructions>
<Private-Package>org.apache.felix.httplite.osgi, org.apache.felix.httplite.server, org.apache.felix.httplite.servlet</Private-Package>
<Export-Service>org.osgi.service.http.HttpService</Export-Service>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.felix.httplite.osgi.Activator</Bundle-Activator>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
Modified: felix/trunk/httplite/minimum/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/minimum/pom.xml?rev=1221759&r1=1221758&r2=1221759&view=diff
==============================================================================
--- felix/trunk/httplite/minimum/pom.xml (original)
+++ felix/trunk/httplite/minimum/pom.xml Wed Dec 21 15:09:16 2011
@@ -9,7 +9,7 @@
OF ANY KIND, either express or implied. See the 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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
@@ -59,6 +59,17 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DEPENDENCIES</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -76,15 +87,15 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package />
+ <Export-Package/>
<Private-Package>org.apache.felix.httplite.osgi,
org.apache.felix.httplite.server,
- org.apache.felix.httplite.servlet</Private-Package>
+ org.apache.felix.httplite.servlet
+ </Private-Package>
<Export-Service>org.osgi.service.http.HttpService</Export-Service>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>${pom.artifactId}.osgi.Activator</Bundle-Activator>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>${project.artifactId}.osgi.Activator</Bundle-Activator>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
<Import-Package>
javax.servlet;version="2.4",
javax.servlet.http;version="2.4",