Simplified some of the property magic of the HTTP API.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1652138 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/api/pom.xml b/http/api/pom.xml
index ee179ee..4ad7848 100644
--- a/http/api/pom.xml
+++ b/http/api/pom.xml
@@ -46,7 +46,7 @@
<instructions>
<Export-Package>
org.osgi.service.http;version=${http.service.version},
- org.apache.felix.http.api;version=${http.api.version}
+ org.apache.felix.http.api;version=${project.version}
</Export-Package>
<Import-Package>
org.osgi.service.http,
diff --git a/http/base/pom.xml b/http/base/pom.xml
index 886b93b..222447c 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
- <version>${http.api.version}</version>
+ <version>[2.0,3.0)</version>
</dependency>
</dependencies>
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index d65ace1..164136f 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -48,7 +48,7 @@
org.apache.felix.http.bridge.internal.BridgeActivator
</Bundle-Activator>
<Export-Package>
- org.apache.felix.http.api;version=${http.api.version},
+ org.apache.felix.http.api,
org.osgi.service.http;version=${http.service.version}
</Export-Package>
<Private-Package>
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index 4ae4c6e..bb9993b 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -56,8 +56,8 @@
org.cometd.bayeux;version=${cometd.version};-split-package:=merge-first,
org.cometd.bayeux.client;version=${cometd.version};-split-package:=merge-first,
org.cometd.bayeux.server;version=${cometd.version};-split-package:=merge-first,
- org.apache.felix.http.api;version=${http.api.version};-split-package:=merge-first,
- org.apache.felix.http.cometd;version=${project.version};-split-package:=merge-first,
+ org.apache.felix.http.api;-split-package:=merge-first,
+ org.apache.felix.http.cometd;-split-package:=merge-first,
org.eclipse.jetty.*;version=${version;===;${jetty.version}};-split-package:=merge-first
</Export-Package>
<Private-Package>
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
index 06da681..249fb0d 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -43,9 +43,6 @@
<cometd.version>2.8.0</cometd.version>
<http.service.version>1.2.1</http.service.version>
<servlet.version>3.1.0</servlet.version>
-
- <http.api.version>2.0.4</http.api.version>
- <http.base.version>2.4.0</http.base.version>
</properties>
<scm>
@@ -70,7 +67,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.6</version>
+ <version>2.5.3</version>
<executions>
<execution>
<id>bundle</id>
diff --git a/http/servlet-api/pom.xml b/http/servlet-api/pom.xml
index e36e355..058c62d 100644
--- a/http/servlet-api/pom.xml
+++ b/http/servlet-api/pom.xml
@@ -55,6 +55,7 @@
javax.servlet.http;
version=3.1
</Export-Package>
+ <Embed-Dependency>tomcat-servlet-api;inline=true</Embed-Dependency>
</instructions>
</configuration>
</plugin>
diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml
index c14565e..5737504 100644
--- a/http/sslfilter/pom.xml
+++ b/http/sslfilter/pom.xml
@@ -36,10 +36,6 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/sslfilter</developerConnection>
<url>http://svn.apache.org/viewvc/felix/trunk/http/sslfilter/</url>
</scm>
-
- <properties>
- <felix.http.api.version>2.3.2-SNAPSHOT</felix.http.api.version>
- </properties>
<build>
<plugins>