You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/10/02 08:23:20 UTC
svn commit: r1706349 - in /felix/trunk/http/itest: pom.xml
src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java
Author: cziegeler
Date: Fri Oct 2 06:23:20 2015
New Revision: 1706349
URL: http://svn.apache.org/viewvc?rev=1706349&view=rev
Log:
FELIX-5059 : Embedd http api bundle in jetty bundle
Modified:
felix/trunk/http/itest/pom.xml
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java
Modified: felix/trunk/http/itest/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/itest/pom.xml?rev=1706349&r1=1706348&r2=1706349&view=diff
==============================================================================
--- felix/trunk/http/itest/pom.xml (original)
+++ felix/trunk/http/itest/pom.xml Fri Oct 2 06:23:20 2015
@@ -34,7 +34,6 @@
<felix.java.version>7</felix.java.version>
<pax.exam.version>4.4.0</pax.exam.version>
<pax.url.aether.version>2.4.1</pax.url.aether.version>
- <http.api.version>3.0.1-SNAPSHOT</http.api.version>
<http.servlet.api.version>1.1.3-SNAPSHOT</http.servlet.api.version>
<http.jetty.version>3.1.1-SNAPSHOT</http.jetty.version>
</properties>
@@ -46,7 +45,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <http.api.version>${http.api.version}</http.api.version>
<http.servlet.api.version>${http.servlet.api.version}</http.servlet.api.version>
<http.jetty.version>${http.jetty.version}</http.jetty.version>
</systemPropertyVariables>
@@ -83,11 +81,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>${http.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
<version>${http.servlet.api.version}</version>
</dependency>
Modified: felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java?rev=1706349&r1=1706348&r2=1706349&view=diff
==============================================================================
--- felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java (original)
+++ felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java Fri Oct 2 06:23:20 2015
@@ -322,10 +322,9 @@ public abstract class BaseIntegrationTes
mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "4.0.0"),
mavenBundle("org.apache.sling", "org.apache.sling.commons.logservice", "1.0.2"),
- mavenBundle("org.apache.felix", "org.apache.felix.http.api", System.getProperty("http.api.version")).startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.felix", "org.apache.felix.http.servlet-api", System.getProperty("http.servlet.api.version")).startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.felix", ORG_APACHE_FELIX_HTTP_JETTY, System.getProperty("http.jetty.version")).startLevel(START_LEVEL_SYSTEM_BUNDLES),
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin").version("1.8.6"),
+ mavenBundle("org.apache.felix", "org.apache.felix.configadmin").version("1.8.8"),
mavenBundle("org.apache.httpcomponents", "httpcore-osgi", "4.3.2").startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.httpcomponents", "httpclient-osgi", "4.3.4").startLevel(START_LEVEL_SYSTEM_BUNDLES),