From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91821158094 for ; Thu, 7 Jul 2022 07:04:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AB7EE0DE0; Thu, 7 Jul 2022 07:04:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E748E0DE0 for ; Thu, 7 Jul 2022 07:04:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65709340E96 for ; Thu, 7 Jul 2022 07:04:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA9B852C for ; Thu, 7 Jul 2022 07:04:28 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1657177458.7129384b66bd2f87cbe625b023ce900fe7efc955.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/log4j-core/Manifest dev-java/log4j-core/log4j-core-2.18.0.ebuild X-VCS-Directories: dev-java/log4j-core/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 7129384b66bd2f87cbe625b023ce900fe7efc955 X-VCS-Branch: master Date: Thu, 7 Jul 2022 07:04:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8442c437-09a4-48e7-bcb0-20134c4ca728 X-Archives-Hash: c548052b89e45bcbdd1dbd0644b52274 commit: 7129384b66bd2f87cbe625b023ce900fe7efc955 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Jul 5 11:18:28 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu Jul 7 07:04:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7129384b dev-java/log4j-core: add 2.18.0 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Florian Schmaus gentoo.org> dev-java/log4j-core/Manifest | 1 + dev-java/log4j-core/log4j-core-2.18.0.ebuild | 175 +++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest index 0116f1a3571a..71eb0f57dfac 100644 --- a/dev-java/log4j-core/Manifest +++ b/dev-java/log4j-core/Manifest @@ -1 +1,2 @@ DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176 +DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b diff --git a/dev-java/log4j-core/log4j-core-2.18.0.ebuild b/dev-java/log4j-core/log4j-core-2.18.0.ebuild new file mode 100644 index 000000000000..c89b20c08cd1 --- /dev/null +++ b/dev-java/log4j-core/log4j-core-2.18.0.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0" +# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="The Apache Log4j Implementation" +HOMEPAGE="https://logging.apache.org/log4j/2.x/" +SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# We don't have junit-vintage and junit-jupiter +RESTRICT="test" + +# Common dependencies +# POM: ${PN}/pom.xml +# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0 +# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0 +# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0 +# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0 +# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3:0 +# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0 +# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0 +# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0 +# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0 +# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0 +# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2 +# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2 +# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!! +# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0 +# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0 + +CP_DEPEND=" + dev-java/commons-compress:0 + dev-java/commons-csv:0 + dev-java/conversant-disruptor:0 + dev-java/jackson-core:0 + dev-java/jackson-databind:0 + dev-java/jackson-dataformat-xml:0 + dev-java/jackson-dataformat-yaml:0 + dev-java/jansi:2 + dev-java/javax-mail:0 + dev-java/jctools-core:3 + dev-java/jeromq:0 + dev-java/kafka-clients:0 + dev-java/lmax-disruptor:0 + ~dev-java/log4j-api-${PV}:2 + dev-java/slf4j-api:0 + dev-java/woodstox-core:0 +" + +# Compile dependencies +# POM: ${PN}/pom.xml +# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!! +# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!! +# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!! +# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0 +# POM: ${PN}/pom.xml +# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0 +# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0 +# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!! +# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!! +# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!! +# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0 +# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 +# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 +# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!! +# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0 +# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!! +# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 +# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!! +# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2 +# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!! +# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!! +# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!! +# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!! +# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!! +# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!! +# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0 +# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!! +# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!! +# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!! +# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!! +# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!! +# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4 +# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!! +# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0 +# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!! +# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0 +# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!! +# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!! +# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!! + +DEPEND="${CP_DEPEND} + dev-java/jakarta-activation-api:1 + dev-java/jakarta-mail-api:0 + dev-java/javax-jms-api:0 + dev-java/osgi-core-api:0 + >=virtual/jdk-1.8:*" +# test? ( +# !!!artifactId-not-found!!! +# !!!groupId-not-found!!! +# >=dev-java/bsh-2.0_beta6:0 +# >=dev-java/commons-codec-1.15:0 +# >=dev-java/commons-io-2.11.0:1 +# >=dev-java/commons-lang-3.12.0:3.6 +# >=dev-java/commons-logging-1.2:0 +# >=dev-java/hamcrest-2.2:0 +# >=dev-java/log4j-api-2.18.0:2 +# >=dev-java/logback-classic-1.2.11:0 +# >=dev-java/logback-core-1.2.11:0 +# >=dev-java/mockito-4.4.0:4 +# >=dev-java/slf4j-ext-1.7.36:0 +# >=dev-java/xz-java-1.9:0 +# ) +#" + +# Runtime dependencies +# POM: ${PN}/pom.xml +# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!! + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND}" + +DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md ) + +S="${WORKDIR}/apache-log4j-${PV}-src" + +JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core-api" +JAVA_SRC_DIR="${PN}/src/main/java" +JAVA_RESOURCE_DIRS="${PN}/src/main/resources" + +#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!" +#JAVA_TEST_SRC_DIR="${PN}/src/test/java" +#JAVA_TEST_RESOURCE_DIRS=( +# "${PN}/src/test/resources" +#) + +src_compile() { + java-pkg-simple_src_compile + + # Process the @Plugin annotation used on Log4j 2 built-in plugins + # to generate a serialized plugin listing file + # https://logging.apache.org/log4j/2.x/manual/plugins.html + local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor" + local classes="target/classes" + local classpath="${JAVA_JAR_FILENAME}:$(\ + java-pkg_getjars --build-only --with-dependencies \ + "${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")" + # Just in case java-pkg-simple.eclass changes the path in the future + mkdir -p "${classes}" || die "Failed to create directory for classes" + local sources_list_file="${T}/sources.lst" + find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die + ejavac -d "${classes}" -cp "${classpath}" \ + -proc:only -processor "${processor}" \ + @"${sources_list_file}" + # Update the JAR to include the serialized plugin listing file + local jar="$(java-config -j)" + "${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . || + die "Failed to update JAR" +}