commit: 036d6a13a4f8b6288caae648525c3b49ed4584f7
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jan 4 17:04:29 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 06:16:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036d6a13
dev-java/commons-logging: add 1.3.0_pre20230317
- Uses snapshot with many fixes and updates
- Drops dependencies on dev-java/avalon-{logkit,framework}
- Switches to java-pkg-simple.eclass
- Tests still tbd, https://bugs.gentoo.org/839681
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30217
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/commons-logging/Manifest | 1 +
.../commons-logging-1.3.0_pre20230317.ebuild | 102 +++++++++++++++++++++
dev-java/commons-logging/metadata.xml | 27 ++++--
3 files changed, 120 insertions(+), 10 deletions(-)
diff --git a/dev-java/commons-logging/Manifest
b/dev-java/commons-logging/Manifest
index 7831dfb07830..caa33d505a88 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1 +1,2 @@
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
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
new file mode 100644
index 000000000000..3fb433092d18
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild
@@ -0,0 +1,102 @@
+# 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/metadata.xml
b/dev-java/commons-logging/metadata.xml
index 929f4e61cf4e..c3b68538712d 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -1,14 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Java</name>
- </maintainer>
- <use>
- <flag name="avalon-framework">Add optional support for
avalon-framework</flag>
- <flag name="avalon-logkit">Add optional support for avalon-logkit</flag>
- <flag name="log4j">Add optional support for log4j</flag>
- <flag name="servletapi">Add optional support for servletapi</flag>
- </use>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+
<bugs-to>https://issues.apache.org/jira/projects/LOGGING/issues/</bugs-to>
+ <remote-id type="github">apache/commons-logging</remote-id>
+ </upstream>
+ <use>
+ <flag name="avalon-framework">Add optional support for
avalon-framework</flag>
+ <flag name="avalon-logkit">Add optional support for
avalon-logkit</flag>
+ <flag name="log4j">Add optional support for log4j</flag>
+ <flag name="servletapi">Add optional support for
servletapi</flag>
+ </use>
+ <longdescription>
+ Apache Commons Logging is a thin adapter allowing configurable
bridging to other, well known logging systems.
+ </longdescription>
</pkgmetadata>
