You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2015/08/26 15:02:28 UTC
svn commit: r1697920 - in /httpcomponents/httpcore/branches/4.4.x:
httpcore-osgi/pom.xml
httpcore-osgi/src/test/java/org/apache/http/osgi/Common.java httpcore/pom.xml
Author: olegk
Date: Wed Aug 26 13:02:28 2015
New Revision: 1697920
URL: http://svn.apache.org/r1697920
Log:
HTTPCORE-406: pull in the test classes from core as a test-jar.
Modified:
httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/pom.xml
httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/src/test/java/org/apache/http/osgi/Common.java
httpcomponents/httpcore/branches/4.4.x/httpcore/pom.xml
Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/pom.xml?rev=1697920&r1=1697919&r2=1697920&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/pom.xml (original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/pom.xml Wed Aug 26 13:02:28 2015
@@ -50,6 +50,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
<version>${project.version}</version>
Modified: httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/src/test/java/org/apache/http/osgi/Common.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/src/test/java/org/apache/http/osgi/Common.java?rev=1697920&r1=1697919&r2=1697920&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/src/test/java/org/apache/http/osgi/Common.java (original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore-osgi/src/test/java/org/apache/http/osgi/Common.java Wed Aug 26 13:02:28 2015
@@ -40,6 +40,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemPackages;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
/**
* Test inherit from this.
@@ -66,15 +67,20 @@ public class Common {
@Configuration
public Option[] config() {
final String projectVersion = System.getProperty("project.version");
+ final String buildDir = System.getProperty("project.build.directory", "target");
final String paxLoggingLevel = System.getProperty("bt.osgi.pax.logging.level", "WARN");
return options(
- bundle(String.format("org.apache.httpcomponents.httpcore_%s", projectVersion)),
- mavenBundle("org.apache.httpcomponents", "httpcore-osgi", projectVersion),
+ bundle(String.format("%s/org.apache.httpcomponents.httpcore_%s",
+ buildDir,
+ projectVersion)),
+ wrappedBundle(mavenBundle().groupId("org.apache.httpcomponents")
+ .artifactId("httpcore")
+ .version(projectVersion)
+ .type("test-jar")),
mavenBundle("org.mockito", "mockito-core", getDependencyVersion("org.mockito", "mockito-core")),
systemPackages(
String.format("org.slf4j;version=\"%s\"", getDependencyVersion("org.slf4j", "slf4j-api"))
-
),
junitBundles(),
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
Modified: httpcomponents/httpcore/branches/4.4.x/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore/pom.xml?rev=1697920&r1=1697919&r2=1697920&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore/pom.xml (original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore/pom.xml Wed Aug 26 13:02:28 2015
@@ -58,6 +58,39 @@
</dependencies>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>.externalToolBuilders/**</exclude>
+ <exclude>.pmd</exclude>
+ <exclude>maven-eclipse.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<resources>
<resource>
<directory>src/main/resources</directory>