Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5154 from eclipse/jetty-10.0.x-SurefireUpdateWebSocketFailure 

Fix WebSocketServerExamplesTest to work after maven surefire update
This commit is contained in:
Lachlan 2020-08-17 09:45:52 +10:00 committed by GitHub
parent 74a16382ab de1077c375
commit 471a06dc37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/websocket-javax-server/pom.xml
View File

@ -51,7 +51,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.websocket.javax.server/org.eclipse.jetty.websocket.javax.server.examples=org.eclipse.jetty.websocket.javax.common --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server
</argLine>
</configuration>
</plugin>

2
jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java → jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionConfigurator.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.server.examples;
package org.eclipse.jetty.websocket.javax.tests.server.examples;
import javax.servlet.http.HttpSession;
import javax.websocket.HandshakeResponse;

2
jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java → jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionSocket.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.server.examples;
package org.eclipse.jetty.websocket.javax.tests.server.examples;
import java.io.IOException;
import javax.servlet.http.HttpSession;

2
jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java → jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedConfigurator.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.server.examples;
package org.eclipse.jetty.websocket.javax.tests.server.examples;
import java.security.Principal;
import javax.websocket.HandshakeResponse;

2
jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java → jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedSocket.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.server.examples;
package org.eclipse.jetty.websocket.javax.tests.server.examples;
import javax.websocket.OnMessage;
import javax.websocket.server.ServerEndpoint;

2
jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java → jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/StreamingEchoSocket.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.server.examples;
package org.eclipse.jetty.websocket.javax.tests.server.examples;
import java.io.IOException;
import java.io.Reader;

2
jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java → jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/WebSocketServerExamplesTest.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.server.examples;
package org.eclipse.jetty.websocket.javax.tests.server.examples;
import java.net.URI;
import java.util.concurrent.ArrayBlockingQueue;

0
jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml → jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml
View File

6
jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
View File

@ -26,6 +26,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class InvokerUtils
{
public static class Arg
@ -135,6 +138,7 @@ public class InvokerUtils
}
public static final ParamIdentifier PARAM_IDENTITY = new ParamIdentity();
private static final Logger LOG = LoggerFactory.getLogger(InvokerUtils.class);
/**
* Bind optional arguments to provided method handle
@ -425,6 +429,8 @@ public class InvokerUtils
{
if (!throwOnFailure)
{
if (LOG.isDebugEnabled())
LOG.debug("Unable to obtain MethodHandle for " + method, e);
return null;
}

2
pom.xml
View File

@ -44,7 +44,7 @@
<jetty.surefire.argLine>-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx2g -Xms2g -Xlog:gc:stderr:time,level,tags</jetty.surefire.argLine>
<!-- some maven plugins versions -->
<maven.surefire.version>3.0.0-M4</maven.surefire.version>
<maven.surefire.version>3.0.0-M5</maven.surefire.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.1.2</maven.dependency.plugin.version>
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>