Skip to content

Commit

Permalink
Merge pull request #22 from sonatype/merge-litmus
Browse files Browse the repository at this point in the history 
REVIEW: Merge litmus project into goodies
  • Loading branch information
@jdillon
jdillon committed Mar 1, 2014
2 parents b372b20 + d031796 commit 92811c2
Show file tree
Hide file tree
Showing 77 changed files with 6,582 additions and 9 deletions.
176 changes: 167 additions & 9 deletions pom.xml
View file
Expand Up @@ -47,15 +47,53 @@
</prerequisites>

<properties>
<slf4j.version>1.7.6</slf4j.version>
<sisu-guice.version>3.1.10</sisu-guice.version>
<powermock.version>1.5</powermock.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.6</version>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.0.13</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
</dependency>

<dependency>
<groupId>org.sonatype.gossip</groupId>
<artifactId>gossip-bootstrap</artifactId>
<version>1.8</version>
</dependency>

<dependency>
<groupId>org.sonatype.gossip</groupId>
<artifactId>gossip-support</artifactId>
<version>1.8</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -124,12 +162,6 @@
<version>12.0</version>
</dependency>

<dependency>
<groupId>org.sonatype.gossip</groupId>
<artifactId>gossip-support</artifactId>
<version>1.8</version>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
Expand All @@ -142,6 +174,125 @@
<version>5.0.1.Final</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
</dependency>

<dependency>
<groupId>org.incava</groupId>
<artifactId>java-diff</artifactId>
<version>1.1</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${powermock.version}</version>
<exclusions>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-rule</artifactId>
<version>${powermock.version}</version>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-classloading-xstream</artifactId>
<version>${powermock.version}</version>
</dependency>

<!-- mockito-core and powermock-reflect depend on different versions of objenesis, force newest -->
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>1.3</version>
</dependency>

<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert-core</artifactId>
<version>2.0M10</version>
</dependency>

<dependency>
<groupId>org.databene</groupId>
<artifactId>contiperf</artifactId>
<version>2.2.0</version>
</dependency>

<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-junit</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-guice</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<version>1.38</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
</exclusion>
<exclusion>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- INTERNAL (DO NOT USE ${project.version}) -->

<dependency>
Expand Down Expand Up @@ -174,6 +325,12 @@
<version>1.10-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.sonatype.sisu.goodies</groupId>
<artifactId>goodies-testsupport</artifactId>
<version>1.10-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.sonatype.sisu.goodies</groupId>
<artifactId>goodies-eventbus</artifactId>
Expand Down Expand Up @@ -230,6 +387,7 @@
<module>lifecycle</module>
<module>marshal</module>
<module>thread</module>
<module>testsupport</module>
<module>eventbus</module>
<module>crypto</module>
<module>template</module>
Expand Down Expand Up @@ -285,15 +443,15 @@
<configuration>
<rules>
<requireMavenVersion>
<version>[3.0,)</version>
<version>[3.0.4,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.6,)</version>
</requireJavaVersion>
<bannedDependencies>
<searchTransitive>true</searchTransitive>
<excludes>
<!-- Keep old junits out -->
<!-- Keep old junit out -->
<exclude>junit:junit:(,4.10]</exclude>
<exclude>junit:junit-dep</exclude>

Expand Down

0 comments on commit 92811c2

Please sign in to comment.