From 0c9da0234d24421c27d290fc2be03d72e0159abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Thu, 30 Jul 2020 18:08:51 +0200
Subject: vaadin-u2f : update, but is deprecated right now

---
 java/vaadin-u2f/ivy.xml                         | 8 ++++----
 java/vaadin-u2f/src/run/java/ch/asynk/Main.java | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/java/vaadin-u2f/ivy.xml b/java/vaadin-u2f/ivy.xml
index 4966c64..ba614e1 100644
--- a/java/vaadin-u2f/ivy.xml
+++ b/java/vaadin-u2f/ivy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE ivy-module [
-<!ENTITY vaadin.version "8.1.6">
+<!ENTITY vaadin.version "8.11.0">
 ]>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,10 +20,10 @@
         <dependency org="com.vaadin" name="vaadin-themes" rev="&vaadin.version;"/>
         <dependency org="com.vaadin" name="vaadin-client-compiled" rev="&vaadin.version;"/>
         <dependency org="com.vaadin" name="vaadin-client-compiler" rev="&vaadin.version;" conf="widgetsets->default"/>
-        <dependency org="ch.qos.logback" name="logback-classic" rev="1.2.1"/>
+        <dependency org="ch.qos.logback" name="logback-classic" rev="1.2.3"/>
         <dependency org="com.yahoo.platform.yui" name="yuicompressor" rev="2.4.8" conf="themes->default"/>
-        <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="9.4.2.v20170220" conf="run->default"/>
+        <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="9.4.30.v20200611" conf="run->default"/>
         <dependency org="com.yubico" name="u2flib-server-core" rev="0.16.0"/>
-        <dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.0"/>
+        <dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.1"/>
     </dependencies>
 </ivy-module>
diff --git a/java/vaadin-u2f/src/run/java/ch/asynk/Main.java b/java/vaadin-u2f/src/run/java/ch/asynk/Main.java
index f6dfc4e..87a84d9 100644
--- a/java/vaadin-u2f/src/run/java/ch/asynk/Main.java
+++ b/java/vaadin-u2f/src/run/java/ch/asynk/Main.java
@@ -68,7 +68,7 @@ abstract class VaadinJettyServer extends Server
         HttpConfiguration httpConf = new HttpConfiguration();
         httpConf.addCustomizer(new SecureRequestCustomizer());
 
-        SslContextFactory sslContextFactory = new SslContextFactory();
+        SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         // keytool -keystore src/run/resources/keystore.jks -genkey -alias asynk.ch -keyalg RSA -keysize 2048
         sslContextFactory.setKeyStorePath(VaadinJettyServer.class.getResource("/keystore.jks").toExternalForm());
         sslContextFactory.setKeyStorePassword("123456");
@@ -121,6 +121,8 @@ public class Main
 {
     public static void main(String[] args) throws Exception
     {
+        System.err.println("!!! U2F has been superseded by Web Authentication !!!");
+        System.err.println("  --> https://github.com/Yubico/java-webauthn-server/\n");
         int port = 8666;
         String webRoot = System.getProperty("WEBROOT");
         if (webRoot == null) webRoot = "./src/main/WebContent";
-- 
cgit v1.1-2-g2b99