diff --git a/.gitignore b/.gitignore index caa7737..1a00041 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/openjdk-jdk17u-jdk-17.0.7+7.tar.xz -/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz +SOURCES/openjdk-jdk21u-jdk-21+35.tar.xz +SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/.java-21-openjdk.metadata b/.java-21-openjdk.metadata new file mode 100644 index 0000000..ae90064 --- /dev/null +++ b/.java-21-openjdk.metadata @@ -0,0 +1,2 @@ +3b6c7f1bbc1098cf1a54d7aa7394c90da53ae665 SOURCES/openjdk-jdk21u-jdk-21+35.tar.xz +c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/CheckVendor.java b/SOURCES/CheckVendor.java similarity index 100% rename from CheckVendor.java rename to SOURCES/CheckVendor.java diff --git a/README.md b/SOURCES/README.md similarity index 100% rename from README.md rename to SOURCES/README.md diff --git a/TestCryptoLevel.java b/SOURCES/TestCryptoLevel.java similarity index 100% rename from TestCryptoLevel.java rename to SOURCES/TestCryptoLevel.java diff --git a/TestECDSA.java b/SOURCES/TestECDSA.java similarity index 100% rename from TestECDSA.java rename to SOURCES/TestECDSA.java diff --git a/TestSecurityProperties.java b/SOURCES/TestSecurityProperties.java similarity index 100% rename from TestSecurityProperties.java rename to SOURCES/TestSecurityProperties.java diff --git a/TestTranslations.java b/SOURCES/TestTranslations.java similarity index 100% rename from TestTranslations.java rename to SOURCES/TestTranslations.java diff --git a/discover_trees.sh b/SOURCES/discover_trees.sh similarity index 100% rename from discover_trees.sh rename to SOURCES/discover_trees.sh diff --git a/fips-17u-bf363eecce3.patch b/SOURCES/fips-17u-bf363eecce3.patch similarity index 100% rename from fips-17u-bf363eecce3.patch rename to SOURCES/fips-17u-bf363eecce3.patch diff --git a/gating.yaml b/SOURCES/gating.yaml similarity index 100% rename from gating.yaml rename to SOURCES/gating.yaml diff --git a/generate_source_tarball.sh b/SOURCES/generate_source_tarball.sh similarity index 100% rename from generate_source_tarball.sh rename to SOURCES/generate_source_tarball.sh diff --git a/icedtea_sync.sh b/SOURCES/icedtea_sync.sh similarity index 98% rename from icedtea_sync.sh rename to SOURCES/icedtea_sync.sh index 022d199..1b94e9e 100755 --- a/icedtea_sync.sh +++ b/SOURCES/icedtea_sync.sh @@ -22,7 +22,7 @@ ICEDTEA_VERSION=3.15.0 ICEDTEA_URL=https://icedtea.classpath.org/download/source ICEDTEA_SIGNING_KEY=CFDA0F9B35964222 -ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11 +ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea set -e RPM_DIR=${PWD} diff --git a/java-21-openjdk-portable.specfile b/SOURCES/java-21-openjdk-portable.specfile similarity index 100% rename from java-21-openjdk-portable.specfile rename to SOURCES/java-21-openjdk-portable.specfile diff --git a/jconsole.desktop.in b/SOURCES/jconsole.desktop.in similarity index 100% rename from jconsole.desktop.in rename to SOURCES/jconsole.desktop.in diff --git a/jdk8274864-remove_amman_cairo_hacks.patch b/SOURCES/jdk8274864-remove_amman_cairo_hacks.patch similarity index 100% rename from jdk8274864-remove_amman_cairo_hacks.patch rename to SOURCES/jdk8274864-remove_amman_cairo_hacks.patch diff --git a/jdk8305113-tzdata2023c.patch b/SOURCES/jdk8305113-tzdata2023c.patch similarity index 100% rename from jdk8305113-tzdata2023c.patch rename to SOURCES/jdk8305113-tzdata2023c.patch diff --git a/nss.cfg.in b/SOURCES/nss.cfg.in similarity index 100% rename from nss.cfg.in rename to SOURCES/nss.cfg.in diff --git a/openjdk_news.sh b/SOURCES/openjdk_news.sh similarity index 100% rename from openjdk_news.sh rename to SOURCES/openjdk_news.sh diff --git a/remove-intree-libraries.sh b/SOURCES/remove-intree-libraries.sh similarity index 100% rename from remove-intree-libraries.sh rename to SOURCES/remove-intree-libraries.sh diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/SOURCES/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch similarity index 100% rename from rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch rename to SOURCES/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/SOURCES/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch similarity index 100% rename from rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch rename to SOURCES/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/SOURCES/rh1648644-java_access_bridge_privileged_security.patch similarity index 100% rename from rh1648644-java_access_bridge_privileged_security.patch rename to SOURCES/rh1648644-java_access_bridge_privileged_security.patch diff --git a/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch b/SOURCES/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch similarity index 100% rename from rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch rename to SOURCES/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch diff --git a/rh1750419-redhat_alt_java.patch b/SOURCES/rh1750419-redhat_alt_java.patch similarity index 100% rename from rh1750419-redhat_alt_java.patch rename to SOURCES/rh1750419-redhat_alt_java.patch diff --git a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch b/SOURCES/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch similarity index 100% rename from rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch rename to SOURCES/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch diff --git a/rpminspect.yaml b/SOURCES/rpminspect.yaml similarity index 100% rename from rpminspect.yaml rename to SOURCES/rpminspect.yaml diff --git a/java-21-openjdk.spec b/SPECS/java-21-openjdk.spec similarity index 100% rename from java-21-openjdk.spec rename to SPECS/java-21-openjdk.spec diff --git a/sources b/sources deleted file mode 100644 index ec61884..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (openjdk-jdk17u-jdk-17.0.7+7.tar.xz) = 2f231e83fabef6299b16beee1e0c8d52501e22fd71a26ed2ace6fadabe38e73e66f3b8fb8bc994e8b2b9bbdb91d1143661941f623bb94793500f4f3b6495bf58 -SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c912769..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-source - tags: - - always - - role: standard-test-basic - tags: - - classic - - atomic - required_packages: - - java-21-openjdk-devel - tests: - - javaVersion1: - dir: ~ - run: set -ex; useradd franta1; su franta1 -c 'java -version'; - run: set -ex; useradd franta4; su franta4 -c 'javac -version'; - run: ls -l /usr/lib/jvm; - - javaVersion2: - dir: ~ - run: set -ex; useradd franta2; su franta2 -c 'java --version'