commit:     c6eaf9430b9559d1e56e08f7df6161da59d99d63
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 08:10:01 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 08:10:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6eaf943

www-servers/tomcat: adjusted min java versions needed for compilation

Closes: https://bugs.gentoo.org/917446
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../tomcat/{tomcat-10.1.16.ebuild => tomcat-10.1.16-r1.ebuild}        | 4 ++--
 .../tomcat/{tomcat-10.1.18.ebuild => tomcat-10.1.17-r1.ebuild}        | 2 +-
 .../tomcat/{tomcat-10.1.17.ebuild => tomcat-10.1.18-r1.ebuild}        | 4 ++--
 www-servers/tomcat/{tomcat-8.5.96.ebuild => tomcat-8.5.96-r1.ebuild}  | 4 ++--
 www-servers/tomcat/{tomcat-8.5.98.ebuild => tomcat-8.5.97-r1.ebuild}  | 2 +-
 www-servers/tomcat/{tomcat-8.5.97.ebuild => tomcat-8.5.98-r1.ebuild}  | 4 ++--
 www-servers/tomcat/{tomcat-9.0.83.ebuild => tomcat-9.0.83-r1.ebuild}  | 4 ++--
 www-servers/tomcat/{tomcat-9.0.85.ebuild => tomcat-9.0.84-r1.ebuild}  | 2 +-
 www-servers/tomcat/{tomcat-9.0.84.ebuild => tomcat-9.0.85-r1.ebuild}  | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/www-servers/tomcat/tomcat-10.1.16.ebuild 
b/www-servers/tomcat/tomcat-10.1.16-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-10.1.16.ebuild
rename to www-servers/tomcat/tomcat-10.1.16-r1.ebuild
index 420c23559c89..9a5e9756ba19 100644
--- a/www-servers/tomcat/tomcat-10.1.16.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-11:*
+       >=virtual/jdk-17:*
        test? (
                dev-java/ant-junit:0
                dev-java/easymock:3.2

diff --git a/www-servers/tomcat/tomcat-10.1.18.ebuild 
b/www-servers/tomcat/tomcat-10.1.17-r1.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-10.1.18.ebuild
rename to www-servers/tomcat/tomcat-10.1.17-r1.ebuild
index 104bd1129668..28598e1cd7ef 100644
--- a/www-servers/tomcat/tomcat-10.1.18.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.17-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-11:*
+       >=virtual/jdk-17:*
        test? (
                dev-java/ant-junit:0
                dev-java/easymock:3.2

diff --git a/www-servers/tomcat/tomcat-10.1.17.ebuild 
b/www-servers/tomcat/tomcat-10.1.18-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-10.1.17.ebuild
rename to www-servers/tomcat/tomcat-10.1.18-r1.ebuild
index 7001a52d8c24..28598e1cd7ef 100644
--- a/www-servers/tomcat/tomcat-10.1.17.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-11:*
+       >=virtual/jdk-17:*
        test? (
                dev-java/ant-junit:0
                dev-java/easymock:3.2

diff --git a/www-servers/tomcat/tomcat-8.5.96.ebuild 
b/www-servers/tomcat/tomcat-8.5.96-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-8.5.96.ebuild
rename to www-servers/tomcat/tomcat-8.5.96-r1.ebuild
index 7c3cee7e4014..e46a8ec1c5ed 100644
--- a/www-servers/tomcat/tomcat-8.5.96.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.96-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-1.8:*
+       >=virtual/jdk-11:*
        doc? (
                dev-java/jax-rpc-api:0
                dev-java/wsdl4j:0

diff --git a/www-servers/tomcat/tomcat-8.5.98.ebuild 
b/www-servers/tomcat/tomcat-8.5.97-r1.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-8.5.98.ebuild
rename to www-servers/tomcat/tomcat-8.5.97-r1.ebuild
index 56f524f6912d..73bd9ff31cc1 100644
--- a/www-servers/tomcat/tomcat-8.5.98.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.97-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-1.8:*
+       >=virtual/jdk-11:*
        doc? (
                dev-java/jax-rpc-api:0
                dev-java/wsdl4j:0

diff --git a/www-servers/tomcat/tomcat-8.5.97.ebuild 
b/www-servers/tomcat/tomcat-8.5.98-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-8.5.97.ebuild
rename to www-servers/tomcat/tomcat-8.5.98-r1.ebuild
index 571c2a833db2..73bd9ff31cc1 100644
--- a/www-servers/tomcat/tomcat-8.5.97.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.98-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-1.8:*
+       >=virtual/jdk-11:*
        doc? (
                dev-java/jax-rpc-api:0
                dev-java/wsdl4j:0

diff --git a/www-servers/tomcat/tomcat-9.0.83.ebuild 
b/www-servers/tomcat/tomcat-9.0.83-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-9.0.83.ebuild
rename to www-servers/tomcat/tomcat-9.0.83-r1.ebuild
index b8cee4425eb7..99d05ee6f55b 100644
--- a/www-servers/tomcat/tomcat-9.0.83.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.83-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-1.8:*
+       >=virtual/jdk-17:*
        test? (
                dev-java/ant-junit
                dev-java/easymock:3.2

diff --git a/www-servers/tomcat/tomcat-9.0.85.ebuild 
b/www-servers/tomcat/tomcat-9.0.84-r1.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-9.0.85.ebuild
rename to www-servers/tomcat/tomcat-9.0.84-r1.ebuild
index 7580b033f525..182ffc6d3773 100644
--- a/www-servers/tomcat/tomcat-9.0.85.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.84-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-1.8:*
+       >=virtual/jdk-17:*
        test? (
                dev-java/ant-junit
                dev-java/easymock:3.2

diff --git a/www-servers/tomcat/tomcat-9.0.84.ebuild 
b/www-servers/tomcat/tomcat-9.0.85-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-9.0.84.ebuild
rename to www-servers/tomcat/tomcat-9.0.85-r1.ebuild
index 64cc1be4e61c..182ffc6d3773 100644
--- a/www-servers/tomcat/tomcat-9.0.84.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.85-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP}
        app-admin/pwgen
        dev-java/ant-core
-       >=virtual/jdk-1.8:*
+       >=virtual/jdk-17:*
        test? (
                dev-java/ant-junit
                dev-java/easymock:3.2

Reply via email to