diff --git a/programming/language/java/java-openjdk/actions.py b/programming/language/java/java-openjdk/actions.py
old mode 100755
new mode 100644
index d1746a6300..6018b4ff33
--- a/programming/language/java/java-openjdk/actions.py
+++ b/programming/language/java/java-openjdk/actions.py
@@ -1,150 +1,111 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
 import subprocess
-
+from pisi.actionsapi import shelltools, pisitools, autotools
 from pisi.actionsapi import get
-from pisi.actionsapi import autotools
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
+from pisi.util import join_path
 
-# jobs = "-j"+ subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n")
+_, _, _, update = get.srcVERSION().split('.')
+#jobs = "-j"+ subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n")
 # jobs = subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n")
-jobs = subprocess.check_output("nproc 2>/dev/null", shell=True).decode("utf-8").rstrip("\n")
-# jobs = "-j" + subprocess.check_output("nproc 2>/dev/null", shell=True).decode().strip()
+jobs = "-j" + subprocess.check_output("nproc 2>/dev/null", shell=True).decode().strip()
 
+jvm_dir = '/usr/lib/jvm/java-openjdk'
+img_dir = 'build/linux-%s-server-release/images' % get.ARCH()
+
+cflags = get.CFLAGS()
+cxxflags = get.CXXFLAGS()
+ldflags = get.LDFLAGS()
+
+pisitools.cflags.reset()
+pisitools.cxxflags.reset()
+pisitools.ldflags.reset()
 
-shelltools.export("ALT_PARALLEL_COMPILE_JOBS", jobs)
-shelltools.export("HOTSPOT_BUILD_JOBS", jobs)
-shelltools.export("LC_ALL", "C")
 
 def setup():
-    shelltools.export("CFLAGS", "%s -fPIC -O3" % get.CFLAGS())
-    shelltools.export("CXXFLAGS", "%s -fPIC -O3" % get.CXXFLAGS())
-    shelltools.export("CC", "gcc")
-    shelltools.export("CXX", "g++")
-    #shelltools.system('export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               #patches/openjdk7_nonreparenting-wm.diff"')
-                               #patches/giflib_5.1.diff
-    autotools.rawConfigure("\
-                            --disable-tests \
-                            --disable-Werror \
-                            --with-parallel-jobs=%s \
-                            --enable-nss \
-                            --disable-system-kerberos \
-                            --disable-system-pcsc \
-                            --disable-system-sctp \
-                            --enable-bootstrap \
-                            --with-jdk-home=/usr/lib/jvm/java-8-openjdk \
-                            --with-ecj-jar=/usr/share/java/ecj.jar \
-                            --with-vendor-name='PisiLinux' \
-                            --with-pkgversion='PisiLinux build 8u.452_3.35.0' \
-                           " % jobs.replace("-j", ""))
+    shelltools.system(
+        'bash configure \
+        --with-version-build="%s" \
+        --with-version-pre="" \
+        --with-version-opt="" \
+        --with-stdc++lib=dynamic \
+        --with-extra-cflags="%s -fcommon" \
+        --with-extra-cxxflags="%s -fcommon" \
+        --with-extra-ldflags="%s" \
+        --with-libjpeg=system \
+        --with-giflib=system \
+        --with-libpng=system \
+        --with-lcms=system \
+        --with-zlib=system \
+        --with-jvm-features=zgc \
+        --with-boot-jdk="%s" \
+        --enable-unlimited-crypto \
+        --disable-warnings-as-errors \
+        --with-num-cores="%s"' % (update, cflags, cxxflags, ldflags, jvm_dir, jobs)
+    )
+
 
 def build():
-    shelltools.system("make JOBS=%s" % jobs)
-    # autotools.make()
+    shelltools.system("make JOBS=%s images legacy-jre-image docs" % jobs)
+    shelltools.system("find '%s' -iname '*.so' -exec chmod +x {} \\;" % img_dir)
+
+
+# def check():
+#     shelltools.system("make JOBS=%s -k check" % jobs)
 
-def check():
-    autotools.make("check -k")
 
 def install():
-    jvmdir="/usr/lib/jvm/java-8-openjdk"
+    # Binaries
+    pisitools.insinto(jvm_dir, join_path(img_dir, 'jdk/bin'))
 
-    pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "HACKING", "README", "NEWS")
+    # Libraries
+    # pisitools.insinto(jvm_dir, join_path(img_dir, 'jre/lib'))
+    pisitools.insinto(jvm_dir, join_path(img_dir, 'jdk/lib'))
 
-    #cd main output directory
-    shelltools.cd("openjdk.build")
+    # Headers
+    pisitools.insinto(jvm_dir, join_path(img_dir, 'jdk/include'))
 
