diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/felix-main/felix-main-7.0.5-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/logback-classic/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild | 96 | ||||
| -rw-r--r-- | dev-java/logback-classic/logback-classic-1.4.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/logback-core/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch | 24 | ||||
| -rw-r--r-- | dev-java/logback-core/logback-core-1.2.11-r1.ebuild | 111 | ||||
| -rw-r--r-- | dev-java/logback-core/logback-core-1.4.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/slf4j-api/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild | 62 |
13 files changed, 6 insertions, 302 deletions
diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild index 57db6f06bc22..60e9162ace4a 100644 --- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild +++ b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild index 7f4684b7fd89..564a6c9ca56d 100644 --- a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild +++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_ LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild index 3335992b15cd..2fcf73b3a66e 100644 --- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild +++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild index 18f4251527ea..7fbf152908ae 100644 --- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild +++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${ LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="6" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-11:*" diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest index a23eb48ef032..6e682bb8af44 100644 --- a/dev-java/logback-classic/Manifest +++ b/dev-java/logback-classic/Manifest @@ -1,2 +1 @@ -DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c diff --git a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild b/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild deleted file mode 100644 index 10c52f8637b1..000000000000 --- a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.2.11.ebuild - -EAPI=8 - -# No tests, too many dependencies missing -JAVA_PKG_IUSE="doc source" -MAVEN_ID="ch.qos.logback:logback-classic:1.2.11" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="logback-classic module" -HOMEPAGE="https://logback.qos.ch" -SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz" - -LICENSE="EPL-1.0 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0 -# javax.mail:mail:1.4 -> !!!groupId-not-found!!! -# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!! -# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0 -# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0 - -CP_DEPEND=" - dev-java/janino:0 - dev-java/javax-mail:0 - ~dev-java/logback-core-${PV}:0 - dev-java/reflections:0 - dev-java/slf4j-api:1 - java-virtuals/servlet-api:3.1 -" - -# Compile dependencies -# POM: pom.xml -# test? ch.qos.cal10n.plugins:maven-cal10n-plugin:0.8.1 -> !!!groupId-not-found!!! -# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0 -# test? com.icegreen:greenmail:1.3 -> !!!groupId-not-found!!! -# test? dom4j:dom4j:1.6.1 -> !!!groupId-not-found!!! -# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4 -# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0 -# test? org.apache.felix:org.apache.felix.main:2.0.2 -> !!!groupId-not-found!!! -# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2 -# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4 -# test? org.slf4j:integration:1.7.32 -> !!!artifactId-not-found!!! -# test? org.slf4j:jul-to-slf4j:1.7.32 -> !!!artifactId-not-found!!! -# test? org.slf4j:log4j-over-slf4j:1.7.32 -> !!!artifactId-not-found!!! -# test? org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0 -# test? org.slf4j:slf4j-ext:1.7.32 -> >=dev-java/slf4j-ext-1.7.36:0 -# test? org.subethamail:subethasmtp:2.1.0 -> !!!groupId-not-found!!! - -# Restricting to jdk:1.8 -# src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java:20: error: cannot find symbol -# import sun.reflect.Reflection; -# ^ -# https://jira.qos.ch/browse/LOGBACK-1343 -DEPEND=" - virtual/jdk:1.8 - ${CP_DEPEND}" -# test? ( -# dev-java/dom4j:1 -# dev-java/assertj-core:2 -# dev-java/log4j-12-api:2 -# dev-java/logback-core:0 -# dev-java/mockito:4 -# dev-java/slf4j-api:0 -# dev-java/slf4j-ext:0 -# ) -# " - -RDEPEND=" - virtual/jre:1.8 - ${CP_DEPEND}" - -DOCS=( ../README.md ) - -S="${WORKDIR}/logback-v_${PV}/logback-classic" - -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="dom4j-1,logback-core,junit-4,log4j,assertj-core-2,mockito-4,slf4j-api,slf4j-ext" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild index 5538d5f55cf6..3c1d932f9dc1 100644 --- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild +++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P LICENSE="EPL-1.0 LGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: ${PN}/pom.xml diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest index a23eb48ef032..6e682bb8af44 100644 --- a/dev-java/logback-core/Manifest +++ b/dev-java/logback-core/Manifest @@ -1,2 +1 @@ -DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c diff --git a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch b/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch deleted file mode 100644 index 9423f26e9a1a..000000000000 --- a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java -+++ b/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java -@@ -18,6 +18,7 @@ - import static org.junit.Assert.assertTrue; - - import org.junit.Before; -+import org.junit.Ignore; - import org.junit.Test; - - import ch.qos.logback.core.helpers.NOPAppender; -@@ -281,10 +282,13 @@ public void verifyInterruptionFlagWhenStopping_NOT_INTERUPPTED() { - } - - -+ // In JDK non started threads can be interrupted -+ @Ignore - @Test - public void verifyInterruptionOfWorkerIsSwallowed() { - asyncAppenderBase.addAppender(delayingListAppender); - asyncAppenderBase.start(); -+ Thread.yield(); - asyncAppenderBase.stop(); - assertFalse(asyncAppenderBase.worker.isInterrupted()); - } diff --git a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild deleted file mode 100644 index db5f39ce5ef6..000000000000 --- a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.2.11.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="ch.qos.logback:logback-core:1.2.11" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="logback-core module" -HOMEPAGE="https://logback.qos.ch" -SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz" - -LICENSE="EPL-1.0 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# javax.mail:mail:1.4 -> !!!groupId-not-found!!! -# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!! -# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0 -# org.fusesource.jansi:jansi:1.9 -> >=dev-java/jansi-1.13:0 - -CP_DEPEND=" - dev-java/jakarta-servlet-api:4 - dev-java/janino:0 - dev-java/jansi:0 - dev-java/javax-mail:0 -" - -# Compile dependencies -# POM: pom.xml -# test? joda-time:joda-time:2.9.2 -> >=dev-java/joda-time-2.10.10:0 -# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4 -# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2 -# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4 - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} - test? ( - dev-java/assertj-core:3 - dev-java/joda-time:0 - dev-java/mockito:4 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -DOCS=( ../README.md ) - -S="${WORKDIR}/logback-v_${PV}/logback-core" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,assertj-core-3,mockito-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -src_prepare() { - default - sed \ - -e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \ - -i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die - - # Ignore test failing under Java 16 - # See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" -ge "17" ]] ; then - eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch" - fi -} - -src_test() { - # 67,73 logback-core/pom.xml - # <excludes> - # <exclude>**/All*Test.java</exclude> - # <exclude>**/PackageTest.java</exclude> - # <!-- ConsoleAppenderTest redirects System.out which is not well tolerated by Maven --> - # <exclude>**/ConsoleAppenderTest.java</exclude> - # <!--<exclude>**/TimeBasedRollingTest.java</exclude>--> - # </excludes> - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "*Test.java" \ - ! -wholename "**/All*Test.java" \ - ! -wholename "**/PackageTest.java" \ - ! -name "AbstractAppenderTest.java" \ - ! -name "AbstractPatternLayoutBaseTest.java" \ - ! -name "AbstractSocketAppenderIntegrationTest.java" \ - ) - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - popd - - # accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" -ge "17" ]] ; then - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) - fi - java-pkg-simple_src_test -} diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild index 7a73216f0f41..ab06f67e0f2f 100644 --- a/dev-java/logback-core/logback-core-1.4.1.ebuild +++ b/dev-java/logback-core/logback-core-1.4.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P LICENSE="EPL-1.0 LGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: ${PN}/pom.xml diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest index c8a1f55201cb..502a0b5b52a6 100644 --- a/dev-java/slf4j-api/Manifest +++ b/dev-java/slf4j-api/Manifest @@ -1,2 +1 @@ -DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6 diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild deleted file mode 100644 index cf71aac2aaed..000000000000 --- a/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.36.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.slf4j:slf4j-api:1.7.36" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The slf4j API" -HOMEPAGE="https://www.slf4j.org" -SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* -" - -RDEPEND=" - >=virtual/jre-1.8:* -" -BDEPEND="app-arch/zip" - -DOCS=( LICENSE.txt ../README.md ) - -S="${WORKDIR}/slf4j-v_${PV}/${PN}" - -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" - -JAVA_TEST_EXCLUDES=( - # java.lang.InstantiationException - not run by upstream anyway - "org.slf4j.helpers.MultithreadedInitializationTest" -) - -src_prepare() { - default - java-pkg_clean -} - -src_compile() { - java-pkg-simple_src_compile - - # remove org/slf4j/impl/ from the jar file - zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files" -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} |