Skip to content

Commit

Permalink
Bump the java libraries we depend on to their latest versions
Browse files Browse the repository at this point in the history
Using the magic of Buck's "maven-importer" and the following maven
coordinates:

```
'org.seleniumhq.selenium:htmlunit-driver:jar:2.28.5' \
'junit:junit:jar:4.12' \
'net.bytebuddy:byte-buddy:jar:1.7.9' \
'com.google.code.gson:gson:jar:2.8.2' \
'com.google.guava:guava:jar:23.6-jre' \
'org.apache.commons:commons-exec:jar:1.3' \
'org.eclipse.jetty:jetty-security:jar:9.4.8.v20171121' \
'org.testng:testng:jar:6.13.1' \
'org.pantsbuild:jarjar:jar:1.6.5' \
'org.eclipse.jetty:jetty-util:jar:9.4.8.v20171121' \
'org.eclipse.jetty:jetty-server:jar:9.4.8.v20171121' \
'org.eclipse.jetty:jetty-servlet:jar:9.4.8.v20171121' \
'org.hamcrest:hamcrest-library:jar:1.3' \
'com.github.javaparser:javaparser-core:jar:3.5.7' \
'org.eclipse.jetty:jetty-jmx:jar:9.4.8.v20171121' \
'net.jcip:jcip-annotations:jar:1.0' \
'org.yaml:snakeyaml:jar:1.19' \
'org.mockito:mockito-core:jar:2.13.0' \
'io.netty:netty-all:jar:4.1.19.Final' \
'org.eclipse.mylyn.github:org.eclipse.egit.github.core:jar:2.1.5' \
'org.littleshoot:littleproxy:jar:1.1.2' \
'org.slf4j:slf4j-jdk14:jar:1.7.25'
```

The version of LittleProxy we use is a snapshot and is the old
version from previously with dependencies updated.
  • Loading branch information
shs96c committed Dec 28, 2017
1 parent f539e43 commit 006aa17
Show file tree
Hide file tree
Showing 222 changed files with 357 additions and 841 deletions.
4 changes: 2 additions & 2 deletions .idea/libraries/byte_buddy.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions .idea/libraries/dnsjava.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/libraries/dnssec4j.xml

This file was deleted.

6 changes: 3 additions & 3 deletions .idea/libraries/guava.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/htmlunit.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/javaparser.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/jcip_annotations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/jcommander.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions .idea/libraries/jetty_util.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/libraries/little_proxy.xml

This file was deleted.