-    #---- install openjdk8-doc
-    pisitools.insinto("/usr/share/doc/openjdk8-doc", "docs/*")
+    # Others
+    pisitools.insinto(jvm_dir, join_path(img_dir, 'jdk/release'))
+    pisitools.insinto(join_path(jvm_dir, 'lib'), join_path(img_dir, 'jdk/lib/modules'))
+    pisitools.insinto(jvm_dir, join_path(img_dir, 'jdk/demo'))
+    pisitools.insinto(jvm_dir, join_path(img_dir, 'jdk/jmods'))
 
-    #install openjdk8-src
-    pisitools.insinto(jvmdir, "images/j2sdk-image/src.zip") 
+    # Configurations
+    pisitools.insinto('/etc/java-openjdk', join_path(img_dir, 'jre/conf/*'))
+    pisitools.dosym('/etc/java-openjdk', join_path(jvm_dir, 'conf'))
 
-    #---- instal jdk8-openjdk
-    for d in ["include","lib","bin"]:
-        pisitools.insinto(jvmdir, "images/j2sdk-image/%s" % d) 
+    # Man pages
+    pisitools.doman(join_path(img_dir, 'jdk/man/man1/*'))
 
-    for f in shelltools.ls("%s/usr/lib/jvm/java-8-openjdk/bin" % get.installDIR()):
-        if not f in ["java", "java-rmi.cgi", "keytool", "orbd",
-                     "pack200", "policytool", "rmid", "rmiregistry",
-                     "servertool", "tnameserv", "unpack200", "jjs", "clhsdb", "hsdb"]:
-            pisitools.dosym("/usr/lib/jvm/java-8-openjdk/bin/%s" % f, "/usr/bin/%s" % f)
+    # Change man page file names to prevent conflict with other Java packages.
+    for man_file in shelltools.ls(join_path(get.installDIR(), 'usr/share/man/man1')):
+        pisitools.domove(
+            '/usr/share/man/man1/%s' % man_file,
+            '/usr/share/man/man1',
+            '%s-openjdk24.0' % man_file.replace('.1', '')
+        )
 
-    #install man pages
-    for man in shelltools.ls("images/j2sdk-image/man/man1"):
-        pisitools.insinto("/usr/share/man/man1", "images/j2sdk-image/man/man1/%s" % man, "%s" % man)
-        
-    for man in shelltools.ls("images/j2sdk-image/man/ja_JP.UTF-8/man1"):
-        pisitools.insinto("/usr/share/man/ja/man1", "images/j2sdk-image/man/ja_JP.UTF-8/man1/%s" % man, "%s" % man )
+    # Documentations
+    pisitools.insinto(join_path('/', get.docDIR(), 'java-openjdk'), join_path(img_dir, 'docs/*'))
+
+    # Licenses
+    pisitools.insinto('/usr/share/licenses/java-openjdk', join_path(img_dir, 'jre/legal/*'))
+    pisitools.dosym('/usr/share/licenses/java-openjdk', join_path(jvm_dir, 'legal'))
+
+    pisitools.remove("%s/lib/security/cacerts" % jvm_dir)
+    pisitools.dosym("/etc/ssl/certs/java/cacerts", "%s/lib/security/cacerts" % jvm_dir)
     
-    pisitools.insinto("/usr/share/applications", "../jconsole.desktop", "jconsole-jdk8.desktop")
-    shelltools.system("chmod go+r %s%s/lib/sa-jdi.jar" %(get.installDIR(), jvmdir))
-
-    #---- instal jre8-openjdk
-    pisitools.insinto("%s/jre/bin" % jvmdir , "images/j2sdk-image/jre/bin/*")
-    #pisitools.insinto("%s/jre/lib/amd64" % jvmdir , "j2sdk-image/jre/lib/amd64/xawt")
-    
-    for binfile in shelltools.ls("images/j2sdk-image/jre/bin"):
-        pisitools.dosym("%s/jre/bin/%s" % (jvmdir, binfile), "/usr/bin/%s" % binfile)
-
-    pisitools.insinto("/usr/share/applications", "../policytool.desktop", "policytool-jdk8.desktop")
+    shelltools.system("rm -rf %s/%s/bin/*.debuginfo" %(get.installDIR(), jvm_dir))
 
+    # Icons
     for size in [16, 24, 32, 48]:
