From 9bf71d942b8f2e9c367ac95320da8d0d0593e19f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Dec 2022 21:00:44 +0000 Subject: gentoo auto-resync : 03:12:2022 - 21:00:43 --- dev-java/logback-core/Manifest | 5 +- ...-1.2.11-Ignore-test-failing-under-Java-16.patch | 24 ----- .../logback-core/logback-core-1.2.11-r1.ebuild | 111 --------------------- dev-java/logback-core/logback-core-1.4.1.ebuild | 2 +- 4 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch delete mode 100644 dev-java/logback-core/logback-core-1.2.11-r1.ebuild (limited to 'dev-java/logback-core') diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest index 5bad74e39807..857efef90ece 100644 --- a/dev-java/logback-core/Manifest +++ b/dev-java/logback-core/Manifest @@ -1,6 +1,3 @@ -AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5 -DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c -EBUILD logback-core-1.2.11-r1.ebuild 3482 BLAKE2B 40590d0ec60cf62a6a4c64e34c68c84077a0917d18aa944dcdb835b97a585d2fc6cc30e80bf8966fb2e046baa1d4172b02576e8d610edf58f1e75a0dbee7e9ae SHA512 8e6a348b53c6b2ae9230dd8958b68f57e8a3dc7f05903f75b0c407c6b700b2e437ac925ef515d35963b33f99d5c1f0ecf576a745cc65ff456a096277276b08f4 -EBUILD logback-core-1.4.1.ebuild 3013 BLAKE2B c05094f75ee198e2a4e19882a707b919d5a2e78448c859b45acb26a321fa95e11f8244879b45d383143c27beb1bc01b42b7397be5cd840b66354f9b9378915d6 SHA512 51be51fb44fd04061c1e73d2101674d31f6ba0de907c9362079f8793f7c0ad1b9027b4790eaa8b0d689176751244e5a17328913975dc42a3d42dd673247e8b3e +EBUILD logback-core-1.4.1.ebuild 3017 BLAKE2B 789e32d9835ecfc57a299208a24e64d0a02c9af6e41b5ac59ce934eb0207a3eedaa9e9fe3ade07167b920143c52070aae5f14d99ca717de2c93af9d84583cea4 SHA512 244315ad5ebb4f1d854fe41212d875f628b0045a6ded5bd91d9657e2817e92310e67a66f74883f0831f717ba2513cd5280e4349dd033ddd3d2fa5366619b7209 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2 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 - # - # **/All*Test.java - # **/PackageTest.java - # - # **/ConsoleAppenderTest.java - # - # - 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 -- cgit v1.2.3