From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1435325-garchives=archives.gentoo.org@lists.gentoo.org> 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 70E79158012 for <garchives@archives.gentoo.org>; Sat, 10 Sep 2022 16:36:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A462EE0972; Sat, 10 Sep 2022 16:36:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 88516E0972 for <gentoo-commits@lists.gentoo.org>; Sat, 10 Sep 2022 16:36:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A214F340B98 for <gentoo-commits@lists.gentoo.org>; Sat, 10 Sep 2022 16:36:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E84E65DA for <gentoo-commits@lists.gentoo.org>; Sat, 10 Sep 2022 16:36:16 +0000 (UTC) From: "Florian Schmaus" <flow@gentoo.org> 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" <flow@gentoo.org> Message-ID: <1662827771.2afba0a5b56257a2934bb593e807ec410b333c5c.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/woodstox-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/woodstox-core/Manifest dev-java/woodstox-core/woodstox-core-6.3.1.ebuild X-VCS-Directories: dev-java/woodstox-core/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 2afba0a5b56257a2934bb593e807ec410b333c5c X-VCS-Branch: master Date: Sat, 10 Sep 2022 16:36:16 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3c7ecdda-8579-4106-a807-bb9af632b64e X-Archives-Hash: 54f97746ffacfc4defa0f84afde9661a commit: 2afba0a5b56257a2934bb593e807ec410b333c5c Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Jul 7 17:24:20 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sat Sep 10 16:36:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afba0a5 dev-java/woodstox-core: add 6.3.1 We build without shaded com/ctc/wstx/shaded/msv_core*/ since we have it all on classpath. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/26035 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/woodstox-core/Manifest | 1 + dev-java/woodstox-core/woodstox-core-6.3.1.ebuild | 89 +++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest index 28967d079b9e..df08ed0f3b78 100644 --- a/dev-java/woodstox-core/Manifest +++ b/dev-java/woodstox-core/Manifest @@ -1 +1,2 @@ DIST woodstox-core-6.2.8.tar.gz 5250255 BLAKE2B 69e45da9c7e09652ffc45b366359ae12954ad0450157d8639833d41600958d10ff1203502c926f0f23cd3e3d03dbc83378a9614e5eb19367fb60fad1232f4dd8 SHA512 c5af386891ab63fb2efc8510353e35c20fa157048631c809ed3d7e070b377ef5c21ffb1b7a0f9e597113db714ebc778951ac8a8e049c3d8291a89c3a0e7a044e +DIST woodstox-core-6.3.1.tar.gz 6029586 BLAKE2B 04fcd7fd958cd3efa8a1e864786b88a1f8c3f0d6d6faecb5eb91a7cf755da4cef2664c0583702bf21dde741632638242131f0d46acb8f1b91bd00bf4c9a7af5b SHA512 fee1d8dc33aa2e3617b451fab285dbc91154738765eb9d93e8c1809a70f09ccb2f1cf2b70f57f836323d0a80bd5caeae0f5a4c5e2cee609c2a9d30106bf42acb diff --git a/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild b/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild new file mode 100644 index 000000000000..293bbb3edbb1 --- /dev/null +++ b/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild @@ -0,0 +1,89 @@ +# 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/FasterXML/woodstox/archive/woodstox-core-6.3.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.3.1.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.3.1" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs" +HOMEPAGE="https://github.com/FasterXML/woodstox" +SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +# Common dependencies +# POM: pom.xml +# net.java.dev.msv:msv-core:2013.6.1 -> >=dev-java/msv-2022.7:0 +# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-2022.7:0 +# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0 +# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0 + +CP_DEPEND=" + dev-java/msv:0 + dev-java/relaxng-datatype:0 + dev-java/stax2-api:0 + dev-java/xsdlib:0 +" + +# Compile dependencies +# POM: pom.xml +# biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1 -> >=dev-java/aqute-bnd-annotation-6.3.1:0 +# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0 +# POM: pom.xml +# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 + +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:* + dev-java/aqute-bnd-annotation:0 + dev-java/osgi-core:0" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} ) + +S="${WORKDIR}/woodstox-${P}" + +JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core" +JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +# https://github.com/FasterXML/woodstox/blob/woodstox-core-6.3.0/pom.xml#L229-L243 +src_test() { + pushd src/test/java > /dev/null || die + local JAVA_TEST_RUN_ONLY=$(find * \ + \( -wholename "**/Test*.java" \ + -o -wholename "**/*Test.java" \) \ + ! -wholename "failing/*.java" \ + ! -wholename "**/Abstract*.jav" \ + ! -wholename "**/Base*.java" \ + ) + popd > /dev/null + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_prepare() { + default + + # src/moditect/module-info.java:33: error: cannot find symbol + # provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.dtd with com.ctc.wstx.dtd.DTDSchemaFactory; + # https://bugs.gentoo.org/858302 + sed -e '/com.ctc.wstx.shaded.msv/d' \ + -e '/org.codehaus.stax2.validation/d' \ + -i "src/moditect/module-info.java" || die +}