-        fullsize = "%dx%d" % ((size, ) * 2)
-        pisitools.insinto("/usr/share/icons/hicolor/%s/apps/" % fullsize, "../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon%d.png" % size, "java8.png")
-
-    #---- install jre8-openjdk-headless
-    pisitools.insinto("%s/jre/" % jvmdir , "images/j2sdk-image/jre/lib")
-    pisitools.insinto("%s/jre/bin" % jvmdir, "images/j2sdk-image/jre/bin/*")
-
-    #pisitools.rename("%s/jre/lib/fontconfig.Ubuntu.properties.src" % jvmdir , "fontconfig.properties")
-    #pisitools.rename("%s/jre/lib/fontconfig.Ubuntu.bfc" % jvmdir , "fontconfig.bfc")
-    #pisitools.remove("%s/jre/lib/fontconfig.*.bfc" % jvmdir)
-    #pisitools.remove("%s/jre/lib/fontconfig.*.properties.src" % jvmdir)
-
-    pisitools.domove("%s/jre/lib/*.properties*" % jvmdir,"/etc/java-8-openjdk/")
-
-    for propfile in shelltools.ls("%s/etc/java-8-openjdk/" % get.installDIR()):
-        pisitools.dosym("/etc/java-8-openjdk/%s" % propfile, "%s/jre/lib/%s" % (jvmdir, propfile))
-
-    pisitools.domove("%s/jre/lib/images/cursors/cursors.properties" % jvmdir,"/etc/java-8-openjdk/cursors/")
-    pisitools.dosym("/etc/java-8-openjdk/cursors/cursors.properties", "%s/jre/lib/images/cursors/cursors.properties" % jvmdir)
-
-    pisitools.rename("%s/jre/lib/management/jmxremote.password.template" % jvmdir , "jmxremote.password")
-    pisitools.rename("%s/jre/lib/management/snmp.acl.template" % jvmdir , "snmp.acl")
-
-    for f in ["management.properties", "jmxremote.access", "jmxremote.password", "snmp.acl"]:
-        pisitools.domove("%s/jre/lib/management/%s" % (jvmdir, f),"/etc/java-8-openjdk/management/")
-        pisitools.dosym("/etc/java-8-openjdk/management/%s" % f, "%s/jre/lib/management/%s" % (jvmdir, f))
-
-    for f in ["java.policy","java.security","nss.cfg"]:
-        pisitools.domove("%s/jre/lib/security/%s" % (jvmdir, f),"/etc/java-8-openjdk/security/")
-        pisitools.dosym("/etc/java-8-openjdk/security/%s" % f, "%s/jre/lib/security/%s" % (jvmdir, f))
-
-    #confs=os.listdir("%s/etc/java-8-openjdk/" % get.installDIR())
-    #for i in confs:
-        #shelltools.system("chmod 0644 %s/etc/java-8-openjdk/%s" % (get.installDIR, i))
-        
-    #pisitools.domove("%s/jre/lib/fontconfig.bfc" % jvmdir,"/etc/java-8-openjdk/")
-    pisitools.domove("%s/jre/lib/amd64/jvm.cfg" % jvmdir,"/etc/java-8-openjdk/")
-    pisitools.dosym("/etc/java-8-openjdk/jvm.cfg" , "%s/jre/lib/amd64/jvm.cfg" % jvmdir)
-
-    for license in ["LICENSE", "THIRD_PARTY_README", "release", "ASSEMBLY_EXCEPTION"]:
-        pisitools.insinto("/usr/share/doc/jre8-openjdk-headless", "images/j2re-image/%s" % license)
-      
-    pisitools.remove("%s/jre/lib/security/cacerts" % jvmdir)
-    
-    #seems we need to add this symlink into ca-certificates-java package ?
-    pisitools.dosym("/etc/ssl/certs/java/cacerts", "%s/jre/lib/security/cacerts" % jvmdir)
-    
-    pisitools.dosed("%s/usr/share/applications/policytool-jdk8.desktop" % get.installDIR(), "_JREBINDIR_", "/usr/lib/jvm/java-8-openjdk/jre/bin")
-    pisitools.dosed("%s/usr/share/applications/jconsole-jdk8.desktop" % get.installDIR(), "_SDKBINDIR_", "/usr/lib/jvm/java-8-openjdk/bin")
-    
-    #icons
-    pisitools.dosed("%s/usr/share/applications/policytool-jdk8.desktop" % get.installDIR(), "Icon=java-1.8.0-openjdk", "Icon=java8-1.8.0-openjdk")
-    pisitools.dosed("%s/usr/share/applications/jconsole-jdk8.desktop" % get.installDIR(), "Icon=java-1.8.0-openjdk", "Icon=java8-1.8.0-openjdk")
+        pisitools.insinto(
+            "/usr/share/icons/hicolor/{size}x{size}/apps/".format(size=size),
+            "src/java.desktop/unix/classes/sun/awt/X11/java-icon%s.png" % size,
+            "java-openjdk.png"
+        )
diff --git a/programming/language/java/java-openjdk/pspec.xml b/programming/language/java/java-openjdk/pspec.xml
old mode 100755
new mode 100644
index dedace239e..6c704e6ce0
--- a/programming/language/java/java-openjdk/pspec.xml
+++ b/programming/language/java/java-openjdk/pspec.xml
@@ -2,415 +2,324 @@
 <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
