From e92f1e5bca4b82c0d1a5574bbe2d8dcded66e20b Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sun, 26 Nov 2023 18:27:48 +0000 Subject: Adding metadata --- dev-java/json/Manifest | 4 + .../json/files/json-20231013-JSONObjectTest.patch | 31 +++++++ dev-java/json/json-20231013.ebuild | 69 +++++++++++++++ dev-java/jtidy/Manifest | 1 + dev-java/jtidy/jtidy-938.ebuild | 29 +++++++ dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild | 97 ++++++++++++++++++++++ dev-java/mvel/Manifest | 1 + dev-java/mvel/mvel-2.5.0.ebuild | 66 +++++++++++++++ 8 files changed, 298 insertions(+) create mode 100644 dev-java/json/files/json-20231013-JSONObjectTest.patch create mode 100644 dev-java/json/json-20231013.ebuild create mode 100644 dev-java/jtidy/jtidy-938.ebuild create mode 100644 dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild create mode 100644 dev-java/mvel/mvel-2.5.0.ebuild (limited to 'dev-java') diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index c41dbd88dc04..ad2bfa90a8b3 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1 +1,5 @@ +DIST asm-1.0.2.jar 71757 BLAKE2B f4aaaba90cbe5a0e22c236c7d368e1ee7513511d924d8c19a4218abcbc874832bfa219024c0758933b855cd4eba351458c500bbbe66123d54a4d384383dfcb4d SHA512 469ad53734d02b685506921e9318fc649da373eab5febfe23697f0ed948d04aa74e77792834f7cf2438a6b8bb91550cbb4d64c5037556dafa48118842fa7c881 DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0 +DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 +DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 +DIST json-smart-2.5.0.jar 120233 BLAKE2B fb6f89b6df02789d24b650b9c55130363ee235af09f1446926135bf2f4de33757a3d4fd26f0e7f24e44532e21c5453022c781d8fec85e34ea4da92ce4ac992ae SHA512 56284bb3cee2bcc3684cdcc610115c7eacafdbd70aa852cb0209616b0503dfd448c5110b50e11a71b1c61a6e7ea27594ff63cc968230374555cc6f652d69d372 diff --git a/dev-java/json/files/json-20231013-JSONObjectTest.patch b/dev-java/json/files/json-20231013-JSONObjectTest.patch new file mode 100644 index 000000000000..e077f19bd5a1 --- /dev/null +++ b/dev-java/json/files/json-20231013-JSONObjectTest.patch @@ -0,0 +1,31 @@ +There was 1 failure: +1) jsonObjectByBean1(org.json.junit.JSONObjectTest) +com.jayway.jsonpath.PathNotFoundException: No results for path: $['mockitoInterceptor'] + at com.jayway.jsonpath.internal.path.EvaluationContextImpl.getValue(EvaluationContextImpl.java:131) + at com.jayway.jsonpath.JsonPath.read(JsonPath.java:187) + at com.jayway.jsonpath.internal.JsonContext.read(JsonContext.java:164) + at com.jayway.jsonpath.internal.JsonContext.read(JsonContext.java:151) + at com.jayway.jsonpath.JsonPath.read(JsonPath.java:488) + at org.json.junit.JSONObjectTest.jsonObjectByBean1(JSONObjectTest.java:634) + +FAILURES!!! +Tests run: 668, Failures: 1 +--- a/src/test/java/org/json/junit/JSONObjectTest.java ++++ b/src/test/java/org/json/junit/JSONObjectTest.java +@@ -56,6 +56,7 @@ import org.json.junit.data.Singleton; + import org.json.junit.data.SingletonEnum; + import org.json.junit.data.WeirdList; + import org.junit.Test; ++import org.junit.Ignore; + + import com.jayway.jsonpath.Configuration; + import com.jayway.jsonpath.JsonPath; +@@ -601,7 +602,7 @@ public class JSONObjectTest { + * bean getters return valid JSON types + */ + @SuppressWarnings("boxing") +- @Test ++ @Test @Ignore + public void jsonObjectByBean1() { + /** + * Default access classes have to be mocked since JSONObject, which is diff --git a/dev-java/json/json-20231013.ebuild b/dev-java/json/json-20231013.ebuild new file mode 100644 index 000000000000..3a3262132a5c --- /dev/null +++ b/dev-java/json/json-20231013.ebuild @@ -0,0 +1,69 @@ +# 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="org.json:json:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A reference implementation of a JSON package in Java" +HOMEPAGE="https://github.com/stleary/JSON-java" +SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz + test? ( + https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar + https://repo1.maven.org/maven2/net/minidev/json-smart/2.5.0/json-smart-2.5.0.jar + https://repo1.maven.org/maven2/net/minidev/asm/1.0.2/asm-1.0.2.jar + )" +S="${WORKDIR}/JSON-java-${PV}" + +LICENSE="JSON" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/slf4j-api:0 + dev-java/mockito:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README,SECURITY}.md ) +PATCHES=( "${FILESDIR}/json-20231013-JSONObjectTest.patch" ) + +JAVA_AUTOMATIC_MODULE_NAME="org.json" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + asm-9 + junit-4 + mockito + slf4j-api +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-2.1.0.jar" # Test compile dependency + JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/json-smart-2.5.0.jar" # Test runtime dependency + + # Exception java.lang.NoClassDefFoundError: net/minidev/asm/FieldFilter + JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/asm-1.0.2.jar" # Test runtime dependency + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest index e09ee53ded98..bd28d25f9377 100644 --- a/dev-java/jtidy/Manifest +++ b/dev-java/jtidy/Manifest @@ -1 +1,2 @@ DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a +DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-938.ebuild new file mode 100644 index 000000000000..a358bb13a064 --- /dev/null +++ b/dev-java/jtidy/jtidy-938.ebuild @@ -0,0 +1,29 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="net.sf.jtidy:jtidy:r${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="a Java port of HTML Tidy, a HTML syntax checker and pretty printer" +HOMEPAGE="https://sourceforge.net/projects/jtidy/" +SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${PV}-sources.zip" + +LICENSE="HTML-Tidy W3C" +SLOT="9" +KEYWORDS="~amd64" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/ant-core:0" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8 " +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8" + +JAVA_MAIN_CLASS="org.w3c.tidy.Tidy" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild new file mode 100644 index 000000000000..45a7f75b6a3c --- /dev/null +++ b/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild @@ -0,0 +1,97 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.lz4:lz4-java:1.8.0" + +inherit java-pkg-2 java-ant-2 toolchain-funcs + +DESCRIPTION="LZ4 compression for Java" +HOMEPAGE="https://github.com/lz4/lz4-java" +SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to +# be packaged. Some extra steps are required before running the tests: +# 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant +# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar +# 3. ppc64 only: Install test dependencies that are unkeyworded +# 4. Set ALLOW_TEST="all" +RESTRICT="test" + +CDEPEND=" + app-arch/lz4:= +" + +DEPEND=" + >=virtual/jdk-1.8:* + dev-java/mvel:2.5 + dev-libs/xxhash + test? ( + dev-java/junit:4 + dev-java/randomized-runner:0 + ) + ${CDEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CDEPEND} +" + +# Ant is only needed to generate JNI headers; +# the JNI shared object will be built by the custom Makefile +EANT_BUILD_TARGET="compile-java generate-headers" +EANT_DOC_TARGET="docs" +EANT_EXTRA_ARGS="-Djava.io.tmpdir=${T}" +EANT_TEST_GENTOO_CLASSPATH="randomized-runner" + +pkg_setup() { + java-pkg-2_pkg_setup + local build_only_cp="$(java-pkg_getjars --build-only mvel-2.5)" + if [[ -z "${EANT_GENTOO_CLASSPATH_EXTRA}" ]]; then + EANT_GENTOO_CLASSPATH_EXTRA="${build_only_cp}" + else + EANT_GENTOO_CLASSPATH_EXTRA+=":${build_only_cp}" + fi +} + +src_prepare() { + eapply "${FILESDIR}/${P}-print-os-props.patch" + eapply "${FILESDIR}/${P}-skip-ivy.patch" + cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile" + cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml || + die "Failed to copy Gentoo classpath injection XML" + java-pkg-2_src_prepare + rm -r src/resources || die "Failed to remove pre-built shared libraries" +} + +src_compile() { + java-pkg-2_src_compile + emake CC="$(tc-getCC)" JAVA_HOME="${JAVA_HOME}" + # JNI has already been built by the Makefile at this point + # Also pretend cpptasks is available, which is required by build.xml + EANT_EXTRA_ARGS+=" -Dcpptasks.available=true -Dskip.jni=true" + # Manually call 'ant jar' to include the JNI shared object in JAR + eant jar -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar 'dist/${ivy.module}.jar' + java-pkg_doso $(find build/jni -name "*.so") + use doc && java-pkg_dojavadoc build/docs + # Ant project's 'sources' target generates a source JAR rather than a Zip + # archive; we simply let java-utils-2.eclass create the source Zip archive + # from the same source directories the 'sources' target would access + # https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L323-L330 + use source && java-pkg_dosrc src/java/* src/java-unsafe/* +} diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest index 4af3792b6c2f..63212e9bcedb 100644 --- a/dev-java/mvel/Manifest +++ b/dev-java/mvel/Manifest @@ -1 +1,2 @@ DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc +DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85 SHA512 29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5 diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild new file mode 100644 index 000000000000..79dbf2350f51 --- /dev/null +++ b/dev-java/mvel/mvel-2.5.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.mvel:mvel2:${PV}.Final" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="MVFLEX Expression Language" +HOMEPAGE="https://github.com/mvel/mvel" +SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz" +S="${WORKDIR}/${PN}-${PN}2-${PV}.Final" + +LICENSE="Apache-2.0" +SLOT="2.5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/asm:9 + >=virtual/jdk-1.8:* +" +RDEPEND=">=virtual/jre-1.8:*" + +# Required due to use of '_' as identifiers in source files +JAVADOC_ARGS="-source 8" +JAVA_CLASSPATH_EXTRA="asm-9" +JAVA_MAIN_CLASS="org.mvel2.sh.Main" +JAVA_SRC_DIR="src/main/java" + +# Significantly speed up test execution +# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171 +JAVA_TEST_EXTRA_ARGS=( + -Dfile.encoding=UTF-8 + -Dmvel.disable.jit=true + -Dmvel.tests.quick=true +) +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" ) +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + # ${S}/pom.xml#201-214 + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + \( -name "*Test.java" \ + -o -name '*Tests.java' \ + -o -name 'UsageDemos.java' \)\ + ! -name "AbstractTest.java*" \ + ! -name "CompiledUnitTestEx.java" \ + ! -name "PerfTest.java" \ + ! -name "DroolsTest.java" \ + ! -name "FailureTests.java" \ + ! -name "PerformanceTest.java" \ + ! -name "CompiledPerformanceTests.java" \ + ! -name "MVELThreadTest.java*" \ + ! -name "SimpleTests.java*" \ + ! -name "BaseOperatorsTest.java*" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} -- cgit v1.3