Skip to content

Commit 6b4dfc6

Browse files
committed
Jetty version bump
1 parent ed207b3 commit 6b4dfc6

28 files changed

+52
-45
lines changed

third_party/java/jetty/BUCK

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
JETTY_VERSION = '9.4.7.v20171121'
1+
JETTY_VERSION = '9.4.8.v20180619'
22

33
java_library(
44
name = 'jetty',
@@ -43,17 +43,20 @@ java_binary(
4343
':jetty-server-repacked',
4444
':jetty-servlet-repacked',
4545
':jetty-util-repacked',
46+
':jetty-xml-repacked',
4647
],
4748
)
4849

4950
REPACK = [
51+
'jetty-client',
5052
'jetty-http',
5153
'jetty-io',
5254
'jetty-jmx',
5355
'jetty-security',
5456
'jetty-server',
5557
'jetty-servlet',
5658
'jetty-util',
59+
'jetty-xml',
5760
]
5861
for i in REPACK:
5962
out = '%s-repacked' % i
@@ -74,27 +77,31 @@ for i in REPACK:
7477
export_file(
7578
name = 'jarjar-rules',
7679
src = 'jetty-repack-rules',
80+
visibility = [
81+
'//third_party/java/websocket:',
82+
],
7783
)
7884

7985
prebuilt_jar(
8086
name = 'jetty-client',
81-
maven_coords = 'org.eclipse.jetty:jetty-client:jar:9.4.7.v20170914',
82-
binary_jar = 'jetty-client-9.4.7.v20170914.jar',
83-
source_jar = 'jetty-client-9.4.7.v20170914-sources.jar',
87+
maven_coords = 'org.eclipse.jetty:jetty-client:jar:9.4.8.v20180619',
88+
binary_jar = 'jetty-client-9.4.8.v20180619.jar',
89+
source_jar = 'jetty-client-9.4.8.v20180619-sources.jar',
8490
deps = [
8591
':jetty-http',
8692
':jetty-io'
8793
],
8894
visibility = [
89-
'//third_party/java/websocket:websocket-client'
95+
'//third_party/java/websocket:',
9096
],
9197
)
9298

