Skip to content

Commit

Permalink
SimonStewart: Bumping junit to 4.9
Browse files Browse the repository at this point in the history 
r13950
  • Loading branch information
@shs96c
shs96c committed Sep 26, 2011
1 parent c1ad9bd commit 15d8ff3
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 65 deletions.
120 changes: 60 additions & 60 deletions .classpath
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="java/server/src"/>
<classpathentry kind="src" path="java/client/src"/>
<classpathentry kind="src" path="java/client/test"/>
<classpathentry kind="src" path="java/server/test"/>
<classpathentry kind="lib" path="third_party/java/junit/junit-dep-4.8.1.jar"/>
<classpathentry kind="lib" path="third_party/java/easymock/easymockclassextension-2.4.jar"/>
<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-core-js-2.9.jar"/>
<classpathentry kind="lib" path="third_party/java/bcprov/bcprov-jdk15-135.jar"/>
<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-2.9.jar"/>
<classpathentry kind="lib" path="third_party/java/easymock/easymock-2.4.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-httpclient/httpclient-4.1.2.jar" sourcepath="third_party/java/apache-httpclient/httpclient-4.1.2-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-httpclient/httpcore-4.1.3.jar" sourcepath="third_party/java/apache-httpclient/httpcore-4.1.3-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-httpclient/httpmime-4.1.2.jar" sourcepath="third_party/java/apache-httpclient/httpmime-4.1.2-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/cglib/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-collections/commons-collections-3.2.1.jar" sourcepath="third_party/java/commons-collections/commons-collections-3.2.1-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-io/commons-io-2.0.1.jar" sourcepath="third_party/java/commons-io/commons-io-2.0.1-src.zip"/>
<classpathentry kind="lib" path="third_party/java/commons-lang/commons-lang-2.6.jar" sourcepath="third_party/java/commons-lang/commons-lang-2.6-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-codec/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="third_party/java/hamcrest/hamcrest-all-1.1.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-logging/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jna/jna-3.3.0.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-lite-7.2.0-repackaged-for-android.jar"/>
<classpathentry kind="lib" path="third_party/java/mx4j/mx4j-tools-3.0.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-webapp-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/json/json-20080701.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-server-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-continuation-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-xml-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-http-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-websocket-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/testng/testng-6.0.1-nobsh-noguice.jar" sourcepath="third_party/java/testng/testng-6.0.1-nobsh-noguice-src.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-io-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-servlets-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-security-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-util-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/servlet-api/servlet-api-2.5-6.1.9.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-servlet-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/guava-libraries/guava-r09.jar" sourcepath="third_party/java/guava-libraries/guava-r09-src.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jasper-compiler-jdt-5.5.15.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jasper-compiler-5.5.15.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jsp-api-2.0.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jasper-runtime-5.5.15.jar"/>
<classpathentry kind="lib" path="third_party/java/yaml/snakeyaml-1.8.jar"/>
<classpathentry kind="lib" path="third_party/java/sac/sac-1.3.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-mime4j/apache-mime4j-0.6.jar"/>
<classpathentry kind="lib" path="third_party/java/xml/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="third_party/java/cssparser/cssparser-0.9.5.jar"/>
<classpathentry kind="lib" path="third_party/java/nekohtml/nekohtml-1.9.15.jar"/>
<classpathentry kind="lib" path="third_party/java/xml/xalan-2.7.1.jar"/>
<classpathentry kind="lib" path="third_party/java/opera-driver/operadriver-v0.7.3.jar"/>
<classpathentry kind="lib" path="third_party/java/jmock/jmock-junit4-2.5.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jmock/jmock-2.5.1.jar"/>
<classpathentry kind="lib" path="third_party/java/google-protobuffers/protobuf-java-2.4.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jcip-annotations/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-jxpath/commons-jxpath-1.3.jar"/>
<classpathentry kind="output" path="out/production/selenium"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="java/server/src"/>
<classpathentry kind="src" path="java/client/src"/>
<classpathentry kind="src" path="java/client/test"/>
<classpathentry kind="src" path="java/server/test"/>
<classpathentry kind="var" path="USER_HOME/src/update-webdriver/third_party/java/junit/junit-dep-4.9.jar"/>
<classpathentry kind="lib" path="third_party/java/easymock/easymockclassextension-2.4.jar"/>
<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-core-js-2.9.jar"/>
<classpathentry kind="lib" path="third_party/java/bcprov/bcprov-jdk15-135.jar"/>
<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-2.9.jar"/>
<classpathentry kind="lib" path="third_party/java/easymock/easymock-2.4.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-httpclient/httpclient-4.1.2.jar" sourcepath="third_party/java/apache-httpclient/httpclient-4.1.2-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-httpclient/httpcore-4.1.3.jar" sourcepath="third_party/java/apache-httpclient/httpcore-4.1.3-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-httpclient/httpmime-4.1.2.jar" sourcepath="third_party/java/apache-httpclient/httpmime-4.1.2-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/cglib/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-collections/commons-collections-3.2.1.jar" sourcepath="third_party/java/commons-collections/commons-collections-3.2.1-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-io/commons-io-2.0.1.jar" sourcepath="third_party/java/commons-io/commons-io-2.0.1-src.zip"/>
<classpathentry kind="lib" path="third_party/java/commons-lang/commons-lang-2.6.jar" sourcepath="third_party/java/commons-lang/commons-lang-2.6-sources.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-codec/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="third_party/java/hamcrest/hamcrest-all-1.1.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-logging/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jna/jna-3.3.0.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-lite-7.2.0-repackaged-for-android.jar"/>
<classpathentry kind="lib" path="third_party/java/mx4j/mx4j-tools-3.0.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-webapp-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/json/json-20080701.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-server-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-continuation-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-xml-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-http-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-websocket-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/testng/testng-6.0.1-nobsh-noguice.jar" sourcepath="third_party/java/testng/testng-6.0.1-nobsh-noguice-src.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-io-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-servlets-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-security-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-util-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/servlet-api/servlet-api-2.5-6.1.9.jar"/>
<classpathentry kind="lib" path="third_party/java/jetty/jetty-servlet-7.2.0.v20101020.jar"/>
<classpathentry kind="lib" path="third_party/java/guava-libraries/guava-r09.jar" sourcepath="third_party/java/guava-libraries/guava-r09-src.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jasper-compiler-jdt-5.5.15.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jasper-compiler-5.5.15.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jsp-api-2.0.jar"/>
<classpathentry kind="lib" path="third_party/java/jasper/jasper-runtime-5.5.15.jar"/>
<classpathentry kind="lib" path="third_party/java/yaml/snakeyaml-1.8.jar"/>
<classpathentry kind="lib" path="third_party/java/sac/sac-1.3.jar"/>
<classpathentry kind="lib" path="third_party/java/apache-mime4j/apache-mime4j-0.6.jar"/>
<classpathentry kind="lib" path="third_party/java/xml/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="third_party/java/cssparser/cssparser-0.9.5.jar"/>
<classpathentry kind="lib" path="third_party/java/nekohtml/nekohtml-1.9.15.jar"/>
<classpathentry kind="lib" path="third_party/java/xml/xalan-2.7.1.jar"/>
<classpathentry kind="lib" path="third_party/java/opera-driver/operadriver-v0.7.3.jar"/>
<classpathentry kind="lib" path="third_party/java/jmock/jmock-junit4-2.5.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jmock/jmock-2.5.1.jar"/>
<classpathentry kind="lib" path="third_party/java/google-protobuffers/protobuf-java-2.4.1.jar"/>
<classpathentry kind="lib" path="third_party/java/jcip-annotations/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="third_party/java/commons-jxpath/commons-jxpath-1.3.jar"/>
<classpathentry kind="output" path="out/production/selenium"/>
</classpath>
2 changes: 1 addition & 1 deletion maven/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<version>4.9</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion rake-tasks/crazy_fun/mappings/java.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module CrazyFunJava
def self.ant
@ant ||= (
require 'third_party/java/eclipse_compiler/ecj-3.5.2.jar'
require 'third_party/java/junit/junit-dep-4.8.1.jar'
require 'third_party/java/junit/junit-dep-4.9.jar'

Ant.load_bundled

Expand Down
7 changes: 5 additions & 2 deletions selenium.eml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<excludeFolder url="file://$MODULE_DIR$/build"/>
<excludeFolder url="file://$MODULE_DIR$/common/build"/>
</contentEntry>
<lib name="junit-dep-4.8.1.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/junit/junit-dep-4.8.1.jar!/"/>
<lib name="junit-dep-4.9.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/junit/junit-dep-4.9.jar!/"/>
</lib>
<lib name="easymockclassextension-2.4.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/easymock/easymockclassextension-2.4.jar!/"/>
Expand Down Expand Up @@ -175,4 +175,7 @@
<lib name="jcip-annotations-1.0.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/jcip-annotations/jcip-annotations-1.0.jar!/"/>
</lib>
<lib name="commons-jxpath-1.3.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/commons-jxpath/commons-jxpath-1.3.jar!/"/>
</lib>
</component>
2 changes: 1 addition & 1 deletion third_party/java/junit/build.desc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
java_library(name = "junit",
deps = [
"junit-dep-4.8.1.jar",
"junit-dep-4.9.jar",
"//third_party/java/hamcrest",
])
Binary file removed third_party/java/junit/junit-4.8.1-src.jar
View file
Binary file not shown.
Binary file removed third_party/java/junit/junit-dep-4.8.1.jar
View file
Binary file not shown.
Binary file added third_party/java/junit/junit-dep-4.9.jar
View file
Binary file not shown.

0 comments on commit 15d8ff3

Please sign in to comment.