felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1652138 - in /felix/trunk/http: api/pom.xml base/pom.xml bridge/pom.xml bundle/pom.xml parent/pom.xml servlet-api/pom.xml sslfilter/pom.xml
Date Thu, 15 Jan 2015 15:39:01 GMT
Author: jawi
Date: Thu Jan 15 15:39:00 2015
New Revision: 1652138

URL: http://svn.apache.org/r1652138
Log:
Simplified some of the property magic of the HTTP API.


Modified:
    felix/trunk/http/api/pom.xml
    felix/trunk/http/base/pom.xml
    felix/trunk/http/bridge/pom.xml
    felix/trunk/http/bundle/pom.xml
    felix/trunk/http/parent/pom.xml
    felix/trunk/http/servlet-api/pom.xml
    felix/trunk/http/sslfilter/pom.xml

Modified: felix/trunk/http/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/pom.xml?rev=1652138&r1=1652137&r2=1652138&view=diff
==============================================================================
--- felix/trunk/http/api/pom.xml (original)
+++ felix/trunk/http/api/pom.xml Thu Jan 15 15:39:00 2015
@@ -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,

Modified: felix/trunk/http/base/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/pom.xml?rev=1652138&r1=1652137&r2=1652138&view=diff
==============================================================================
--- felix/trunk/http/base/pom.xml (original)
+++ felix/trunk/http/base/pom.xml Thu Jan 15 15:39:00 2015
@@ -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>
 

Modified: felix/trunk/http/bridge/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bridge/pom.xml?rev=1652138&r1=1652137&r2=1652138&view=diff
==============================================================================
--- felix/trunk/http/bridge/pom.xml (original)
+++ felix/trunk/http/bridge/pom.xml Thu Jan 15 15:39:00 2015
@@ -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>

Modified: felix/trunk/http/bundle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=1652138&r1=1652137&r2=1652138&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Thu Jan 15 15:39:00 2015
@@ -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>

Modified: felix/trunk/http/parent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/parent/pom.xml?rev=1652138&r1=1652137&r2=1652138&view=diff
==============================================================================
--- felix/trunk/http/parent/pom.xml (original)
+++ felix/trunk/http/parent/pom.xml Thu Jan 15 15:39:00 2015
@@ -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>

Modified: felix/trunk/http/servlet-api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/servlet-api/pom.xml?rev=1652138&r1=1652137&r2=1652138&view=diff
==============================================================================
--- felix/trunk/http/servlet-api/pom.xml (original)
+++ felix/trunk/http/servlet-api/pom.xml Thu Jan 15 15:39:00 2015
@@ -55,6 +55,7 @@
                             javax.servlet.http;
                                 version=3.1
                         </Export-Package>
+						<Embed-Dependency>tomcat-servlet-api;inline=true</Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>

Modified: felix/trunk/http/sslfilter/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/sslfilter/pom.xml?rev=1652138&r1=1652137&r2=1652138&view=diff
==============================================================================
--- felix/trunk/http/sslfilter/pom.xml (original)
+++ felix/trunk/http/sslfilter/pom.xml Thu Jan 15 15:39:00 2015
@@ -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>



Mime
View raw message