diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-19 09:49:52 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-19 09:49:52 +0100 |
commit | d99752d3d5e12a0fc38778cb734bc68bbe2ed3bb (patch) | |
tree | 5f37e3f56df65ede7caf11eb0bd1fbf0ee03ac3c /dev-java | |
parent | a643f0010255d34e6b8045aba39aef5174921a7d (diff) |
gentoo auto-resync : 19:10:2023 - 09:49:52
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/Manifest.gz | bin | 58125 -> 58125 bytes | |||
-rw-r--r-- | dev-java/commons-codec/Manifest | 5 | ||||
-rw-r--r-- | dev-java/commons-codec/commons-codec-1.16.0.ebuild | 46 | ||||
-rw-r--r-- | dev-java/commons-codec/metadata.xml | 3 | ||||
-rw-r--r-- | dev-java/jcommander/Manifest | 3 | ||||
-rw-r--r-- | dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch | 57 | ||||
-rw-r--r-- | dev-java/jcommander/jcommander-1.64-r1.ebuild (renamed from dev-java/jcommander/jcommander-1.64.ebuild) | 15 |
7 files changed, 126 insertions, 3 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex 0d42bc1a86b1..6e56548d6858 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest index cc5245598f26..8e56e706df10 100644 --- a/dev-java/commons-codec/Manifest +++ b/dev-java/commons-codec/Manifest @@ -1,3 +1,6 @@ DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce +DIST commons-codec-1.16.0-src.tar.gz 447581 BLAKE2B 111151b4cf409dbc6f69106ed30f2cfd60a1ab3aa15eb0cfe80ff1c2a06875f6856e387f66751c26f58dc29907ae7a03b16f23f7860114839df298a6c37d9fdd SHA512 5212beae43a59d5a92c80f87640278913bf07d6527ead573710391a8b5c813af67f8086de5cd80f4b06845752652684d7c28f6236f5a8bd0bd6a8b89dc0d9532 +DIST commons-codec-1.16.0-src.tar.gz.asc 488 BLAKE2B 96ac95b5efbc812b5df0d002eeff874ff23e05e0229e4f49bf29aaf9c75b32845adeb803c9c8d4d3b190bf2bfab626c59cb2fa2b2439b5611b158d27b73d4c0c SHA512 03f9281e93cd4a1cf42878bd25045368bc72a50edace9b38a977658e7e83b45bfe835065e80e0838a5e57d16a8737624ab388cdcd3fee58ec2114ff4fc241816 EBUILD commons-codec-1.15-r1.ebuild 1410 BLAKE2B 15e92f35b907c56a8dcf8e90d878b67a81c1c2a2068d8e3d41370addda2df55f650ad707116144fab60ec29e0298a2f1e80cf7525e0b34f48e624e87635c061c SHA512 458add7d92399e802b0db1acb1288eb4634b64474247aa36f8adc17c0524b4aebeb92dac8c13c3fa860783d38393fd48fdeade0593ea2d44824bfe353d3f3c2d -MISC metadata.xml 1361 BLAKE2B b73337d1547879b37b5c97ab5365258989ac49f45ec1e0c10b835a849ad804e0da7f737f0e67e660a34f3ff1c2a66876f1878a98680b0e86740e84b9eaa16e9f SHA512 50d46b0c3607e8181f516ffc198c5cb2640b7c1182c7242f3e10b8671d85b12fa9708847148b937fe824b990b89f25bee4a95722b86742edd6554c39d4768262 +EBUILD commons-codec-1.16.0.ebuild 1289 BLAKE2B 2959fb65dcc7c4a027594d6010a5a721d4e8e526462c7c986dd4bca0aa994f20b3ebc11425dcdb4f100827172553cb7ec5045c42538e88f9d511b91767c78226 SHA512 3548467c5f8ccf3019fe84a885cba5eda8a7525237fbf3507fb940f178ba22f72c4eea6f646c549ff122d474d96aa7ea777aa54c49866090be78374a241dffc2 +MISC metadata.xml 1443 BLAKE2B 9dc72c216ed78422e21ce8c25aab0ca901fe2947ab3d26076379701c7ed585def08c49d258e30d035ffb8e7f618540578cc34ca4246a30e21e1ebbab13c706bd SHA512 1ae390b599a1b817f1d7bc54e8d73dfe596de6a6829ef65554f4a27d16e79e1c99645302d1d761caefb48e46f54ba930cf0991985beedc93e7fb416b7146a920 diff --git a/dev-java/commons-codec/commons-codec-1.16.0.ebuild b/dev-java/commons-codec/commons-codec-1.16.0.ebuild new file mode 100644 index 000000000000..fdd36dbaa9e4 --- /dev/null +++ b/dev-java/commons-codec/commons-codec-1.16.0.ebuild @@ -0,0 +1,46 @@ +# 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-codec:commons-codec:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Implementations of common encoders and decoders in Java" +HOMEPAGE="https://commons.apache.org/proper/commons-codec/" +SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/codec/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +RESTRICT="test" #839681 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/commons-lang:3.6 + dev-java/hamcrest:0 + dev-java/junit:5[migration-support] + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.codec" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + junit-5 + commons-lang-3.6 + hamcrest +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/commons-codec/metadata.xml b/dev-java/commons-codec/metadata.xml index 05adc2eb44df..3a111ef6e0e6 100644 --- a/dev-java/commons-codec/metadata.xml +++ b/dev-java/commons-codec/metadata.xml @@ -5,6 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> +<upstream> + <remote-id type="github">apache/commons-codec</remote-id> +</upstream> <longdescription> Codec was formed as an attempt to focus development effort on one diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest index e4ed5126ddcf..7300fb714c44 100644 --- a/dev-java/jcommander/Manifest +++ b/dev-java/jcommander/Manifest @@ -1,5 +1,6 @@ +AUX jcommander-1.64-DynamicParameterTest.patch 3240 BLAKE2B 8b89c7bceb1b077e8f81a4a720350dca39dfc36752d16c3407ee90c8d1018a26108e7e5cb3253c3e9fd0c67487bc522075fcd04439f5fd1c79ac17b6d00b9973 SHA512 ee96dae207a72415ad6d8f6c1975aa9117bd03dca905ee5a99b48df5929dd2067afd0f90199a05fc7d7c43038fb8242101bb5685caf04f6543597eff609dd318 DIST jcommander-1.64.tar.gz 4404316 BLAKE2B 17ade214604de2ed8e85fd8b8043483f5b3c6d26b7a59afe2cc83dfa804fa298a2a1a4251ac65f66ad3a89002f532c29ee031b0a26293cbbd4f3df72e9a3a6ac SHA512 aaf7c323d9a829635847774b927d63cc35fbe479271029b8f3fdb94c6839dc26ac55f5c28fefbee6a0219e11c73f2c487c3660bf2f3a7f4033c0e2092d6f2fa4 DIST jcommander-1.82.tar.gz 4433079 BLAKE2B 08111ae7a85202dc3a082db58f42ef5183b05cae827bc304ba426a3d02bf7a4123f84500e6ec5694578a7aa29c631cca692fe71d67e12a1107c57e1858be4dcf SHA512 1abcb54cec21e95a3e5fc952320a7fca1d480f9900992e686f66df49749b6eee79e18dc670f10cc05b0d2a4f0a72fae302568a51ff193788897878aefc3ff67b -EBUILD jcommander-1.64.ebuild 573 BLAKE2B 578a360dc97bda518497b099f5e3d3c9be7d50e12bf298dcbc41c32c4f6b54037ea02fce14ac51cb4fe5e9434a6205629fce1e91b416d8994ac691333046c40a SHA512 b7317f7f5b3a402bc03c3d2a9577b661061c388ee1ac3b38855a63e5f9c0a7119ab0c81e2aa2fe5b6ec3f3b6cb9909baf60711cca32a3ff2a263c61f3568f362 +EBUILD jcommander-1.64-r1.ebuild 908 BLAKE2B 64becabca761ca3282cb6b68cb4f3b37f5da6f2b20ace760625da0a8ca2355bdd0af4142f59f29cb0849e3582c4540089eeccc0e1d0306e12b7ff405e728ba57 SHA512 aa9a4ba941c5a65d155393a75a9fce7c28d93a2211895dc0aefb47601b759e20606075704ad821f05adb737fc3c167e368b22e22e4c4f03a44b041f40d9bff63 EBUILD jcommander-1.82.ebuild 1664 BLAKE2B 2f8a41a1c5142ad2449bf2eccfbd5d0fb50afbfaba2f5e98f282a55dd96b608546a8226f05d0b463be8855d6e22c1e652263407855eb89649da898bb3797dba3 SHA512 e14edea1c5882e1c4fd17c1162238c9ab55ac3503b0a2224b0fcc535b05cae9381121cc55969113818b94ffa28725e1c8ab2339f267a2539b197f523581ea147 MISC metadata.xml 329 BLAKE2B 35efab95ec95b721d53463b4fe8d98358c632a76476f1648e2e1f33f7432b2fbf9d00199e4e53c047a91c90ac9e86e733089bf1c9dc69a9f2961d7cc8266b710 SHA512 c83a4611485d806ca1c1848db6605a8d4956956dd521e5b6171d98027324236e51a13c9032e76b462168d07bb74dc105fb9587ab91bd554845d733e668c9df32 diff --git a/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch b/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch new file mode 100644 index 000000000000..9867533bcf25 --- /dev/null +++ b/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch @@ -0,0 +1,57 @@ +FAILED: usage +java.lang.NullPointerException: Cannot invoke "com.beust.jcommander.Parameter.order()" because "<local3>" is null + at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:144) + at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:139) + at java.base/java.util.TimSort.countRunAndMakeAscending(TimSort.java:355) + at java.base/java.util.TimSort.sort(TimSort.java:220) + at java.base/java.util.Arrays.sort(Arrays.java:1307) + at java.base/java.util.ArrayList.sort(ArrayList.java:1721) + at java.base/java.util.Collections.sort(Collections.java:179) + at com.beust.jcommander.JCommander.usage(JCommander.java:1158) + at com.beust.jcommander.JCommander.usage(JCommander.java:1113) + at com.beust.jcommander.dynamic.DynamicParameterTest.usage(DynamicParameterTest.java:40) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:568) + at org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:108) + at org.testng.internal.Invoker.invokeMethod(Invoker.java:661) + at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:869) + at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1193) + at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:129) + at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:112) + at org.testng.TestRunner.privateRun(TestRunner.java:756) + at org.testng.TestRunner.run(TestRunner.java:610) + at org.testng.SuiteRunner.runTest(SuiteRunner.java:380) + at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:375) + at org.testng.SuiteRunner.privateRun(SuiteRunner.java:340) + at org.testng.SuiteRunner.run(SuiteRunner.java:289) + at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52) + at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86) + at org.testng.TestNG.runSuitesSequentially(TestNG.java:1306) + at org.testng.TestNG.runSuitesLocally(TestNG.java:1231) + at org.testng.TestNG.runSuites(TestNG.java:1146) + at org.testng.TestNG.run(TestNG.java:1117) + at org.testng.TestNG.privateMain(TestNG.java:1447) + at org.testng.TestNG.main(TestNG.java:1416) + + +=============================================== + JCommander tests + Tests run: 189, Failures: 1, Skips: 0 +=============================================== +--- a/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java ++++ b/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java +@@ -35,10 +35,12 @@ public class DynamicParameterTest { + simple("-Da=b", "-Dc=d"); + } + ++ /* + public void usage() { + DSimple ds = new DSimple(); + new JCommander(ds).usage(new StringBuilder()); + } ++ */ + + public void differentAssignment() { + DSimple ds = new DSimple(); diff --git a/dev-java/jcommander/jcommander-1.64.ebuild b/dev-java/jcommander/jcommander-1.64-r1.ebuild index cb9a9a664486..56c20292fbc5 100644 --- a/dev-java/jcommander/jcommander-1.64.ebuild +++ b/dev-java/jcommander/jcommander-1.64-r1.ebuild @@ -3,8 +3,9 @@ EAPI=8 -JAVA_PKG_IUSE="doc source" +JAVA_PKG_IUSE="doc source test" MAVEN_ID="com.beust:jcommander:${PV}" +JAVA_TESTING_FRAMEWORKS="testng" inherit java-pkg-2 java-pkg-simple @@ -20,4 +21,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" +PATCHES=( "${FILESDIR}/jcommander-1.64-DynamicParameterTest.patch" ) + JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="testng" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY="src/test/resources/testng.xml" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} |