-        <Name>java8-openjdk</Name>
-        <Homepage>http://icedtea.classpath.org</Homepage>
+        <Name>java-openjdk</Name>
+        <Homepage>https://openjdk.java.net/</Homepage>
         <Packager>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Safa Arıman</Name>
+            <Email>safa@ariman.gen.tr</Email>
         </Packager>
         <License>GPLv2</License>
         <IsA>app:gui</IsA>
-        <Icon>java8</Icon>
-        <Summary>Open Java Development Kit</Summary>
-        <Description>OpenJDK (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE).</Description>
-        <Archive type="tarxz" sha1sum="61ea683d1baffaaf4e6941b620b98f97260b28d7">https://icedtea.classpath.org/download/source/icedtea-3.35.0.tar.xz</Archive>
-        <!--Archive type="tarxz" sha1sum="70298576084208409dad6189d9ef5d0c2c7e8e09">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/corba.tar.xz</Archive>
-        <Archive type="tarxz" sha1sum="a4c8ae2a0d30b4349918b2525c7c74fdaee5c3ac">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/hotspot.tar.xz</Archive>
-        <Archive type="tarxz" sha1sum="6fb46ee58d5d121fdbb7eccc68988255f37926ae">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/jaxp.tar.xz</Archive>
-        <Archive type="tarxz" sha1sum="812b90a5ae321bb72ee306aae73f1239f357e7a1">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/jaxws.tar.xz</Archive>
-        <Archive type="tarxz" sha1sum="a8f2f6d341ef151eedb2d1dbfb9c78e658958510">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/jdk.tar.xz</Archive>
-        <Archive type="tarxz" sha1sum="438be528ca79f44395ae46f2091983b1659044b7">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/langtools.tar.xz</Archive>
-        <Archive type="tarxz" sha1sum="bc73de0a9e9afc86115bc65bc182bbd5828c1668">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/nashorn.tar.xz</Archive>
-        <Archive type="tarxz" sha1sum="a7fff57cfd2bc2e8a9a10b96d452f9cd6d6e2a2d">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/openjdk.tar.xz</Archive-->
+        <Summary>OpenJDK Java development kit</Summary>
+        <Description>OpenJDK is a development environment for building applications, applets, and components using the Java programming language.</Description>
+        <Archive sha1sum="601ee76ed23d1e8383fb8a541fdf6cbc31f4d003" type="targz">https://github.com/openjdk/jdk24u/archive/jdk-24.0.1+9.tar.gz</Archive>
         <BuildDependencies>
-<!--             <Dependency>ant</Dependency> -->
-            <Dependency>wget</Dependency>
-<!--             <Dependency>rhino</Dependency> -->
-            <Dependency>p7zip</Dependency>
-            <Dependency>fastjar</Dependency>
-            <Dependency>nss-devel</Dependency>
-            <Dependency>zlib-devel</Dependency>
-            <Dependency>attr-devel</Dependency>
-            <Dependency>xorg-proto</Dependency>
-            <Dependency>gtk2-devel</Dependency>
-            <Dependency>cups-devel</Dependency>
-            <Dependency>libffi-devel</Dependency>
-<!--             <Dependency>eclipse-ecj</Dependency> -->
-            <Dependency>libXt-devel</Dependency>
-            <Dependency>libSM-devel</Dependency>
-            <Dependency>lcms2-devel</Dependency>
-            <Dependency>jdk8-openjdk</Dependency>
-            <Dependency>libICE-devel</Dependency>
-            <Dependency>libpng-devel</Dependency>
-            <Dependency>giflib-devel</Dependency>
-            <Dependency>libxslt-devel</Dependency>
-            <Dependency>libXtst-devel</Dependency>
-            <Dependency>alsa-lib-devel</Dependency>
-            <Dependency>libXinerama-devel</Dependency>
-            <Dependency>libjpeg-turbo-devel</Dependency>
-            <Dependency>libXcomposite-devel</Dependency>
-            <Dependency>chrpath</Dependency>
-            <Dependency>jre8-openjdk-headless</Dependency>
-            <!-- Dependency>pulseaudio-libs-devel</Dependency>--><!-- for bootstrap -->
-            <Dependency>zip</Dependency>
             <Dependency>cpio</Dependency>
+            <Dependency>zip</Dependency>
             <Dependency>unzip</Dependency>
-            <Dependency>libXp-devel</Dependency>
+            <Dependency>cups-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libXrender-devel</Dependency>
+            <Dependency>libXtst-devel</Dependency>
+            <Dependency>libXt-devel</Dependency>
+            <Dependency>libXext-devel</Dependency>
+            <Dependency>libXrandr-devel</Dependency>
+            <Dependency>alsa-lib-devel</Dependency>
+            <Dependency>freetype-devel</Dependency>
+            <Dependency>libjpeg-turbo-devel</Dependency>
+            <Dependency>giflib-devel</Dependency>
+            <Dependency>libpng-devel</Dependency>
+            <Dependency>lcms2-devel</Dependency>
+            <Dependency>fontconfig-devel</Dependency>
+            <Dependency>jdk-openjdk</Dependency>
+<!--             man docs -->
+            <Dependency>pandoc-bin</Dependency>
         </BuildDependencies>