99+
93100
prebuilt_jar(
94101
name = 'jetty-http',
95-
maven_coords = 'org.eclipse.jetty:jetty-http:jar:9.4.8.v20171121',
96-
binary_jar = 'jetty-http-9.4.8.v20171121.jar',
97-
source_jar = 'jetty-http-9.4.8.v20171121-sources.jar',
102+
maven_coords = 'org.eclipse.jetty:jetty-http:jar:9.4.8.v20180619',
103+
binary_jar = 'jetty-http-9.4.8.v20180619.jar',
104+
source_jar = 'jetty-http-9.4.8.v20180619-sources.jar',
98105
deps = [
99106
':jetty-io',
100107
':jetty-util'
@@ -103,43 +110,42 @@ prebuilt_jar(
103110

104111
prebuilt_jar(
105112
name = 'jetty-io',
106-
maven_coords = 'org.eclipse.jetty:jetty-io:jar:9.4.8.v20171121',
107-
binary_jar = 'jetty-io-9.4.8.v20171121.jar',
108-
source_jar = 'jetty-io-9.4.8.v20171121-sources.jar',
113+
maven_coords = 'org.eclipse.jetty:jetty-io:jar:9.4.8.v20180619',
114+
binary_jar = 'jetty-io-9.4.8.v20180619.jar',
115+
source_jar = 'jetty-io-9.4.8.v20180619-sources.jar',
109116
deps = [
110117
':jetty-util'
111118
],
112119
visibility = [
113-
'//third_party/java/websocket:websocket-client',
114-
'//third_party/java/websocket:websocket-common'
120+
'//third_party/java/websocket:',
115121
],
116122
)
117123

118124
prebuilt_jar(
119125
name = 'jetty-jmx',
120-
maven_coords = 'org.eclipse.jetty:jetty-jmx:jar:9.4.8.v20171121',
121-
binary_jar = 'jetty-jmx-9.4.8.v20171121.jar',
122-
source_jar = 'jetty-jmx-9.4.8.v20171121-sources.jar',
126+
maven_coords = 'org.eclipse.jetty:jetty-jmx:jar:9.4.8.v20180619',
127+
binary_jar = 'jetty-jmx-9.4.8.v20180619.jar',
128+
source_jar = 'jetty-jmx-9.4.8.v20180619-sources.jar',
123129
deps = [
124130
':jetty-util'
125131
],
126132
)
127133

128134
prebuilt_jar(
129135
name = 'jetty-security',
130-
maven_coords = 'org.eclipse.jetty:jetty-security:jar:9.4.8.v20171121',
131-
binary_jar = 'jetty-security-9.4.8.v20171121.jar',
132-
source_jar = 'jetty-security-9.4.8.v20171121-sources.jar',
136+
maven_coords = 'org.eclipse.jetty:jetty-security:jar:9.4.8.v20180619',
137+
binary_jar = 'jetty-security-9.4.8.v20180619.jar',
138+
source_jar = 'jetty-security-9.4.8.v20180619-sources.jar',
133139
deps = [
134140
':jetty-server'
135141
],
136142
)
137143

138144
prebuilt_jar(
139145
name = 'jetty-server',
140-
maven_coords = 'org.eclipse.jetty:jetty-server:jar:9.4.8.v20171121',
141-
binary_jar = 'jetty-server-9.4.8.v20171121.jar',
142-
source_jar = 'jetty-server-9.4.8.v20171121-sources.jar',
146+
maven_coords = 'org.eclipse.jetty:jetty-server:jar:9.4.8.v20180619',
147+
binary_jar = 'jetty-server-9.4.8.v20180619.jar',
148+
source_jar = 'jetty-server-9.4.8.v20180619-sources.jar',
143149
deps = [
144150
':jetty-http',
145151
':jetty-io',
@@ -150,9 +156,9 @@ prebuilt_jar(
150156

151157
prebuilt_jar(
152158
name = 'jetty-servlet',
153-
maven_coords = 'org.eclipse.jetty:jetty-servlet:jar:9.4.8.v20171121',
154-
binary_jar = 'jetty-servlet-9.4.8.v20171121.jar',
155-
source_jar = 'jetty-servlet-9.4.8.v20171121-sources.jar',
159+
maven_coords = 'org.eclipse.jetty:jetty-servlet:jar:9.4.8.v20180619',
160+
binary_jar = 'jetty-servlet-9.4.8.v20180619.jar',
161+
source_jar = 'jetty-servlet-9.4.8.v20180619-sources.jar',
156162
deps = [
157163
':jetty-jmx',
158164
':jetty-security'
@@ -161,28 +167,26 @@ prebuilt_jar(
161167

162168
prebuilt_jar(
163169
name = 'jetty-util',
164-
maven_coords = 'org.eclipse.jetty:jetty-util:jar:9.4.8.v20171121',
165-
binary_jar = 'jetty-util-9.4.8.v20171121.jar',
166-
source_jar = 'jetty-util-9.4.8.v20171121-sources.jar',
170+
maven_coords = 'org.eclipse.jetty:jetty-util:jar:9.4.8.v20180619',
171+
binary_jar = 'jetty-util-9.4.8.v20180619.jar',
172+
source_jar = 'jetty-util-9.4.8.v20180619-sources.jar',
167173
deps = [
168174
'//third_party/java/servlet:javax.servlet-api'
169175
],
170176
visibility = [
171-
'//third_party/java/websocket:websocket-client',
172-
'//third_party/java/websocket:websocket-common'
177+
'//third_party/java/websocket:',
173178
],
174179
)
175180

176181
prebuilt_jar(
177182
name = 'jetty-xml',
178-
maven_coords = 'org.eclipse.jetty:jetty-xml:jar:9.4.7.v20170914',
179-
binary_jar = 'jetty-xml-9.4.7.v20170914.jar',
180-
source_jar = 'jetty-xml-9.4.7.v20170914-sources.jar',
183+
maven_coords = 'org.eclipse.jetty:jetty-xml:jar:9.4.8.v20180619',
184+
binary_jar = 'jetty-xml-9.4.8.v20180619.jar',
185+
source_jar = 'jetty-xml-9.4.8.v20180619-sources.jar',
181186
deps = [
182187
':jetty-util'
183188
],
184189
visibility = [
185190
'//third_party/java/websocket:websocket-client'
186191
],
187192
)
188-

third_party/java/jetty/jetty.pom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.seleniumhq.selenium</groupId>
77
<artifactId>jetty-repacked</artifactId>
8-
<version>-9.4.7.v20170914</version>
8+
<version>-9.4.8.v20180619</version>
99

1010
<name>selenium-jetty-server-repacked</name>
1111
<description>Browser automation framework dependency on jetty</description>

third_party/java/pantsbuild/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ java_binary(
66
],
77
visibility = [
88
'//third_party/java/jetty:',
9+
'//third_party/java/websocket:',
910
],
1011
)
1112

third_party/java/websocket/BUCK

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
# BUILD FILE SYNTAX: SKYLARK
2+
13
prebuilt_jar(
24
name = 'websocket-api',
3-
maven_coords = 'org.eclipse.jetty.websocket:websocket-api:jar:9.4.7.v20170914',
4-
binary_jar = 'websocket-api-9.4.7.v20170914.jar',
5-
source_jar = 'websocket-api-9.4.7.v20170914-sources.jar',
5+
maven_coords = 'org.eclipse.jetty.websocket:websocket-api:jar:9.4.8.v20180619',
6+
binary_jar = 'websocket-api-9.4.8.v20180619.jar',
7+
source_jar = 'websocket-api-9.4.8.v20180619-sources.jar',
68
)
79

810
prebuilt_jar(
911
name = 'websocket-client',
10-
maven_coords = 'org.eclipse.jetty.websocket:websocket-client:jar:9.4.7.v20170914',
11-
binary_jar = 'websocket-client-9.4.7.v20170914.jar',
12-
source_jar = 'websocket-client-9.4.7.v20170914-sources.jar',
12+
maven_coords = 'org.eclipse.jetty.websocket:websocket-client:jar:9.4.8.v20180619',
13+
binary_jar = 'websocket-client-9.4.8.v20180619.jar',
14+
source_jar = 'websocket-client-9.4.8.v20180619-sources.jar',
1315
deps = [
1416
':websocket-common',
1517
'//third_party/java/jetty:jetty-client',
@@ -18,15 +20,15 @@ prebuilt_jar(
1820
'//third_party/java/jetty:jetty-xml'
1921
],
2022
visibility = [
21-
'//third_party/java/htmlunit:htmlunit'
23+
'//third_party/java/htmlunit:htmlunit',
2224
],
2325
)
2426

2527
prebuilt_jar(
2628
name = 'websocket-common',
27-
maven_coords = 'org.eclipse.jetty.websocket:websocket-common:jar:9.4.7.v20170914',
28-
binary_jar = 'websocket-common-9.4.7.v20170914.jar',
29-
source_jar = 'websocket-common-9.4.7.v20170914-sources.jar',
29+
maven_coords = 'org.eclipse.jetty.websocket:websocket-common:jar:9.4.8.v20180619',
30+
binary_jar = 'websocket-common-9.4.8.v20180619.jar',
31+
source_jar = 'websocket-common-9.4.8.v20180619-sources.jar',
3032
deps = [
3133
':websocket-api',
3234
'//third_party/java/jetty:jetty-io',

0 commit comments

Comments
 (0)