Skip to content

Commit

Permalink
Migrate code from EasyMock 2.4 to 3.1.
Browse files Browse the repository at this point in the history
Remove Artifactory dependency.

RB=98260
R=dhoa,jwalker,sihde,si-dev
A=jwalker
  • Loading branch information
Keren Jin committed Nov 30, 2012
1 parent 050b09f commit de68160
Show file tree
Hide file tree
Showing 13 changed files with 146 additions and 161 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ ext.externalDependency = [
'commonsHttpClient': 'commons-httpclient:commons-httpclient:3.1',
'commonsIo': 'commons-io:commons-io:1.4',
'commonsLang': 'commons-lang:commons-lang:2.4',
'easymock': 'org.easymock:easymock:2.4',
'easymockClassExtension': 'org.easymock:easymock-class-extension:2.4',
'easymock': 'org.easymock:easymock:3.1',
'googleCollections': 'com.google.collections:google-collections:1.0-rc2',
'jacksonCoreAsl': 'org.codehaus.jackson:jackson-core-asl:1.4.2',
'jacksonMapperAsl': 'org.codehaus.jackson:jackson-mapper-asl:1.4.2',
Expand All @@ -33,6 +32,7 @@ ext.externalDependency = [
'log4j': 'log4j:log4j:1.2.15',
'mina': 'org.apache.mina:mina-core:1.1.7',
'netty': 'org.jboss.netty:netty:3.2.3.Final',
'objenesis': 'org.objenesis:objenesis:1.2',
'parseq': 'com.linkedin.parseq:parseq:1.0.0',
'servletApi': 'javax.servlet:servlet-api:2.5',
'slf4jApi': 'org.slf4j:slf4j-api:1.6.2',
Expand Down
2 changes: 1 addition & 1 deletion d2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies {
testCompile externalDependency.testng
testCompile externalDependency.commonsIo
testCompile externalDependency.easymock
testCompile externalDependency.easymockClassExtension
testCompile project(':r2-jetty')
testRuntime externalDependency.cglib
}

task packup(dependsOn: configurations.default.allArtifacts, type: Copy) {
Expand Down
Loading

0 comments on commit de68160

Please sign in to comment.