-        <AdditionalFiles>
-<!--             <AdditionalFile target="patches/gcc10.diff">gcc10.diff</AdditionalFile> -->
-<!--             <AdditionalFile target="patches/fontconfig-paths.diff">fontconfig-paths.diff</AdditionalFile> -->
-<!--             <AdditionalFile target="patches/openjdk7_nonreparenting-wm.diff">openjdk7_nonreparenting-wm.diff</AdditionalFile> -->
-        </AdditionalFiles>
     </Source>
 
     <Package>
-        <Name>jre8-openjdk-headless</Name>
-        <Summary>Free Java environment based on OpenJDK 8 with IcedTea8 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs</Summary>
+        <Name>jre-openjdk-headless</Name>
+        <Summary>OpenJDK Java headless runtime environment</Summary>
         <RuntimeDependencies>
-            <Dependency>atk</Dependency>
-            <Dependency>cups</Dependency>
-            <Dependency>gtk2</Dependency>
-            <Dependency>zlib</Dependency>
-            <Dependency>cairo</Dependency>
-            <Dependency>glib2</Dependency>
             <Dependency>lcms2</Dependency>
-            <Dependency>libXi</Dependency>
-            <Dependency>pango</Dependency>
-            <Dependency>libX11</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>libXext</Dependency>
-            <Dependency>libXtst</Dependency>  
             <Dependency>freetype</Dependency>
