gentoo resync : 29.12.2022

3 files changed, 43 insertions, 41 deletions

diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 1ba12e438b32..7cdbe4bcfe8b 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,5 +1,4 @@
-DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
-EBUILD log4j-core-2.17.1-r1.ebuild 8262 BLAKE2B 2f2014a50da0d4d488773cd2fb07bc83dc101c300b490ffd12f19b9fbdc415898398f9eb841b71d7e1691a19c107bcf3a4cd7bf0d23c9a78135e3ad990722c18 SHA512 599aee21fc409744a86ba3a8e98002fdf7cac966f6042174272870c8bb2aa634177bda8e85b2b1bc3cf2ffb433757514d9b732916e03e2cda5597c081facccf8
-EBUILD log4j-core-2.17.2.ebuild 8554 BLAKE2B 9d69df78d6e5f21ed33c2d3ad75629f12785487347a89ecbb19c4eebfe358eec733ca65df2c81b72fd35797eb2ca2797305ac8320852e1c79af5cc10d01c18b2 SHA512 8d1999563336f21fb7bb748bf4b7723bf0bc1c4f8d0f0342b631dc350dc0f35951ffa55741f69960476bfe12ea529ffbb2eb289150ed0db895d22fceb0bb4104
+EBUILD log4j-core-2.17.2-r1.ebuild 8554 BLAKE2B e4eaf3b001f8c949478aef1e13b7d04d91d5a97108df0d9da886adfdf1730d1a8e34ff10ce0eb27e174ea358d11ddb617865ab49e3b19eed972ad47c94447793 SHA512 0563585afeba69ca1ed5ef393b9ec5a1c1b7110b467595d7e6d62ac8182011a3bada70b2ad8abdd308ff9dc547278fe25cd111cec52e139f25e13347deeed1d1
+EBUILD log4j-core-2.17.2.ebuild 8550 BLAKE2B 429e7da14c9aef21fb613522f9a240ae9f731f776a5c1c0b894da7b8f3176f6d7c0ec0dd83ff63c66520e4ecf0c1511bbf94ce58a979fb71f4aa5b4bec262903 SHA512 a13d5761ceabf1c307f82f715e9c71ba2d68135859fdc5c3419e572d2ca293f0c2bf1efbc61b0a0d55dc054b60678d9f1c9b79cf29cb668b7eb187b137036dc6
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
index d8b17937938b..4ba81d46a2d7 100644
--- a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
@@ -2,12 +2,12 @@
 # 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.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.1.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.2.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.1"
+MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.2"
 # JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
@@ -26,20 +26,20 @@ 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.12.4 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.12.4 -> >=dev-java/jackson-databind-2.13.0:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.4 -> >=dev-java/jackson-dataformat-xml-2.13.0:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.4 -> >=dev-java/jackson-dataformat-yaml-2.13.0:0
-# com.fasterxml.woodstox:woodstox-core:6.2.6 -> >=dev-java/woodstox-core-6.2.7:0
+# com.fasterxml.jackson.core:jackson-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1 -> >=dev-java/jackson-dataformat-yaml-2.13.2: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
-# com.sun.mail:javax.mail:1.6.2 -> >=dev-java/javax-mail-1.6.2:0
+# com.sun.mail:javax.mail:1.6.2 -> !!!suitable-mavenVersion-not-found!!!
 # 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.17.1 -> >=dev-java/log4j-api-2.17.1:2
-# org.fusesource.jansi:jansi:2.3.4 -> >=dev-java/jansi-2.4.0:2
+# org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
 # org.jctools:jctools-core:1.2.1 -> >=dev-java/jctools-core-2.0.2:0
-# org.slf4j:slf4j-api:1.7.25 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-api:1.7.35 -> >=dev-java/slf4j-api-1.7.36:0
 # org.zeromq:jeromq:0.4.3 -> >=dev-java/jeromq-0.5.2:0
 
 CP_DEPEND="
