hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1770876 - in /httpcomponents/httpcore/trunk/httpcore5-osgi: ./ src/test/java/org/apache/hc/core5/http/osgi/ src/test/resources/
Date Tue, 22 Nov 2016 19:31:41 GMT
Author: olegk
Date: Tue Nov 22 19:31:40 2016
New Revision: 1770876

URL: http://svn.apache.org/viewvc?rev=1770876&view=rev
Log:
Removed OSGi integration tests due to incompatibility with Log4j2

Removed:
    httpcomponents/httpcore/trunk/httpcore5-osgi/src/test/java/org/apache/hc/core5/http/osgi/ActuallyConnectIT.java
    httpcomponents/httpcore/trunk/httpcore5-osgi/src/test/java/org/apache/hc/core5/http/osgi/AnnotationIT.java
    httpcomponents/httpcore/trunk/httpcore5-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
    httpcomponents/httpcore/trunk/httpcore5-osgi/src/test/java/org/apache/hc/core5/http/osgi/ConcurrentIT.java
    httpcomponents/httpcore/trunk/httpcore5-osgi/src/test/resources/logback.xml
Modified:
    httpcomponents/httpcore/trunk/httpcore5-osgi/pom.xml

Modified: httpcomponents/httpcore/trunk/httpcore5-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-osgi/pom.xml?rev=1770876&r1=1770875&r2=1770876&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-osgi/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore5-osgi/pom.xml Tue Nov 22 19:31:40 2016
@@ -38,12 +38,6 @@
   </description>
   <url>http://hc.apache.org/httpcomponents-core-ga</url>
   <packaging>bundle</packaging>
-  <properties>
-    <pax.url.version>2.0.0</pax.url.version>
-    <pax.exam.version>3.5.0</pax.exam.version>
-    <slf4j.version>1.5.4</slf4j.version>
-    <logback.version>1.0.1</logback.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.httpcomponents.core5</groupId>
@@ -52,95 +46,14 @@
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.core5</groupId>
-      <artifactId>httpcore5-testing</artifactId>
+      <artifactId>httpcore5-h2</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-native</artifactId>
-      <version>${pax.exam.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-      </exclusions>
-      <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.ops4j.pax.url</groupId>
-      <artifactId>pax-url-wrap</artifactId>
-      <version>${pax.url.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.6.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>${logback.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <version>${logback.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>4.2.0</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-         <groupId>org.apache.servicemix.tooling</groupId>
-         <artifactId>depends-maven-plugin</artifactId>
-         <version>1.2</version>
-         <executions>
-           <execution>
-              <id>generate-depends-file</id>
-              <phase>generate-resources</phase>
-              <goals>
-                <goal>generate-depends-file</goal>
-              </goals>
-           </execution>
-         </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
@@ -160,30 +73,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${hc.surefire.version}</version>
-        <executions>
-          <execution>
-            <id>it</id>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-          </goals>
-          <configuration>
-              <includes>
-                  <include>**/*IT.class</include>
-              </includes>
-              <systemPropertyVariables>
-                  <project.build.directory>${project.build.directory}</project.build.directory>
-                  <project.version>${project.version}</project.version>
-                  <java.awt.headless>true</java.awt.headless>
-                  </systemPropertyVariables>
-          </configuration>
-        </execution>
-        </executions>
-      </plugin>
     </plugins>
     <finalName>org.apache.httpcomponents.httpcore_${project.version}</finalName>
   </build>
@@ -216,27 +105,4 @@
     </plugins>
   </reporting>
 
-  <profiles>
-    <profile>
-      <id>disableOSGiTests</id>
-      <activation>
-        <property>
-          <name>disableOSGiTests</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>



Mime
View raw message