-            <Dependency>fontconfig</Dependency>   
-            <Dependency>gdk-pixbuf</Dependency>
-            <Dependency>libXrender</Dependency>
-            <Dependency>libXcomposite</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="executable">/usr/bin/jfr</Path>
-            <Path fileType="executable">/usr/bin/hsdb</Path>
-            <Path fileType="executable">/usr/bin/clhsdb</Path>
-            <Path fileType="executable">/usr/bin/orbd</Path>
-            <Path fileType="executable">/usr/bin/rmid</Path>
-            <Path fileType="executable">/usr/bin/java</Path>
-            <Path fileType="executable">/usr/bin/jjs</Path>
-            <Path fileType="executable">/usr/bin/jdeps</Path>
-            <Path fileType="data">/etc/env.d/25java_jre.csh</Path>
-            <Path fileType="data">/etc/env.d/25java_jre</Path>
-            <Path fileType="config">/etc/java-8-openjdk/</Path>
-            <Path fileType="executable">/usr/bin/pack200</Path>
-            <Path fileType="executable">/usr/bin/keytool</Path>
-            <Path fileType="executable">/usr/bin/tnameserv</Path>
-            <Path fileType="executable">/usr/bin/unpack200</Path>
-            <Path fileType="man">/usr/share/man/man1/rmid.1</Path>
-            <Path fileType="man">/usr/share/man/man1/orbd.1</Path>
-            <Path fileType="man">/usr/share/man/man1/java.1</Path>
-            <Path fileType="executable">/usr/bin/servertool</Path>
-            <Path fileType="executable">/usr/bin/rmiregistry</Path>
-            <Path fileType="doc">/usr/share/doc/java8-openjdk/</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/rmid.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/java.1</Path>
-            <Path fileType="man">/usr/share/man/man1/pack200.1</Path>
-            <Path fileType="man">/usr/share/man/man1/keytool.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/orbd.1</Path>
-            <Path fileType="man">/usr/share/man/man1/tnameserv.1</Path>
-            <Path fileType="man">/usr/share/man/man1/unpack200.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/pack200.1</Path>
-            <Path fileType="man">/usr/share/man/man1/servertool.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/keytool.1</Path>
-            <Path fileType="man">/usr/share/man/man1/rmiregistry.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/tnameserv.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/unpack200.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/servertool.1</Path>
-            <Path fileType="doc">/usr/share/doc/jre8-openjdk-headless</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/rmiregistry.1</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/bin/jfr</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/bin/hsdb</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/bin/clhsdb</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/bin/jdeps</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/bin/jjs</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/java</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/orbd</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/rmid</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/keytool</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/pack200</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/orbd</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/java</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/rmid</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/tnameserv</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/unpack200</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/servertool</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/policytool</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/rmiregistry</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/keytool</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/pack200</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/*/jli/libjli.so</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/tnameserv</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/unpack200</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/servertool</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/rmiregistry</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/amd64/libjawt.so</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/xawt/libmawt.so</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/headless/libmawt.so</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jaotc</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/java</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jfr</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jjs</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jrunscript</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/keytool</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/pack200</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/rmid</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/rmiregistry</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/unpack200</Path>
+            <Path fileType="config">/usr/lib/jvm/java-openjdk/conf</Path>
+            <Path fileType="config">/etc/java-openjdk</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.base*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.compiler*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.datatransfer*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.desktop*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.instrument*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.logging*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.management*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.naming*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.net.http*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.prefs*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.rmi*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.scripting*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.se*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.security*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.smartcardio*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.sql*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.transaction.xa*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/java.xml*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.accessibility*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.aot*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.charsets*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.crypto*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.dynalink*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.httpserver*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.internal*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.jdwp.agent*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.jfr*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.jsobject*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.localedata*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.management*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.naming*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.net*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.pack*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.scripting.nashorn*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.sctp*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.security*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.unsupported*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.xml.dom*</Path>
+            <Path fileType="doc">/usr/share/licenses/java-openjdk/jdk.zipfs*</Path>
+            <Path fileType="doc">/usr/lib/jvm/java-openjdk/legal</Path>
+            <Path fileType="doc">/usr/share/licenses/jre-openjdk-headless</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/man</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/release</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/lib/modules</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/lib/security</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/lib/server</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/lib/tzdb.dat</Path>
+            <Path fileType="config">/usr/lib/jvm/java-openjdk/lib/jvm.cfg</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/jrt-fs.jar</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/classlist</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/jexec*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/jfr*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/jspawnhelper*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libawt.*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libawt_headless.*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libdtcket*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libextnet*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libfontmanager*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libinstrument*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libj2gss*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libj2pcsc*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libj2pkcs11*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjaas*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjava*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjavajpeg*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjdwp*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjimage*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjli*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjsig*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/liblcms*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libmanagement*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libmlib_image*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libnet*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libnio*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libprefs*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/librmi*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libsctp*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libsunec*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libunpack*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libverify*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libzip*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/psfont*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libsimdsort*</Path>
+            <Path fileType="man">/usr/share/man/man1/jaotc-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/java-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jfr-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jjs-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jrunscript-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/keytool-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/pack200-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/rmid-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/rmiregistry-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/unpack200-openjdk24.0</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0644" target="/etc/env.d/25java_jre">25java_jre</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/env.d/25java_jre.csh">25java_jre.csh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/java-openjdk-java.desktop">freedesktop-java.desktop</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/java-openjdk-jconsole.desktop">freedesktop-jconsole.desktop</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/java-openjdk-jshell.desktop">freedesktop-jshell.desktop</AdditionalFile>
         </AdditionalFiles>
+        <Provides>
+            <COMAR script="jre_package.py">System.Package</COMAR>
+        </Provides>
     </Package>
 
     <Package>
-        <Name>jre8-openjdk</Name>
-        <Summary>Free Java environment based on OpenJDK 8 with IcedTea8 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs</Summary>
+        <Name>jre-openjdk</Name>
+        <Summary>OpenJDK Java full runtime environment</Summary>
         <RuntimeDependencies>
-            <Dependency>zlib</Dependency>
+            <Dependency release="current">jre-openjdk-headless</Dependency>
+            <Dependency>libXi</Dependency>
             <Dependency>giflib</Dependency>
             <Dependency>libX11</Dependency>
             <Dependency>libpng</Dependency>
-            <Dependency>libXext</Dependency>            
+            <Dependency>libXext</Dependency>
+            <Dependency>libXtst</Dependency>
             <Dependency>alsa-lib</Dependency>
+            <Dependency>libXrender</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
-            <Dependency>jre8-openjdk-headless</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="doc">/usr/share/doc/openjdk</Path>
-            <Path fileType="executable">/usr/bin/policytool</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/</Path>
-            <Path fileType="man">/usr/share/man/man1/policytool.1</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/policytool.1</Path>
-            <Path fileType="data">/usr/share/applications/policytool-jdk8.desktop</Path>
-            <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/policytool</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/*/libjsoundalsa.so</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/*/libpulse-java.so</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/*/libsplashscreen.so</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/libjsoundalsa.so</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/libpulse-java.so</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/libsplashscreen.so</Path>
-        </Files>
-        <Replaces>
-            <Package>sun-jre</Package>
-        </Replaces>
-        <Conflicts>
-            <Package>sun-jre</Package>
-        </Conflicts>
-    </Package>
-
-    <Package>
-        <Name>jdk8-openjdk</Name>
-        <Summary>Free Java environment based on OpenJDK 8 with IcedTea8 replacing binary plugs - SDK</Summary>
-        <RuntimeDependencies>
-            <Dependency>zlib</Dependency>
-            <Dependency>libX11</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>jre8-openjdk-headless</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="data">/etc/env.d/25java_jdk.csh</Path>
-            <Path fileType="data">/etc/env.d/25java_jdk</Path>
-            <Path fileType="man">/usr/share/man/man1/</Path>
-            <Path fileType="man">/usr/share/man/ja/man1/</Path>
-            <Path fileType="executable">/usr/bin/jar</Path>
-            <Path fileType="executable">/usr/bin/xjc</Path>
-            <Path fileType="executable">/usr/bin/apt</Path>
-            <Path fileType="executable">/usr/bin/jdb</Path>
-            <Path fileType="executable">/usr/bin/jps</Path>
-            <Path fileType="executable">/usr/bin/jmap</Path>
-            <Path fileType="executable">/usr/bin/idlj</Path>
-            <Path fileType="executable">/usr/bin/jcmd</Path>
-            <Path fileType="executable">/usr/bin/jhat</Path>
-            <Path fileType="executable">/usr/bin/rmic</Path>
-            <Path fileType="executable">/usr/bin/javac</Path>
-            <Path fileType="executable">/usr/bin/javah</Path>
-            <Path fileType="executable">/usr/bin/javap</Path>
-            <Path fileType="executable">/usr/bin/jinfo</Path>
-            <Path fileType="executable">/usr/bin/wsgen</Path>
-            <Path fileType="executable">/usr/bin/jstat</Path>
-            <Path fileType="executable">/usr/bin/jstack</Path>
-            <Path fileType="executable">/usr/bin/jstatd</Path>
-            <Path fileType="executable">/usr/bin/javadoc</Path>
-            <Path fileType="executable">/usr/bin/extcheck</Path>
-            <Path fileType="executable">/usr/bin/jconsole</Path>
-            <Path fileType="executable">/usr/bin/wsimport</Path>
-            <Path fileType="executable">/usr/bin/jarsigner</Path>
-            <Path fileType="executable">/usr/bin/jsadebugd</Path>
-            <Path fileType="executable">/usr/bin/schemagen</Path>
-            <Path fileType="executable">/usr/bin/serialver</Path>
-            <Path fileType="executable">/usr/bin/jrunscript</Path>
-            <Path fileType="executable">/usr/bin/appletviewer</Path>
-            <Path fileType="executable">/usr/bin/native2ascii</Path>
-            <Path fileType="data">/usr/share/applications/jconsole-jdk8.desktop</Path>
-            <Path fileType="header">/usr/lib/jvm/java-8-openjdk/include</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/apt</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jar</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jdb</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jps</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/xjc</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/rmic</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/rmid</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/idlj</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/orbd</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/java</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jhat</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jmap</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jcmd</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/javac</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/javah</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/javap</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jinfo</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jstat</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/wsgen</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jstatd</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jstack</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/pack200</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/javadoc</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/keytool</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/wsimport</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/extcheck</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jconsole</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/tnameserv</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/unpack200</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/schemagen</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/serialver</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jarsigner</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jsadebugd</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/jrunscript</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/policytool</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/servertool</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/rmiregistry</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/java-rmi.cgi</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/native2ascii</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/bin/appletviewer</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/jexec</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/ct.sym</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/dt.jar</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/ir.idl</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/orb.idl</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/tools.jar</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/sa-jdi.jar</Path>
-            <Path fileType="library">/usr/lib/jvm/java-8-openjdk/lib/jconsole.jar</Path>
-        </Files>
-        <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0644" target="/etc/env.d/25java_jdk.csh">25java_jdk.csh</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/env.d/25java_jdk">25java_jdk</AdditionalFile>
-        </AdditionalFiles>
-        <Replaces>
-            <Package>sun-jdk</Package>
-        </Replaces>
-        <Conflicts>
-            <Package>sun-jdk</Package>
-        </Conflicts>
-    </Package>
-
-    <Package>
-        <Name>openjdk8-src</Name>
-        <Summary>Free Java environment based on OpenJDK 8 with IcedTea8 replacing binary plugs - sources</Summary>
-        <RuntimeDependencies>
-            <Dependency>jdk8-openjdk</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="data">/usr/lib/jvm/java-8-openjdk/src.zip</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libawt_xawt*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjawt*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjsound*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libsplashscreen*</Path>
         </Files>
     </Package>
 
     <Package>
