PR #12234 - fix build issues

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
jetty · Sep 4, 2024 · 376a402 · 376a402
1 parent 49e71fa
commit 376a402
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/documentation/jetty/modules/code/examples/pom.xml b/documentation/jetty/modules/code/examples/pom.xml
@@ -30,10 +30,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-ethereum</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-openid</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-infinispan-embedded-query</artifactId>
@@ -50,6 +46,10 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-nosql</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-openid</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>

diff --git a/...s/code/examples/src/main/java/org/eclipse/jetty/docs/programming/security/OpenIdDocs.java b/...s/code/examples/src/main/java/org/eclipse/jetty/docs/programming/security/OpenIdDocs.java
@@ -1,3 +1,16 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
 package org.eclipse.jetty.docs.programming.security;
 
 import java.util.Map;

diff --git a/...es/src/main/java/org/eclipse/jetty/docs/programming/security/siwe/SignInWithEthereum.java b/...es/src/main/java/org/eclipse/jetty/docs/programming/security/siwe/SignInWithEthereum.java
@@ -11,27 +11,12 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.security.siwe.example;
+package org.eclipse.jetty.docs.programming.security.siwe;
 
-import java.io.PrintWriter;
-import java.nio.file.Paths;
-import java.util.Objects;
-
-import org.eclipse.jetty.http.HttpHeader;
-import org.eclipse.jetty.io.Content;
-import org.eclipse.jetty.security.AuthenticationState;
 import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.siwe.EthereumAuthenticator;
 import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Response;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.session.SessionHandler;
-import org.eclipse.jetty.util.Callback;
 
 public class SignInWithEthereum
 {