hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1793691 - in /httpcomponents/httpclient/trunk: httpclient5-osgi/pom.xml httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java httpclient5-osgi/src/test/resources/log4j.properties httpclient5-testing/pom.xml
Date Wed, 03 May 2017 18:31:42 GMT
Author: olegk
Date: Wed May  3 18:31:41 2017
New Revision: 1793691

URL: http://svn.apache.org/viewvc?rev=1793691&view=rev
Log:
Removed Http MIME integration test requiring dependency on PAX runtime; Http MIME code has
been folded into the main module

Removed:
    httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
    httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/resources/log4j.properties
Modified:
    httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml
    httpcomponents/httpclient/trunk/httpclient5-testing/pom.xml

Modified: httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml?rev=1793691&r1=1793690&r2=1793691&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml Wed May  3 18:31:41 2017
@@ -42,10 +42,7 @@
   <properties>
     <httpcore.osgi.import.version>"5.0-alpha2"</httpcore.osgi.import.version>
     <log4j.osgi.import.version>"2.8"</log4j.osgi.import.version>
-    <pax.url.version>2.4.1</pax.url.version>
-    <pax.exam.version>4.5.0</pax.exam.version>
     <osgi.framework.version>5.0.0</osgi.framework.version>
-    <slf4j.version>1.7.5</slf4j.version>
   </properties>
 
   <dependencies>
@@ -94,49 +91,12 @@
       <version>${osgi.framework.version}</version>
       <scope>provided</scope>
     </dependency>
-    <!-- test dependencies, mainly OSGi runtime environment -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
       <dependency>
-          <groupId>org.ops4j.pax.exam</groupId>
-          <artifactId>pax-exam-container-native</artifactId>
-          <version>${pax.exam.version}</version>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.framework</artifactId>
-          <version>5.0.1</version>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.ops4j.pax.exam</groupId>
-          <artifactId>pax-exam-junit4</artifactId>
-          <scope>test</scope>
-          <version>${pax.exam.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.ops4j.pax.exam</groupId>
-          <artifactId>pax-exam-link-mvn</artifactId>
-          <scope>test</scope>
-          <version>${pax.exam.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.ops4j.pax.url</groupId>
-          <artifactId>pax-url-aether</artifactId>
-          <version>${pax.url.version}</version>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-          <version>${slf4j.version}</version>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
           <groupId>org.mockito</groupId>
           <artifactId>mockito-core</artifactId>
           <scope>test</scope>
@@ -150,29 +110,6 @@
       </resource>
     </resources>
     <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>copy-bundles</id>
-                    <phase>generate-test-resources</phase>
-                    <goals>
-                        <goal>copy-dependencies</goal>
-                    </goals>
-                    <configuration>
-                        <outputDirectory>${project.build.directory}/bundles</outputDirectory>
-                        <!--
-                          Exclude the ones that are not OSGi
-                          components, plus OSGi itself.
-                      -->
-                        <excludeGroupIds>org.slf4j</excludeGroupIds>
-                        <excludeArtifactIds>httpclient,httpmime,httpclient-cache,fluent-hc,httpcore,org.osgi.core</excludeArtifactIds>
-                        <includeScope>compile</includeScope>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

Modified: httpcomponents/httpclient/trunk/httpclient5-testing/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-testing/pom.xml?rev=1793691&r1=1793690&r2=1793691&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-testing/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient5-testing/pom.xml Wed May  3 18:31:41 2017
@@ -38,29 +38,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5-fluent</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5-testing</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5-win</artifactId>
+      <artifactId>httpclient5</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents.core5</groupId>
-      <artifactId>httpcore5-testing</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
       <scope>compile</scope>
@@ -71,6 +59,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5-fluent</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5-win</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>



Mime
View raw message