From 9d5a20176934a287f9e0970722062db5242d30fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 Mar 2023 12:39:53 +0000 Subject: gentoo auto-resync : 21:03:2023 - 12:39:52 --- dev-java/commons-logging/Manifest | 6 +- .../commons-logging-1.3.0_pre20230317.ebuild | 102 ----------------- .../commons-logging-1.3.0_pre20230319.ebuild | 121 +++++++++++++++++++++ dev-java/commons-logging/metadata.xml | 1 + 4 files changed, 125 insertions(+), 105 deletions(-) delete mode 100644 dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild create mode 100644 dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild (limited to 'dev-java/commons-logging') diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index 7c9ef05e8190..93cae60c6bce 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,7 +1,7 @@ AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 -DIST commons-logging-1.3.0_pre20230317.tar.gz 184981 BLAKE2B 00d171a8345907dc2686d1eff1130b7fd1ef653c8f2a7c6b5e45e6522f3d195ba695d93371add97a2d459451e3757ef9ec21f483f0cd37a6bcbb98e76e1b446f SHA512 737058214bfa86c11c2d7b450132a15824652c80ffae6208c3a8fc2386e7b2c7c61b39fd2b75008373f611e4bbed26e851f98f910d3e6f33df4f85f35c0a5462 +DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e EBUILD commons-logging-1.2-r6.ebuild 4146 BLAKE2B 3d9d1e7121406deb2cfbb50ce274df70a0c165d99870f77a69068447e68588bd43b259b076bd5dc2e853a4d79e2df80844caaebd4d4dfe095701f3c4799a98c6 SHA512 7bee2954d057db0c3bbfd3b8bba6b7c9e1cc2f708b5d85070defde51fb6c9d2f8f10b1be122fcfadabfaffc612d2b63ef355818cc6a14253a9de05b79c0c0dde -EBUILD commons-logging-1.3.0_pre20230317.ebuild 3369 BLAKE2B c298a74acae56b87096bdf3a4e8303d87af4c0fd8c8da164665cc98d7be8455477a2dbd9a80c3a8cc4ebe36f63299c47aa74cea8ab7d8a6eddb17733012d359c SHA512 61a211ff82b065ae989d6805f6195bc6c7b90c48af6abbf39e5f1046df7f05159eeabf2e0d6144d3850a3a9e9af353c9b8a12ef3426c4cb915a1e11726569543 -MISC metadata.xml 851 BLAKE2B ecaefca5760abab3e9f77eee62efc54ca66a8cf8ea104171d2c33a2aca794ac45ab40b1f6f6c8baf8b738c46fe74eab5922277d139e4c4bfe4ff9d04c76ae98c SHA512 3310b33d391e19e8ade51e7abd76fcbf5874888d7d93a4ce8bd431dca97e20c13b64535da41b9aa55963b65696b588e5f30f4ca7a5f60a4c30e44b9dc485461a +EBUILD commons-logging-1.3.0_pre20230319.ebuild 4233 BLAKE2B 13ff753003fac3d88cab8e760cb946efa3249d37dc06eaaa05e1f9d14f62014ab6a4e93965e5701e54519a28e690784c3762152f5a0281493781ad13f5aeaac0 SHA512 52a59dff35802c58872d3a79804cc47701e1f152b0de5d356b2aec2f015a235edcebbcb6046ae183af71d242091efe6ae46cbf1346cdbaa49534aa820e307822 +MISC metadata.xml 925 BLAKE2B 4834c919748bbef9b8ac9cbb0545a3b13cdd8c97f0ce6039e09f5fa63522f0506e89ab1749fb273d7cf511414b4d16f661ac156f953dfee1ac3a01f6723b1b99 SHA512 3ea4a17834b877e710c618d6a9669275e76b6305b4c090b4b2462c54a132da20c9f39063c8e9763e712ae21f4c86ca8d02892a47039184dd3ed1680fee8b5849 diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild deleted file mode 100644 index 3fb433092d18..000000000000 --- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-logging:commons-logging:1.3.0" -# Not yet supported, see https://bugs.gentoo.org/839681 -# JAVA_TESTING_FRAMEWORKS="junit-vintage" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" -HOMEPAGE="https://commons.apache.org/proper/commons-logging/" -MY_COMMIT="058cf5ee350cd83d1ab28b000ad6be903ca160c5" -SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="log4j" - -CDEPEND=" - log4j? ( - dev-java/log4j-12-api:2 - dev-java/log4j-api:2 - dev-java/log4j-core:2 - ) -" - -DEPEND="${CDEPEND} - dev-java/javax-servlet-api:2.5 - >=virtual/jdk-1.8:* -" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -DOCS=( README.md src/changes/changes.xml ) - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging" -JAVA_ENCODING="iso-8859-1" -JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5" -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - java-pkg-2_src_prepare - # https://avalon.apache.org/closed.html Apache Avalon has closed. - rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die - rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die - - if use !log4j; then - rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die - rm -r src/test/java/org/apache/commons/logging/log4j || die - fi -} - -src_compile() { - if use log4j; then - JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2" - fi - java-pkg-simple_src_compile - - pushd target/classes > /dev/null || die - - # Need Automatic-Module-Name also for the other JAR files - jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die - - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236 - jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \ - $(find . -type f -name '*.class' \ - ! -name 'Jdk13LumberjackLogger.class' \ - ! -name 'ServletContextCleaner.class' \ - ) || die - - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257 - jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \ - $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ - ! -name 'WeakHashtable*.class' \ - ! -name 'LogFactoryImpl*.class' \ - ) || die - - popd > /dev/null || die -} - -# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407 -# src_test() { -# JAVA_TEST_EXTRA_ARGS=( -# -Dtestclasses="commons-logging-tests.jar" -# -Dcommons-logging="commons-logging.jar" -# -Dcommons-logging-api="commons-logging-api.jar" -# -Dcommons-logging-adapters="commons-logging-adapters.jar" -# ) -# JAVA_TEST_RESOURCE_DIRS="src/test/resources" -# JAVA_TEST_SRC_DIR="src/test/java" -# if use log4j; then -# JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" -# fi -# JAVA_TEST_EXTRA_ARGS+=" -Dservlet-api=$(java-pkg_getjars javax-servlet-api-2.5)" -# java-pkg-simple_src_test -# } diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild new file mode 100644 index 000000000000..b478d6426af2 --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-logging:commons-logging:1.3.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" +HOMEPAGE="https://commons.apache.org/proper/commons-logging/" +MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1" +SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="log4j" + +CDEPEND=" + log4j? ( + dev-java/log4j-12-api:2 + dev-java/log4j-api:2 + dev-java/log4j-core:2 + ) +" + +DEPEND="${CDEPEND} + dev-java/javax-servlet-api:2.5 + >=virtual/jdk-1.8:* +" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +DOCS=( README.md src/changes/changes.xml ) + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging" +JAVA_ENCODING="iso-8859-1" +JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + # https://avalon.apache.org/closed.html Apache Avalon has closed. + rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die + rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die + + if use !log4j; then + rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die + fi +} + +src_compile() { + if use log4j; then + JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2" + fi + java-pkg-simple_src_compile + + pushd target/classes > /dev/null || die + + # Need Automatic-Module-Name also for the other JAR files + jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die + + # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236 + jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \ + $(find . -type f -name '*.class' \ + ! -name 'Jdk13LumberjackLogger.class' \ + ! -name 'ServletContextCleaner.class' \ + ) || die + + # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257 + jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \ + $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ + ! -name 'WeakHashtable*.class' \ + ! -name 'LogFactoryImpl*.class' \ + ) || die + + popd > /dev/null || die +} + +src_test() { + # Do not run Log4j tests because these tests use an Appender to verify + # logging correctness. The log4j-12-api bridge no longer supports using an + # Appender for verifications since the methods for adding an Appender in + # the bridge "are largely no-ops". This means an Appender's state would + # never be changed by log4j-12-api after new messages are logged. The test + # cases, however, expect changes to the Appender's state in such an event, + # so they would fail with log4j-12-api. + # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html + rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger + rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger + rm -r src/test/java/org/apache/commons/logging/log4j || die + + JAVA_TEST_EXCLUDES=( + org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing + org.apache.commons.logging.jdk14.TestHandler # No runnable methods + ) + JAVA_TEST_EXTRA_ARGS=( + -Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)" + -Dcommons-logging="commons-logging.jar" + -Dcommons-logging-api="commons-logging-api.jar" + -Dcommons-logging-adapters="commons-logging-adapters.jar" + -Dtestclasses="target/test-classes" + ) + if use log4j; then + JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" + fi + JAVA_TEST_GENTOO_CLASSPATH="junit-4" + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + JAVA_TEST_SRC_DIR="src/test/java" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar +} diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml index c3b68538712d..6d5d06dd2376 100644 --- a/dev-java/commons-logging/metadata.xml +++ b/dev-java/commons-logging/metadata.xml @@ -7,6 +7,7 @@ https://issues.apache.org/jira/projects/LOGGING/issues/ + https://commons.apache.org/proper/commons-logging/guide.html apache/commons-logging -- cgit v1.2.3