diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest new file mode 100644 index 000000000..a5e2f6ee0 --- /dev/null +++ b/dev-java/jakarta-servlet-api/Manifest @@ -0,0 +1 @@ +DIST jakarta.servlet-api-5.0.0-sources.jar 397095 BLAKE2B 31a1ebb08dc5d43f85309ef813e003d9e0d4f40189059387e9b63627e43aea659c7773e02505e6e1b0dbabd170f3f05323618ef3f35f9414882b7885483649e9 SHA512 9a48f4183df2ca000842ef799add2046f7851d8dbb3f1014c3370a6859a9bb9d95e8251cc3b6d899d114c835b7ad404582e0c8785f2707eab8d7570260fba76b diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-5.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-5.0.0.ebuild new file mode 100644 index 000000000..a783bea8f --- /dev/null +++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-5.0.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="jakarta.servlet:jakarta.servlet-api:5.0.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jakarta Servlet API" +HOMEPAGE="http://www.eclipse.org/jetty/" +SRC_URI="https://repo1.maven.org/maven2/jakarta/servlet/jakarta.servlet-api/${PV}/jakarta.servlet-api-${PV}-sources.jar" +LICENSE="EPL-2.0 GPL-2-with-classpath-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-11" +DEPEND=">=virtual/jdk-11" diff --git a/dev-java/jetty-http/Manifest b/dev-java/jetty-http/Manifest new file mode 100644 index 000000000..f629a841f --- /dev/null +++ b/dev-java/jetty-http/Manifest @@ -0,0 +1 @@ +DIST jetty-http-11.0.2-sources.jar 128150 BLAKE2B f01079ce92bd8cdddf08621d1a559b9ed5919968d85a188868f3aec5fad9cef134285bce2d352d57154647cd7e3cab0b6ab0b040d8c496fcde3a4adc9ee5c571 SHA512 c1fedbf0358a52c20b18030134ef9c995ad55a1068b312027b7340b424bee0972d025f5e49e8191cc17a0d57995080d6397d854ea49e6de70b0025abf073a620 diff --git a/dev-java/jetty-http/jetty-http-11.0.2.ebuild b/dev-java/jetty-http/jetty-http-11.0.2.ebuild new file mode 100644 index 000000000..30def4166 --- /dev/null +++ b/dev-java/jetty-http/jetty-http-11.0.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jetty HTTP" +HOMEPAGE="http://www.eclipse.org/jetty/" +SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-11" + +DEPEND=">=virtual/jdk-11 + dev-java/slf4j-api + dev-java/slf4j-log4j12 + dev-java/jetty-util + dev-java/jetty-io + " + +JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,jetty-util,jetty-io" + +src_prepare(){ + rm module-info.java + eapply_user +} diff --git a/dev-java/jetty-io/Manifest b/dev-java/jetty-io/Manifest new file mode 100644 index 000000000..6f675eb71 --- /dev/null +++ b/dev-java/jetty-io/Manifest @@ -0,0 +1 @@ +DIST jetty-io-11.0.2-sources.jar 95999 BLAKE2B 983a58477a777d413c52ef6f37466eb6127c32eaa8be0bc230e9842e416f85efecd0dd13c6d96a79489b38d3f928bbac4a989a11cbcec1ff7b505bdb95c92d29 SHA512 1d9e4f386adc89a72fdaa83c54856d81fe868eb894505b3f0aab54f2ad4fd2c5cf5ed1239c5235628fec6df69e641789570099cd8f0d0d272e2ee2ca97e239cc diff --git a/dev-java/jetty-io/jetty-io-11.0.2.ebuild b/dev-java/jetty-io/jetty-io-11.0.2.ebuild new file mode 100644 index 000000000..f870210aa --- /dev/null +++ b/dev-java/jetty-io/jetty-io-11.0.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION=" IO Utility" +HOMEPAGE="http://www.eclipse.org/jetty/" +SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-11" + +DEPEND=">=virtual/jdk-11 + dev-java/slf4j-api + dev-java/slf4j-log4j12 + dev-java/jetty-util + " + +JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,jetty-util" + +src_prepare(){ + rm module-info.java + eapply_user +} diff --git a/dev-java/jetty-jmx/Manifest b/dev-java/jetty-jmx/Manifest new file mode 100644 index 000000000..e204de7eb --- /dev/null +++ b/dev-java/jetty-jmx/Manifest @@ -0,0 +1 @@ +DIST jetty-jmx-11.0.2-sources.jar 26320 BLAKE2B 29f4a77888312f817d985c0d18abb1dadf964aed241de848da6fbf7a2e19fba811d8205e365b77954f0488b391412243885f315ab14983b3c56c93c33d1decc5 SHA512 acbdbf499a03bc95cf64e88254c85a0fdb06bd569e39a2f0199a6679d22a12343bdd4bbfe6a2f10ea34e38ca685aa3f7c403249bd802e2712b322323ec7c7785 diff --git a/dev-java/jetty-jmx/jetty-jmx-11.0.2.ebuild b/dev-java/jetty-jmx/jetty-jmx-11.0.2.ebuild new file mode 100644 index 000000000..c28346ad5 --- /dev/null +++ b/dev-java/jetty-jmx/jetty-jmx-11.0.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jetty IO Utility" +HOMEPAGE="http://www.eclipse.org/jetty/" +SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-11" + +DEPEND=">=virtual/jdk-11 + dev-java/jetty-util" + +JAVA_GENTOO_CLASSPATH="jetty-util" + +src_prepare(){ + rm module-info.java + eapply_user +} diff --git a/dev-java/jetty-server/Manifest b/dev-java/jetty-server/Manifest new file mode 100644 index 000000000..6bfab77e3 --- /dev/null +++ b/dev-java/jetty-server/Manifest @@ -0,0 +1 @@ +DIST jetty-server-11.0.2-sources.jar 428289 BLAKE2B 7093d10523440224e09f4af4ce339f8a7223d9aab7553a1532379138489acb96e791c64ae37445696b38c739324320d2c30a332c1915eaf039fd005e991baea0 SHA512 236d9702ff2bfe6de5445b52e2b067c472beb9f0979eb8815b811a25fd61ae587802a053eb3b4f866588c6f2b2ab128b1f797ebd79b076d1219544c1296217a2 diff --git a/dev-java/jetty-server/jetty-server-11.0.2.ebuild b/dev-java/jetty-server/jetty-server-11.0.2.ebuild new file mode 100644 index 000000000..1d4450647 --- /dev/null +++ b/dev-java/jetty-server/jetty-server-11.0.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="The core jetty server artifact" +HOMEPAGE="http://www.eclipse.org/jetty/" +SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-11" + +DEPEND=">=virtual/jdk-11 + app-arch/unzip + dev-java/jetty-io + dev-java/jetty-util + dev-java/jetty-http + dev-java/jetty-jmx + dev-java/jakarta-servlet-api + " + +JAVA_GENTOO_CLASSPATH="jetty-io,jetty-util,jakarta-servlet-api,jetty-http,jetty-jmx" + +src_prepare(){ + rm module-info.java + eapply_user +} diff --git a/dev-java/jetty-util/Manifest b/dev-java/jetty-util/Manifest new file mode 100644 index 000000000..b07b683b5 --- /dev/null +++ b/dev-java/jetty-util/Manifest @@ -0,0 +1 @@ +DIST jetty-util-11.0.2-sources.jar 338999 BLAKE2B c663576abd259d19d1f32e9975a6dbcdcca0ab0075455cab45e18966932d925ae612a50481c6e0b260f079db2c8b26c80a36c4635f53dcba908a057a8279654e SHA512 ac5139d113a0486b65ba5bf77f0b89fb2b93e96a4ab7a4d32114a348541900fbf9c53204af92ba645d18686b206075bb0f86b18d4acb1ee9f6231895457f42d0 diff --git a/dev-java/jetty-util/jetty-util-11.0.2.ebuild b/dev-java/jetty-util/jetty-util-11.0.2.ebuild new file mode 100644 index 000000000..5d9c5e2ac --- /dev/null +++ b/dev-java/jetty-util/jetty-util-11.0.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jetty IO Utility" +HOMEPAGE="http://www.eclipse.org/jetty/" +SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-11" + +DEPEND=">=virtual/jdk-11 + dev-java/slf4j-api + dev-java/slf4j-log4j12 + " + +JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12" + +src_prepare(){ + rm module-info.java + eapply_user +} diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest index f85021847..81224fd46 100644 --- a/dev-java/logback/Manifest +++ b/dev-java/logback/Manifest @@ -1,2 +1 @@ DIST logback-1.2.3.tar.gz 4159589 BLAKE2B 32f091a460dea754181f8757afd45cc9e9888ead5bc5e2851b194371e8757d2e795b89f187039f9b17a6120b51c9c837d5a8f222276b8814a60052e549b57513 SHA512 f6c359d1d2033c15e61e441efd6a09df991164972e3b77a181f0105a2d536c4f9d4d6589131fc9b81fa86c714693b68a8ee9226257f0fa4f3748083df93862ba -DIST logback-1.3.0_alpha5.tar.gz 4162461 BLAKE2B a32aa4a9536f7670f6bb3694b04f22cbe85be67d1791e8d38f6b82698a1990e9bf0678672b7d1131a94768ffa8df22429995991b02b513bbff287b8140ae9852 SHA512 2bdacad650237f5c3d021983ac10e2516a34f5c23c5519ac34a96ba00fa3523824e64e9b4a7bd3fed2aa8a12f4ebd46db91b3eba4dc6cd0d92e435d6a8ee8e6c diff --git a/dev-java/logback/logback-1.2.3.ebuild b/dev-java/logback/logback-1.2.3.ebuild index 0bab8748d..ee7b16c23 100644 --- a/dev-java/logback/logback-1.2.3.ebuild +++ b/dev-java/logback/logback-1.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0" #WIP -#KEYWORDS="amd64 x86" +#KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="virtual/jre:11" @@ -21,9 +21,23 @@ DEPEND="${RDEPEND} dev-java/slf4j-log4j12 dev-java/junit:4 dev-java/osgi-core-api - virtual/jdk:11" + virtual/jdk:11 + dev-java/mockito + dev-java/janino + dev-java/joda-time + java-virtuals/servlet-api:3.1 + dev-java/jansi + dev-java/oracle-javamail + dev-java/jetty-server + " -JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,junit-4,osgi-core-api" +JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,junit-4,osgi-core-api,joda-time,mockito,jansi-native,janino,servlet-api-3.1,oracle-javamail,jetty-server" -#fails to compile: -#package org.slf4j.event does not exist +src_prepare(){ + rm -r ./logback-v_1.2.3/logback-classic + rm -r ./logback-v_1.2.3/logback-access/src/test/ + eapply_user +} + +#/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java:314: error: cannot find symbol +# public void addLifeCycleListener(Listener listener) { diff --git a/dev-java/logback/logback-1.3.0_alpha5.ebuild b/dev-java/logback/logback-1.3.0_alpha5.ebuild deleted file mode 100644 index 58c2fc52c..000000000 --- a/dev-java/logback/logback-1.3.0_alpha5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The reliable, generic, fast and flexible logging framework" -HOMEPAGE="https://github.com/qos-ch/logback" -#SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI="https://github.com/qos-ch/logback/archive/v_1.3.0-alpha5.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -#WIP -#KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="virtual/jre:11" -DEPEND="${RDEPEND} - dev-java/slf4j-api - dev-java/slf4j-log4j12 - dev-java/junit:4 - dev-java/osgi-core-api - virtual/jdk:11" - -JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,junit-4,osgi-core-api" - -#fails to compile: -#logback-classic/src/main/java9/module-info.java:1: error: too many module declarations found diff --git a/dev-util/jd-cli/Manifest b/dev-util/jd-cli/Manifest index 4f1e9fc1f..349bad99b 100644 --- a/dev-util/jd-cli/Manifest +++ b/dev-util/jd-cli/Manifest @@ -1 +1 @@ -DIST jd-cli-1.1.0.tar.gz 34922 BLAKE2B d0ad41533163fbaeb6f1de38b2d3606b83dc1c636aad3267c4e4f45a0654bcae0d3bbd0a2485ba0019946eea71d4d59a17876d3436bcd7b2125630dc51f67b1d SHA512 00e5caa907c1f687f0d25cd7f6a1a78abda60b7e5a97b40c44d8440046b700f383378156dbdd931e04e96095a1eec8cbb591ec5d429735055c6b6e1e96cdc1dd +DIST jd-cli-1.2.0.tar.gz 36558 BLAKE2B 4346a5b6d514850969762ca478e990699ae9c527fb7257c2d6974668908eb5ea0aee69429ab5e5a19eabe342507ac17b1a4716538880104f8594cea4471943d9 SHA512 f91a8c14058ce90d7b341c4fa2f304a7f851c1eefd31b4e1e7a74ba65910cf2c17b03e34be4ae0a3515cc0a9677c139da0fa26b1a338a19be26b6e9f8756919c diff --git a/dev-util/jd-cli/jd-cli-1.1.0.ebuild b/dev-util/jd-cli/jd-cli-1.2.0.ebuild similarity index 79% rename from dev-util/jd-cli/jd-cli-1.1.0.ebuild rename to dev-util/jd-cli/jd-cli-1.2.0.ebuild index 6cb62938d..d46b278f9 100644 --- a/dev-util/jd-cli/jd-cli-1.1.0.ebuild +++ b/dev-util/jd-cli/jd-cli-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Command line Java Decompiler" HOMEPAGE="https://github.com/kwart/jd-cli" -SRC_URI="https://github.com/kwart/jd-cli/archive/jd-cmd-${PV}.Final.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/kwart/jd-cli/archive/refs/tags/jd-cli-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" #logback fails to build -#KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND="virtual/jre:11" diff --git a/profiles/pentoo/base/package.accept_keywords/dev-java b/profiles/pentoo/base/package.accept_keywords/dev-java index ce9d58d89..808cffeeb 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-java +++ b/profiles/pentoo/base/package.accept_keywords/dev-java @@ -10,3 +10,13 @@ dev-java/swt:4.10 # downgrade back to stable (and install python2) if dev-java/oracle-javamail fails to compile # https://bugs.gentoo.org/698954 =dev-java/javatoolkit-0.6.1* + +#jetty +dev-java/jetty-util +dev-java/jetty-io +dev-java/jakarta-servlet-api +dev-java/jetty-http +dev-java/jetty-jmx +dev-java/jakarta-servlet-api +dev-java/jetty-server +dev-java/logback