Skip to content

Commit

Permalink
i can finally build / install the maven artifacts!
Browse files Browse the repository at this point in the history
adding maven_coords to third_party prebuilt jar libraries, so pom generation can be successful

removing jetty-repacked-rc, No More RC!

cleanups / fixups to Rakefile

updating information about Maven in README
  • Loading branch information
lukeis committed Jul 7, 2016
1 parent 1160d49 commit 11955e8
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 98 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ targets.
## Maven _per se_

If it is not clear already, Selenium is not built with Maven, it is
built with [Crazy-Fun](https://github.com/SeleniumHQ/selenium/wiki/Crazy-Fun-Build)
built with [Buck](https://github.com/SeleniumHQ/buck),
though that is invoked with *go* as outlined above so you do not really
have to learn too much about that.

Expand All @@ -297,10 +297,10 @@ and deploy into you local maven repository (`~/.m2/repository`), while
skipping Selenium's own tests.

```sh
./go maven-dry-run
./go maven-install
```

Read the build output to find the maven jars. You can also publish
The maven jars should now be in your local ~/.m2/repository. You can also publish
directly using Buck:

```sh
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ JAVA_RELEASE_TARGETS = [
'//java/client/src/org/openqa/selenium/remote:remote',
'//java/client/src/org/openqa/selenium/safari:safari',
'//java/server/src/com/thoughtworks/selenium:leg-rc',
'//java/server/src/org/openqa/selenium/remote/server:server',
'//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
]


Expand Down Expand Up @@ -558,7 +558,7 @@ task :'maven-install' => JAVA_RELEASE_TARGETS do |t|
t.prerequisites.each do |p|
if JAVA_RELEASE_TARGETS.include?(p)
creds = read_user_pass_from_m2_settings()
Buck::buck_cmd.call('publish', ['--remote-repo', "file://#{ENV['HOME']}/.m2/repository", '--include-source', '--include-javadoc', '-u', creds[0], '-p', creds[1], p, '-v', '10'])
Buck::buck_cmd.call('publish', ['--remote-repo', "file://#{ENV['HOME']}/.m2/repository", '--include-source', '--include-javadoc', '-u', creds[0], '-p', creds[1], p])
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion SELENIUM_VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SE_VERSION = '3.0.0-beta1'
SE_VERSION = '3.0.0-beta1-SNAPSHOT'

1 change: 0 additions & 1 deletion java/server/src/org/openqa/grid/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ java_library(name = 'grid',
'//third_party/java/httpcomponents:httpclient',
'//third_party/java/jcip_annotations:jcip_annotations',
'//third_party/java/jetty:jetty',
'//third_party/java/jetty:jetty-for-rc',
'//third_party/java/servlet:servlet-api',
'//third_party/java/yaml:snakeyaml',
'//third_party/java/beust:jcommander',
Expand Down
1 change: 1 addition & 0 deletions third_party/java/hamcrest/BUCK
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
java_library(name = 'hamcrest',
maven_coords = 'org.hamcrest:hamcrest-all:1.3',
exported_deps = [
':core',
':library',
Expand Down
1 change: 1 addition & 0 deletions third_party/java/htmlunit/BUCK
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
prebuilt_jar(name = 'htmlunit-driver',
maven_coords = 'org.seleniumhq.selenium:htmlunit-driver:2.21',
binary_jar = 'htmlunit-driver-2.21.jar',
deps = [
':htmlunit',
Expand Down
1 change: 1 addition & 0 deletions third_party/java/jcip_annotations/BUCK
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
prebuilt_jar(name = 'jcip_annotations',
maven_coords = 'net.jcip:jcip_annotations:1.0',
binary_jar = 'jcip-annotations-1.0.jar',
visibility = [
'//java/server/src/org/openqa/grid:grid',
Expand Down
17 changes: 2 additions & 15 deletions third_party/java/jetty/BUCK
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
java_library(
name = 'jetty',
maven_coords = 'org.seleniumhq.selenium:jetty-repacked:9.2.13.v20150730',
exported_deps = [
':jetty-http-repacked',
':jetty-security-repacked',
Expand All @@ -26,21 +27,6 @@ java_library(
'//java/server/test/org/openqa/selenium/remote/server/auth:lib',
],
)

prebuilt_jar(name = 'jetty-for-rc',
binary_jar = 'jetty-repacked-5.jar',
deps = [
'//third_party/java/commons-logging:commons-logging',
'//third_party/java/jasper:jasper',
'//third_party/java/mx4j:mx4j',
'//third_party/java/servlet:servlet-api',
],
visibility = [
'//java/server/src/org/openqa/selenium/server:server',
'//java/server/src/org/openqa/grid:grid',
'//third_party/java/servlet:servlet-api'
],
)

REPACK = [
'jetty-continuation',
Expand All @@ -65,6 +51,7 @@ for i in REPACK:

prebuilt_jar(
name = out,
maven_coords = 'org.seleniumhq.selenium:%s:9.2.13.v20150730' % out,
binary_jar = ':%s' % name
)

Expand Down
Binary file removed third_party/java/jetty/jetty-repacked-5-sources.jar
Binary file not shown.
Binary file removed third_party/java/jetty/jetty-repacked-5.jar
Binary file not shown.
76 changes: 0 additions & 76 deletions third_party/java/jetty/jetty-repacked-5.pom

This file was deleted.

1 change: 1 addition & 0 deletions third_party/java/junit/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
prebuilt_jar(name = 'junit',
binary_jar = 'junit-4.12.jar',
source_jar = 'junit-4.12-sources.jar',
maven_coords = 'junit:junit:4.12',
deps = [
'//third_party/java/hamcrest:hamcrest',
],
Expand Down
1 change: 1 addition & 0 deletions third_party/java/netty/BUCK
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
prebuilt_jar(name = 'netty',
binary_jar = 'netty-3.5.7.Final.jar',
maven_coords = 'io.netty:netty:3.5.7.Final',
visibility = [
'//java/client/src/org/openqa/selenium/safari:safari',
'//java/client/test/org/openqa/selenium/safari:tests',
Expand Down
1 change: 1 addition & 0 deletions third_party/java/phantomjs-driver/BUCK
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
prebuilt_jar(name = 'phantomjs-driver',
maven_coords = 'com.github.detro.ghostdriver:phantomjsdriver:1.1.0',
binary_jar = 'phantomjsdriver-1.2.1.jar',
deps = [
'//java/client/src/org/openqa/selenium/remote:remote',
Expand Down

0 comments on commit 11955e8

Please sign in to comment.