6 files changed, 177 insertions, 1 deletions
diff --git a/docs/changes.xml b/docs/changes.xml
index 9567aebd..4828717b 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -14,7 +14,7 @@
                 unit-ruby
                 unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 unit-jsc13
                 unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 unit-jsc18
-                unit-jsc19"
+                unit-jsc19 unit-jsc20"
          ver="1.30.0" rev="1"
          date="" time=""
          packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
@@ -28,6 +28,19 @@ NGINX Unit updated to 1.30.0.
 </changes>
 
 
+<changes apply="unit-jsc20" ver="1.30.0" rev="1"
+         date="2023-05-03" time="15:00:00 -0700"
+         packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
+
+<change>
+<para>
+Initial release of Java 20 module for NGINX Unit.
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="unit" ver="1.30.0" rev="1"
          date="" time=""
          packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 575a0984..09544892 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -19,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 23.04
+ifeq ($(CODENAME),lunar)
+include Makefile.php
+include Makefile.python311
+include Makefile.go
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc11
+include Makefile.jsc17
+include Makefile.jsc18
+include Makefile.jsc19
+include Makefile.jsc20
+endif
+
 # Ubuntu 22.10
 ifeq ($(CODENAME),kinetic)
 include Makefile.php
diff --git a/pkg/deb/Makefile.jsc20 b/pkg/deb/Makefile.jsc20
new file mode 100644
index 00000000..5b7c6d9f
--- /dev/null
+++ b/pkg/deb/Makefile.jsc20
@@ -0,0 +1,71 @@
+MODULES+=		jsc20
+MODULE_SUFFIX_jsc20=	jsc20
+
+MODULE_SUMMARY_jsc20=	Java 20 module for NGINX Unit
+
+MODULE_VERSION_jsc20=	$(VERSION)
+MODULE_RELEASE_jsc20=	1
+
+MODULE_CONFARGS_jsc20=	java --module=java20 --home=/usr/lib/jvm/java-20-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc20=	java20
+MODULE_INSTARGS_jsc20=	java20-install
+
+MODULE_SOURCES_jsc20=	unit.example-jsc-app \
+			unit.example-jsc20-config
+
+BUILD_DEPENDS_jsc20=	openjdk-20-jdk-headless openjdk-20-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc20)
+
+MODULE_BUILD_DEPENDS_jsc20=,openjdk-20-jdk-headless
+MODULE_DEPENDS_jsc20=,openjdk-20-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc20
+	mkdir -p debian/unit-jsc20/usr/share/doc/unit-jsc20/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc20/usr/share/doc/unit-jsc20/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc20-config debian/unit-jsc20/usr/share/doc/unit-jsc20/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc20/usr/share/doc/unit-jsc20/
+endef
+export MODULE_PREINSTALL_jsc20
+
+define MODULE_POSTINSTALL_jsc20
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc20
+
+define MODULE_POST_jsc20
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc20) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc20)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8800/
+
+Online documentation is available at https://unit.nginx.org
+
+NOTICE:
+
+This version of Unit code is made available in support of the open source
+development process.  This is an intermediate build made available for
+testing purposes only.  This Unit code is untested and presumed incompatible
+with the JSR 340 Java Servlet 3.1 specification.  You should not deploy or
+write to this code.  You should instead deploy and write production
+applications on pre-built binaries that have been tested and certified
+to meet the JSR-340 compatibility requirements such as certified binaries
+published for the JSR-340 reference implementation available at
+https://javaee.github.io/glassfish/.
+
+Redistribution of any Intermediate Build must retain this notice.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_jsc20
diff --git a/pkg/deb/Makefile.python311 b/pkg/deb/Makefile.python311
new file mode 100644
index 00000000..67fd3289
--- /dev/null
+++ b/pkg/deb/Makefile.python311
@@ -0,0 +1,46 @@
+MODULES+=			python311
+MODULE_SUFFIX_python311=		python3.11
+
+MODULE_SUMMARY_python311=	Python 3.11 module for NGINX Unit
+
+MODULE_VERSION_python311=	$(VERSION)
+MODULE_RELEASE_python311=	1
+
+MODULE_CONFARGS_python311=	python --config=python3.11-config
+MODULE_MAKEARGS_python311=	python3.11
+MODULE_INSTARGS_python311=	python3.11-install
+
+MODULE_SOURCES_python311=	unit.example-python-app \
+				unit.example-python3.11-config
+
+BUILD_DEPENDS_python311=	python3.11-dev
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_python311)
+
+MODULE_BUILD_DEPENDS_python311=,python3.11-dev
+
+define MODULE_PREINSTALL_python311
+	mkdir -p debian/unit-python3.11/usr/share/doc/unit-python3.11/examples/python-app
+	install -m 644 -p debian/unit.example-python-app debian/unit-python3.11/usr/share/doc/unit-python3.11/examples/python-app/wsgi.py
+	install -m 644 -p debian/unit.example-python3.11-config debian/unit-python3.11/usr/share/doc/unit-python3.11/examples/unit.config
+endef
+export MODULE_PREINSTALL_python311
+
+define MODULE_POST_python311
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python311) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_python311)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8400/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_python311
diff --git a/pkg/deb/debian.module/unit.example-jsc20-config b/pkg/deb/debian.module/unit.example-jsc20-config
new file mode 100644
index 00000000..57865a45
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc20-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java20": {
+			"processes": 1,
+			"type": "java 20",
+			"webapp": "/usr/share/doc/unit-jsc20/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java20"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-python3.11-config b/pkg/deb/debian.module/unit.example-python3.11-config
new file mode 100644
index 00000000..39b31b57
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-python3.11-config
@@ -0,0 +1,16 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python 3.11",
+			"processes": 2,
+			"path": "/usr/share/doc/unit-python3.11/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"pass": "applications/example_python"
+		}
+	}
+}