-        <Name>openjdk8-doc</Name>
-        <Summary>Free Java environment based on OpenJDK 8 with IcedTea8 replacing binary plugs - documentation</Summary>
+        <Name>jdk-openjdk</Name>
+        <Summary>OpenJDK Java development kit</Summary>
         <RuntimeDependencies>
-            <Dependency>jdk8-openjdk</Dependency>
+            <Dependency release="current">jre-openjdk-headless</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="doc">/usr/share/doc/openjdk8-doc/</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jwebserver</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jstatd</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jshell</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jarsigner</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/javap</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jstack</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/javadoc</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jdeprscan</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jmap</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jconsole</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jmod</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jcmd</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jar</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/javac</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/rmic</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jps</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jpackage</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/serialver</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jstat</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jdb</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jinfo</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jhsdb</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jlink</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jimage</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jdeps</Path>
+            <Path fileType="executable">/usr/lib/jvm/java-openjdk/bin/jnativescan</Path>
+            <Path fileType="header">/usr/lib/jvm/java-openjdk/include</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/demo</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/jmods</Path>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/lib/ct.sym</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libsaproc*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libdt_socket*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libattach*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libjsvml*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/libsyslookup*</Path>
+            <Path fileType="library">/usr/lib/jvm/java-openjdk/lib/lible*</Path>
+            <Path fileType="man">/usr/share/man/man1/jstatd-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jshell-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jarsigner-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/javap-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jstack-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/javadoc-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jdeprscan-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jmap-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jconsole-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jmod-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jcmd-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jar-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/javac-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/rmic-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jps-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/serialver-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jstat-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jdb-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jinfo-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jhsdb-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jlink-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jimage-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jdeps-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jpackage-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jwebserver-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/klist-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jnativescan-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jabswitch-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jaccessinspector-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/kinit-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/jaccesswalker-openjdk24.0</Path>
+            <Path fileType="man">/usr/share/man/man1/ktab-openjdk24.0</Path>
+            <Path fileType="data">/usr/share/icons</Path>
+            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/licenses/java-openjdk</Path>
+        </Files>
+        <Provides>
+            <COMAR script="jdk_package.py">System.Package</COMAR>
+        </Provides>
+    </Package>
+
+    <Package>
+        <Name>openjdk-src</Name>
+        <Summary>OpenJDK Java sources</Summary>
+        <Files>
+            <Path fileType="data">/usr/lib/jvm/java-openjdk/lib/src.zip</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>openjdk-doc</Name>
+        <Summary>OpenJDK Java documentation</Summary>
+        <Files>
+            <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
 
     <History>