@@ -53,7 +53,7 @@ CP_DEPEND="
 	dev-java/jakarta-activation-api:1
 	dev-java/jansi:2
 	dev-java/javax-mail:0
-	dev-java/jctools-core:0
+	dev-java/jctools-core:3
 	dev-java/jeromq:0
 	dev-java/kafka-clients:0
 	dev-java/lmax-disruptor:0
@@ -70,38 +70,40 @@ CP_DEPEND="
 # test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
 # test? ch.qos.logback:logback-core:1.2.3 -> !!!groupId-not-found!!!
 # test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
-# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.0.1 -> !!!groupId-not-found!!!
+# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
 # test? com.h2database:h2:1.4.200 -> !!!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? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# test? net.javacrumbs.json-unit:json-unit:2.27.0 -> !!!groupId-not-found!!!
+# 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.16.3 -> !!!groupId-not-found!!!
+# test? org.apache.activemq:activemq-broker:5.16.4 -> !!!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:5.6.12 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
-# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
-# test? org.awaitility:awaitility:4.0.3 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-dateutil:3.0.8 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-jsr223:3.0.8 -> !!!groupId-not-found!!!
-# test? org.codehaus.plexus:plexus-utils:3.4.0 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
+# test? org.awaitility:awaitility:4.1.1 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-dateutil:3.0.9 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-jsr223:3.0.9 -> !!!groupId-not-found!!!
+# test? org.codehaus.plexus:plexus-utils:3.4.1 -> !!!groupId-not-found!!!
 # test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
 # test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
-# test? org.hdrhistogram:HdrHistogram:2.1.9 -> !!!groupId-not-found!!!
+# test? org.hdrhistogram:HdrHistogram:2.1.12 -> !!!groupId-not-found!!!
 # test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
 # test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:3.11.2 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.mockito:mockito-junit-jupiter:3.11.2 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-ext:1.7.25 -> !!!artifactId-not-found!!!
-# test? org.springframework:spring-test:5.3.13 -> !!!groupId-not-found!!!
+# test? org.junit-pioneer:junit-pioneer:1.6.1 -> !!!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.3.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.mockito:mockito-junit-jupiter:4.3.1 -> !!!artifactId-not-found!!!
+# test? org.slf4j:slf4j-ext:1.7.35 -> >=dev-java/slf4j-ext-1.7.36:0
+# test? org.springframework:spring-test:5.3.15 -> !!!groupId-not-found!!!
 # test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-# test? org.xmlunit:xmlunit-core:2.8.3 -> !!!groupId-not-found!!!
-# test? org.xmlunit:xmlunit-matchers:2.8.3 -> !!!groupId-not-found!!!
+# 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}
@@ -119,6 +121,7 @@ DEPEND="${CP_DEPEND}
 #		>=dev-java/commons-logging-1.2:0
 #		>=dev-java/log4j-1.2.17:0
 #		~dev-java/log4j-api-${PV}:2
+#		>=dev-java/slf4j-ext-1.7.36:0
 #		>=dev-java/xz-java-1.9:0
 #	)
 #"
@@ -127,15 +130,13 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
 
 S="${WORKDIR}/apache-log4j-${PV}-src"
 
 JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1,osgi-core-api"
 JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"${PN}/src/main/resources"
-)
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 
 #	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,log4j,!!!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!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!artifactId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
 #	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
@@ -156,9 +157,11 @@ src_compile() {
 		"${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}" \
-		$(find "${JAVA_SRC_DIR}" -name "*.java")
+		@"${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}" . ||
diff --git a/dev-java/log4j-core/log4j-core-2.17.2.ebuild b/dev-java/log4j-core/log4j-core-2.17.2.ebuild
index ff6f6cff8753..019860e2e92a 100644
--- a/dev-java/log4j-core/log4j-core-2.17.2.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.2.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"