9 changes: 9 additions & 0 deletions .idea/libraries/littleproxy.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/mockito_core.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/netty.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions .idea/libraries/slf4j.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/snakeyaml.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/testng.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions java/client/.classpath
Expand Up @@ -6,40 +6,40 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="/third-party/java/guava/guava-23.0.jar" sourcepath="/third-party/java/guava/guava-23.0-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/htmlunit/htmlunit-2.28.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.28-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/htmlunit/neko-htmlunit-2.28.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.28-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/htmlunit/htmlunit-core-js-2.28.jar" sourcepath="/third-party/java/htmlunit/htmlunit-core-js-2.28-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/selenium/htmlunit-driver-2.28.jar" sourcepath="/third-party/java/selenium/htmlunit-driver-2.28.jar"/>
<classpathentry kind="lib" path="/third-party/java/guava/guava-23.6-jre.jar" sourcepath="/third-party/java/guava/guava-23.6-jre-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.28.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.28-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/htmlunit/neko-htmlunit-2.28.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.28-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.28.jar" sourcepath="/third-party/java/htmlunit/htmlunit-core-js-2.28-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/selenium/htmlunit-driver-2.28.5.jar" sourcepath="/third-party/java/selenium/htmlunit-driver-2.28.5-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/commons/commons-exec-1.3.jar" sourcepath="/third-party/java/commons/commons-exec-1.3-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
<classpathentry kind="lib" path="/third_party/java/jetty/jetty-util-9.4.7.v20170914.jar" sourcepath="/third-party/java/jetty/jetty-util-9.4.7.v20170914-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/jetty/jetty-util-9.4.8.v20171121.jar" sourcepath="/third-party/java/jetty/jetty-util-9.4.8.v20171121-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/servlet/javax.servlet-api-3.1.0.jar" sourcepath="/third-party/java/servlet/javax.servlet-api-3.1.0-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.3.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.3-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.6.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.6-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.2.jar"/>
<classpathentry kind="lib" path="/third_party/java/commons-io/commons-io-2.6.jar" sourcepath="/third-party/java/commons-io/commons-io-2.7-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/commons-io/commons-io-2.6.jar" sourcepath="/third-party/java/commons-io/commons-io-2.7-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.10.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.10-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/css/sac-1.3.jar" sourcepath="/third-party/java/css/sac-1.3-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/commons/commons-lang3-3.7.jar" sourcepath="/third-party/java/commons/commons-lang3-3.7-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/commons/commons-lang3-3.7.jar" sourcepath="/third-party/java/commons/commons-lang3-3.7-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.5.3.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5.3-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/cssparser/cssparser-0.9.24.jar" sourcepath="/third-party/java/cssparser/cssparser-0.9.24-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.24.jar" sourcepath="/third-party/java/cssparser/cssparser-0.9.24-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/xerces/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xerces/xercesImpl-2.11.0-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/xalan/xalan-2.7.2.jar"/>
<classpathentry kind="lib" path="/third-party/java/little_proxy/littleproxy-1.1.2.jar" sourcepath="/third-party/java/little_proxy/littleproxy-1.1.2-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/websocket/websocket-api-9.4.7.v20170914.jar" sourcepath="/third-party/java/websocket/websocket-api-9.4.7.v20170914-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/websocket/websocket-client-9.4.7.v20170914.jar" sourcepath="/third-party/java/websocket/websocket-client-9.4.7.v20170914-sources.jar"/>
<classpathentry kind="lib" path="/third_party/java/websocket/websocket-common-9.4.7.v20170914.jar" sourcepath="/third-party/java/websocket/websocket-common-9.4.7.v20170914-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/netty/netty-all-4.1.14.Final.jar"/>
<classpathentry kind="lib" path="/third-party/java/littleshoot/littleproxy-1.1.3-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/third-party/java/websocket/websocket-api-9.4.7.v20170914.jar" sourcepath="/third-party/java/websocket/websocket-api-9.4.7.v20170914-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/websocket/websocket-client-9.4.7.v20170914.jar" sourcepath="/third-party/java/websocket/websocket-client-9.4.7.v20170914-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/websocket/websocket-common-9.4.7.v20170914.jar" sourcepath="/third-party/java/websocket/websocket-common-9.4.7.v20170914-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/netty/netty-all-4.1.19.Final.jar"/>
<classpathentry kind="lib" path="/third-party/java/xml-apis/xml-apis-1.4.01.jar"/>
<classpathentry kind="lib" path="/third_party/java/mockito/mockito-core-2.12.0.jar"/>
<classpathentry kind="lib" path="/third_party/java/objenesis/objenesis-2.6.jar"/>
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-api-1.6.6.jar"/>
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-jdk14-1.6.6.jar"/>
<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-2.13.0.jar"/>
<classpathentry kind="lib" path="/third-party/java/objenesis/objenesis-2.6.jar"/>
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-api-1.7.25.jar"/>
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-jdk14-1.7.25.jar"/>
<classpathentry kind="lib" path="/third-party/java/gson/gson-2.8.2.jar"/>
<classpathentry kind="lib" path="/third-party/java/testng/testng-6.9.9.jar" sourcepath="/third-party/java/testng/testng-6.9.9-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/testng/testng-6.13.1.jar" sourcepath="/third-party/java/testng/testng-6.13.1-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/github/org.eclipse.egit.github.core-2.1.5.jar" sourcepath="/third-party/java/github/org.eclipse.egit.github.core-2.1.5.jar-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/bytebuddy/byte-buddy-1.7.5.jar" sourcepath="/third-party/java/bytebuddy/byte-buddy-1.7.5-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/javaparser/javaparser-core-3.4.0.jar" sourcepath="/third-party/java/javaparser/javaparser-core-3.4.0-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/bytebuddy/byte-buddy-1.7.9.jar" sourcepath="/third-party/java/bytebuddy/byte-buddy-1.7.9-sources.jar"/>
<classpathentry kind="lib" path="/third-party/java/javaparser/javaparser-core-3.5.7.jar" sourcepath="/third-party/java/javaparser/javaparser-core-3.5.7-sources.jar"/>
<classpathentry kind="output" path="build/production"/>
</classpath>
5 changes: 1 addition & 4 deletions java/client/client.iml
Expand Up @@ -33,16 +33,13 @@
<orderEntry type="library" name="testng" level="project" />
<orderEntry type="library" name="xml-apis" level="project" />
<orderEntry type="library" name="sac" level="project" />
<orderEntry type="library" scope="TEST" name="dnsjava" level="project" />
<orderEntry type="library" scope="TEST" name="dnssec4j" level="project" />
<orderEntry type="library" name="jetty" level="project" />
<orderEntry type="library" scope="TEST" name="little_proxy" level="project" />
<orderEntry type="library" scope="TEST" name="littleproxy" level="project" />
<orderEntry type="library" scope="TEST" name="slf4j" level="project" />
<orderEntry type="library" name="mockito-core" level="project" />
<orderEntry type="library" name="objenesis" level="project" />
<orderEntry type="library" name="commons-httpclient" level="project" />
<orderEntry type="library" scope="TEST" name="websocket" level="project" />
<orderEntry type="library" scope="TEST" name="jetty-util" level="project" />
<orderEntry type="library" scope="TEST" name="github" level="project" />
<orderEntry type="library" name="javaparser" level="project" />
</component>
Expand Down
1 change: 1 addition & 0 deletions java/client/src/org/openqa/selenium/json/Json.java
Expand Up @@ -48,6 +48,7 @@ public class Json {
.serializeNulls()
.create();

public static final Type LIST_OF_MAPS_TYPE = new TypeToken<List<Map<String, Object>>>() {}.getType();
public static final Type MAP_TYPE = new TypeToken<Map<String, Object>>() {}.getType();
public static final Type OBJECT_TYPE = new TypeToken<Object>() {}.getType();

Expand Down
1 change: 0 additions & 1 deletion java/client/src/org/openqa/selenium/lift/BUCK
Expand Up @@ -9,7 +9,6 @@ java_library(name = 'lift',
'//java/client/src/org/openqa/selenium:selenium',
'//java/client/src/org/openqa/selenium/support:support',
'//third_party/java/guava:guava',
'//third_party/java/hamcrest:hamcrest-core',
'//third_party/java/hamcrest:hamcrest-library',
'//third_party/java/junit:junit',
],
Expand Down
4 changes: 1 addition & 3 deletions java/client/src/org/openqa/selenium/remote/BUCK
Expand Up @@ -65,7 +65,7 @@ java_library(name = 'remote',
'//java/client/src/org/openqa/selenium:selenium',
],
deps = [
'//third_party/java/bytebuddy:bytebuddy',
'//third_party/java/bytebuddy:byte-buddy',
'//third_party/java/guava:guava',
],
visibility = ['PUBLIC'],
Expand Down Expand Up @@ -139,12 +139,10 @@ java_library(name = 'remote-lib',
'//java/client/src/org/openqa/selenium/json:json',
'//java/client/src/org/openqa/selenium/remote/session:session',
'//third_party/java/httpcomponents:httpclient',
'//third_party/java/httpcomponents:httpcore',
],
deps = [
':http-session-id',
'//java/client/src/org/openqa/selenium:selenium',
'//third_party/java/gson:gson',
'//third_party/java/guava:guava',
],
)
Expand Down

0 comments on commit 006aa17

Please sign in to comment.