Skip to content

Commit

Permalink
Update dep versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdillon
jdillon committed Nov 10, 2012
1 parent 0d17e8e commit 2448482
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 149 deletions.
2 changes: 1 addition & 1 deletion README → README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Testing Harness for http-based tests.
# Testing Harness for http-based tests.

The purpose of this harness is to be able to execute the same test code for
many server configurations. Instead of setting up a server fixture in every
Expand Down
2 changes: 0 additions & 2 deletions harness-runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

<artifactId>harness-runner</artifactId>

<name>Base for SuiteConfiguration test runners</name>

<dependencies>
<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
Expand Down
35 changes: 18 additions & 17 deletions hth-api/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.http-testing-harness</groupId>
<version>0.6-SNAPSHOT</version>
<artifactId>hth-parent</artifactId>
</parent>

<artifactId>hth-api</artifactId>

<name>HTTP Tests API</name>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -21,21 +22,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
<Import-Package>
!org.sonatype.tests.http.runner.api,
!org.sonatype.tests.http.server.api,
*
</Import-Package>
<Export-Package>
org.sonatype.tests.http.runner.api,
org.sonatype.tests.http.server.api
</Export-Package>
</instructions>
</configuration>
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
<Import-Package>
!org.sonatype.tests.http.runner.api,
!org.sonatype.tests.http.server.api,
*
</Import-Package>
<Export-Package>
org.sonatype.tests.http.runner.api,
org.sonatype.tests.http.server.api
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
9 changes: 5 additions & 4 deletions junit-runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@

<artifactId>junit-runner</artifactId>

<name>JUnit 3/4 SuiteConfiguration Test Runner</name>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>hth-api</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>harness-runner</artifactId>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>harness-runner</artifactId>
</dependency>
</dependencies>

Expand Down
131 changes: 66 additions & 65 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -13,8 +14,6 @@
<artifactId>hth-parent</artifactId>
<packaging>pom</packaging>

<name>http-testing-harness Parent Module</name>

<url>http://sonatype.org</url>
<description>Parent and aggregator for the testing harness for HTTP clients.</description>
<inceptionYear>2010</inceptionYear>
Expand Down Expand Up @@ -56,101 +55,57 @@
<forgeReleaseUrl>https://repository.sonatype.org/service/local/staging/deploy/maven2</forgeReleaseUrl>
</properties>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
<groupId>org.sonatype.sisu.litmus</groupId>
<artifactId>litmus-testsupport</artifactId>
<version>1.4</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
<version>1.7.2</version>
</dependency>

<!-- INTERNAL -->

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>hth-api</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>server-provider</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>junit-runner</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>harness-runner</artifactId>
<version>${project.version}</version>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>harness-runner</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java15</artifactId>
<version>1.0</version>
</signature>
</configuration>
<executions>
<execution>
<id>check-java-1.5-compat</id>
<phase>process-classes</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-versions</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>2.0.9</version>
</requireMavenVersion>
<requireJavaVersion>
<version>1.5</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
Expand All @@ -172,8 +127,8 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
<link>http://java.sun.com/javase/5/docs/api/</link>
Expand Down Expand Up @@ -209,6 +164,52 @@
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java15</artifactId>
<version>1.0</version>
</signature>
</configuration>
<executions>
<execution>
<id>check-java-1.5-compat</id>
<phase>process-classes</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-versions</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>2.0.9</version>
</requireMavenVersion>
<requireJavaVersion>
<version>1.5</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
Expand Down
64 changes: 30 additions & 34 deletions server-provider/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -10,64 +11,59 @@
<artifactId>server-provider</artifactId>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>8.1.1.v20120215</jetty.version>
</properties>

<name>Jetty Server Provider</name>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>hth-api</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.26</version>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${jetty.version}</version>
</dependency>

<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
<version>1.0</version>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
<groupId>org.sonatype.sisu.litmus</groupId>
<artifactId>litmus-testsupport</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.sisu.goodies</groupId>
<artifactId>goodies-common</artifactId>
<version>1.0</version>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>junit-runner</artifactId>
<scope>test</scope>
<groupId>org.sonatype.sisu.goodies</groupId>
<artifactId>goodies-common</artifactId>
<version>1.4</version>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>junit-runner</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
Loading

0 comments on commit 2448482

Please sign in to comment.