From a80293ae9878723e6a8f9fbf30e58384348ff49e Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Fri, 5 Jan 2024 21:46:02 +0100
Subject: [PATCH] Update OpenJDK documentation (21)

---
 docs/file-scrapers.md        | 10 +++++-----
 lib/docs/scrapers/openjdk.rb | 18 ++++--------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/docs/file-scrapers.md b/docs/file-scrapers.md
index 621a66c0..478099b4 100644
--- a/docs/file-scrapers.md
+++ b/docs/file-scrapers.md
@@ -166,11 +166,11 @@ Search 'Openjdk' in https://www.debian.org/distrib/packages, find the `openjdk-$
 download it, extract it with `dpkg -x $PACKAGE ./` and move `./usr/share/doc/openjdk-16-jre-headless/api/`
 to `path/to/devdocs/docs/openjdk~$VERSION`
 
-```
-curl http://ftp.at.debian.org/debian/pool/main/o/openjdk-19/openjdk-19-doc_19+36-2_all.deb &&
-tar xf openjdk-19-doc_19+36-2_all.deb
+```sh
+curl -O http://ftp.at.debian.org/debian/pool/main/o/openjdk-21/openjdk-21-doc_21.0.1+12-3_all.deb
+tar xf openjdk-21-doc_21.0.1+12-3_all.deb
 tar xf data.tar.xz
-mv ./usr/share/doc/openjdk-19-jre-headless/api/ path/to/devdocs/docs/openjdk~$VERSION
+mv ./usr/share/doc/openjdk-21-jre-headless/api/ docs/openjdk~$VERSION
 ```
 
 If you use or have access to a Debian-based GNU/Linux distribution you can run the following command:
@@ -178,7 +178,7 @@ If you use or have access to a Debian-based GNU/Linux distribution you can run t
 apt download openjdk-$VERSION-doc
 dpkg -x $PACKAGE ./
 # previous command makes a directory called 'usr' in the current directory
-mv ./usr/share/doc/openjdk-16-jre-headless/api/ path/to/devdocs/docs/openjdk~$VERSION
+mv ./usr/share/doc/openjdk-16-jre-headless/api/ docs/openjdk~$VERSION
 ```
 
 ## Pandas
diff --git a/lib/docs/scrapers/openjdk.rb b/lib/docs/scrapers/openjdk.rb
index 2ede8d5d..d96f9661 100644
--- a/lib/docs/scrapers/openjdk.rb
+++ b/lib/docs/scrapers/openjdk.rb
@@ -28,7 +28,7 @@ module Docs
     ]
 
     options[:attribution] = <<-HTML
-      &copy; 1993, 2022, Oracle and/or its affiliates. All rights reserved.<br>
+      &copy; 1993, 2023, Oracle and/or its affiliates. All rights reserved.<br>
       Documentation extracted from Debian's OpenJDK Development Kit package.<br>
       Licensed under the GNU General Public License, version 2, with the Classpath Exception.<br>
       Various third party code in OpenJDK is licensed under different licenses (see Debian package).<br>
@@ -37,20 +37,10 @@ module Docs
 
     NEWFILTERS = ['openjdk/entries_new', 'openjdk/clean_html_new']
 
-    version '19' do
-      self.release = '19'
+    version '21' do
+      self.release = '21'
       self.root_path = 'index.html'
-      self.base_url = 'https://docs.oracle.com/en/java/javase/19/docs/api/'
-
-      html_filters.push NEWFILTERS
-
-      options[:container] = 'main'
-    end
-
-    version '18' do
-      self.release = '18'
-      self.root_path = 'index.html'
-      self.base_url = 'https://docs.oracle.com/en/java/javase/18/docs/api/'
+      self.base_url = 'https://docs.oracle.com/en/java/javase/21/docs/api/'
 
       html_filters.push NEWFILTERS