Skip to content

[JEP-222] Add experimental WebSocket support + Jetty update in Winstone + Remoting 4.0 #4369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleg-nenashev merged 78 commits into from
Jan 21, 2020
Merged

[JEP-222] Add experimental WebSocket support + Jetty update in Winstone + Remoting 4.0 #4369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
829d739
Playing with WebSocket connections.
jglick Nov 4, 2019
e09abec
Pluggable handlers.
jglick Nov 5, 2019
5fed56d
errorWithoutStack
jglick Nov 6, 2019
bc3252d
Server-side keepalive pings.
jglick Nov 7, 2019
3484ec8
Redesigned to work as an HttpResponse.
jglick Nov 7, 2019
26e62a0
Unused dep.
jglick Nov 7, 2019
f203998
Comment on JnlpSlaveRestarterInstaller.
jglick Nov 8, 2019
9ba1334
Merge branch 'master' into websocket
jglick Nov 12, 2019
3955216
Sketch of WebSocket-based endpoint for JNLPLauncher.
jglick Nov 13, 2019
78294ae
Comment.
jglick Nov 13, 2019
b3fc024
Merge branch 'master' into websocket
jglick Nov 13, 2019
d0572b4
Merge branch 'master' into websocket
jglick Nov 20, 2019
38c663c
Test enhancement.
jglick Nov 20, 2019
7754da5
Making it more obvious from JNLPLauncherTest where remoting.jar is be…
jglick Nov 21, 2019
61a8f11
Reworked protocol to negotiate remote capabilities.
jglick Nov 21, 2019
36c456d
Unhelpful comment.
jglick Nov 21, 2019
3e9258b
Simplifying handshake to use HTTP headers.
jglick Nov 21, 2019
3f2b6cf
Moving code into top-level classes and otherwise prettifying.
jglick Nov 21, 2019
2f7ef21
Linking to upstream PRs.
jglick Nov 22, 2019
721aae1
Timestamped snapshot + incremental.
jglick Nov 22, 2019
33be1f0
Merge branch 'master' into websocket
jglick Nov 25, 2019
69e50d3
Picking up incrementalified build of winstone.
jglick Nov 25, 2019
8487eb4
Working around https://github.com/kohsuke/access-modifier/pull/17.
jglick Nov 25, 2019
1701119
Merge branch 'master' into websocket
jglick Nov 26, 2019
df54334
Finally have an incrementalified build of remoting.
jglick Nov 26, 2019
cf1fa85
Merge branch 'master' into websocket
jglick Dec 6, 2019
908c0ad
Merge branch 'jth-jetty-upgrade' into websocket
jglick Dec 9, 2019
ae34a2e
Use -webSocket option.
jglick Dec 10, 2019
4610da4
Handling some close and error methods.
jglick Dec 10, 2019
5470701
Sending X-Remoting-Minimum-Version.
jglick Dec 11, 2019
3f82697
If hudson.remoting.jnlp.Main._main fails, show the error.
jglick Dec 11, 2019
b297665
Comment.
jglick Dec 11, 2019
083ae83
GUI analogue of https://github.com/jenkinsci/remoting/pull/357/commit…
jglick Dec 11, 2019
5fd4dcf
Missing since tags.
jglick Dec 11, 2019
0771486
Capitalization.
jglick Dec 11, 2019
5b792d2
WebSockets.isSupported
jglick Dec 11, 2019
89f28b8
Rather than hiding JNLPLauncher.DescriptorImpl when the TCP port is d…
jglick Dec 11, 2019
266dc88
Form validation fixes.
jglick Dec 12, 2019
f32ee18
Minor test improvements.
jglick Dec 13, 2019
beaa296
Reworked WebSocketAgents to be compatible with JnlpAgentReceiver.
jglick Dec 13, 2019
4f19381
Removing WebSocketSession.keepAlive in favor of a global setting appl…
jglick Dec 16, 2019
cbb0c67
Add a -webSocket option to the Jenkins CLI.
jglick Dec 17, 2019
0d49c36
Using a snapshot deployment of Remoting, pending INFRA-2379.
jglick Dec 17, 2019
6a23f79
Merge branch 'master' of github.com:jenkinsci/jenkins into websocket
jglick Dec 17, 2019
d56fd17
After #3838 there is no reason to recheck authentication after parsin…
jglick Dec 17, 2019
24ecb0f
Advertise the -webSocket option.
jglick Dec 17, 2019
13bc62c
Adapt to newer HtmlUnit.
jglick Dec 17, 2019
0ebae41
Merge branch 'dns' into websocket
jglick Dec 17, 2019
4942167
Merge branch 'htmlunit' into websocket
jglick Dec 17, 2019
f70cada
Merge branch 'master' into htmlunit
jglick Dec 18, 2019
4a53dfe
https://github.com/HtmlUnit/htmlunit/pull/29 seems to have been incom…
jglick Dec 18, 2019
5346911
Tracked down a behavioral change in passing through URL-encoded path …
jglick Dec 18, 2019
1afc34d
Merge branch 'htmlunit' into websocket
jglick Dec 18, 2019
36537a5
Merge branch 'master' of github.com:jenkinsci/jenkins into websocket
jglick Dec 20, 2019
e7efeb6
Disabled TCP port does not matter in WebSocket mode.
jglick Dec 21, 2019
5845105
Shade dependencies needed for jenkins-cli.jar.
jglick Dec 21, 2019
a05ee41
Help text edit.
jglick Dec 21, 2019
b8e5b34
Merge branch 'master' of github.com:jenkinsci/jenkins into websocket
jglick Jan 3, 2020
bbcd007
https://github.com/jenkinsci/winstone/pull/79 was released as 5.5.
jglick Jan 3, 2020
37d33dc
https://github.com/jenkinsci/jenkins-test-harness/pull/183 released a…
jglick Jan 3, 2020
4cb16c1
Merge branch 'removeDeprecatedProtocols' of github.com:jeffret-b/jenk…
jglick Jan 3, 2020
4199ef4
https://github.com/jenkinsci/jenkins/pull/4387#discussion_r362696234
jglick Jan 3, 2020
760556c
Bumping remoting to a new deployed snapshot.
jglick Jan 3, 2020
c60571c
Need https://github.com/jenkinsci/winstone/pull/86.
jglick Jan 3, 2020
3e18174
https://github.com/jenkinsci/winstone/pull/86 released as 5.6.
jglick Jan 3, 2020
28d3f9f
Merge branch 'master' of github.com:jenkinsci/jenkins into websocket
jglick Jan 6, 2020
fafef5f
Introduced constant for X-Remoting-Minimum-Version.
jglick Jan 6, 2020
afa60d8
s/slave/agent/ in GUI
jglick Jan 6, 2020
cbca050
Removing in-JVM test, as it was no longer useful after introducing sh…
jglick Jan 6, 2020
be59e0f
Bump.
jglick Jan 6, 2020
c339ac3
No need to check for anonymous CONNECT here.
jglick Jan 6, 2020
8f415ff
s/jenkins.slaves/jenkins.agents/g for new code.
jglick Jan 6, 2020
b530633
Restrict the diagnostic endpoint to administrators.
jglick Jan 6, 2020
fa71331
Fixed Javadoc import after package move.
jglick Jan 7, 2020
1380d3c
Merge branch 'master' of github.com:jenkinsci/jenkins into websocket
jglick Jan 10, 2020
93c761f
Merge branch 'master' of github.com:jenkinsci/jenkins into websocket
jglick Jan 11, 2020
f83ecea
Merge branch 'master' of github.com:jenkinsci/jenkins into websocket
jglick Jan 14, 2020
fa2b193
https://github.com/jenkinsci/remoting/pull/357 released as 4.0.
jglick Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 58 additions & 32 deletions cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,17 @@
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -71,32 +74,41 @@
<groupId>org.jvnet.localizer</groupId>
<artifactId>localizer</artifactId>
<version>1.26</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>1.7.0</version>
<optional>true</optional> <!-- do not expose to core -->
<optional>true</optional>
</dependency>
<!-- ed25519 algorithm, see JENKINS-45318 -->
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
<version>0.3.0</version>
<optional>true</optional>
</dependency>
<!-- ed25519 algorithm, see JENKINS-45318 -->
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<optional>true</optional> <!-- ditto -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client-jdk</artifactId>
<version>1.12</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

Expand All @@ -107,29 +119,43 @@
<version>2.22.2</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<!-- version specified in grandparent pom -->
<executions>
<execution>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>hudson.cli.CLI</mainClass>
</manifest>
<manifestEntries>
<Jenkins-CLI-Version>${project.version}</Jenkins-CLI-Version>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>javax.websocket</pattern>
<shadedPattern>io.jenkins.cli.shaded.javax.websocket</shadedPattern>
</relocation>
<relocation>
<pattern>org</pattern>
<shadedPattern>io.jenkins.cli.shaded.org</shadedPattern>
</relocation>
<relocation>
<pattern>net</pattern>
<shadedPattern>io.jenkins.cli.shaded.net</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>hudson.cli.CLI</mainClass>
<manifestEntries>
<Jenkins-CLI-Version>${project.version}</Jenkins-CLI-Version>
</manifestEntries>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jvnet.localizer</groupId>
Expand Down
Loading