commit: a053aad20e6ca9076d8f2ebb1c9e4860c8b8f183
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Dec 3 17:02:34 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 17:27:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a053aad2
dev-java/logback-core: drop 1.2.11-r1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/logback-core/Manifest | 1 -
...-1.2.11-Ignore-test-failing-under-Java-16.patch | 24 -----
.../logback-core/logback-core-1.2.11-r1.ebuild | 111 ---------------------
3 files changed, 136 deletions(-)
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
-}