-        <Update release="11">
-            <Date>2025-05-06</Date>
-            <Version>8u_452.3.35.0</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
-        <Update release="10">
-            <Date>2023-10-17</Date>
-            <Version>8u_432.3.33.0</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
-        <Update release="10">
-            <Date>2023-10-17</Date>
-            <Version>8u_382.3.28.0</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
-        <Update release="9">
-            <Date>2023-01-25</Date>
-            <Version>8u_352.3.25.0</Version>
-            <Comment>Version bump</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
-        <Update release="8">
-            <Date>2022-10-24</Date>
-            <Version>8u_345.3.24.0</Version>
-            <Comment>Version bump</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
-        <Update release="7">
-            <Date>2021-11-27</Date>
-            <Version>8u_292.3.19.0</Version>
-            <Comment>Version bump</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
-        <Update release="6">
-            <Date>2021-03-09</Date>
-            <Version>8u_282.3.18.0</Version>
-            <Comment>Version bump</Comment>
-            <Name>İdris Kalp</Name>
-            <Email>idriskalp@gmail.com</Email>
-        </Update>
         <Update release="5">
-            <Date>2020-12-18</Date>
-            <Version>8u_275.3.17.1</Version>
-            <Comment>Version bump</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
+            <Date>2025-05-04</Date>
+            <Version>24.0.1.9</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
         </Update>
         <Update release="4">
-            <Date>2020-06-01</Date>
-            <Version>8u_252.3.16.0</Version>
+            <Date>2025-01-01</Date>
+            <Version>21.0.5.11</Version>
+            <Comment>Version bump</Comment>
+            <Name>Bedirhan Kurt</Name>
+            <Email>bedirhan.kurt@outlook.com</Email>
+        </Update>
+        <Update release="3">
+            <Date>2024-02-28</Date>
+            <Version>21.0.2.13</Version>
+            <Comment>Version bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="2">
+            <Date>2023-11-01</Date>
+            <Version>15.0.3.3</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>
             <Email>muscnsl@gmail.com</Email>
         </Update>
-        <Update release="3">
-            <Date>2020-01-26</Date>
-            <Version>8u_242.3.15.0</Version>
-            <Comment>Version Bump devir 3.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="2">
-            <Date>2019-09-20</Date>
-            <Version>8u_222.3.13.0</Version>
-            <Comment>Version Bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
         <Update release="1">
-            <Date>2019-06-17</Date>
-            <Version>8u_212.3.12.0</Version>
-            <Comment>First release devir 3.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
+            <Date>2021-03-10</Date>
+            <Version>15.0.3.0</Version>
+            <Comment>First release.</Comment>
+            <Name>Safa Arıman</Name>
+            <Email>safa@ariman.gen.tr</Email>
         </Update>
     </History>
 </PISI>