commit: e0afefcb3aee88e90efeb3f3a6d311b94b408789 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Apr 7 11:24:31 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 7 11:25:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0afefcb
dev-java/commons-lang: migrated 3.4 to java-pkg-simple + resolved tests Closes: https://bugs.gentoo.org/736573 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-lang/Manifest | 2 +- dev-java/commons-lang/commons-lang-3.4-r1.ebuild | 69 ++++++++++++++++++++ dev-java/commons-lang/commons-lang-3.4.ebuild | 51 --------------- .../commons-lang-3.4-disable-some-tests.patch | 75 ++++++++++++++++++++++ 4 files changed, 145 insertions(+), 52 deletions(-) diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest index 64c2fc0a4bc..11b65e0d5ac 100644 --- a/dev-java/commons-lang/Manifest +++ b/dev-java/commons-lang/Manifest @@ -1,7 +1,7 @@ DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e846fb08a35d8ee2430ac2e24b0094e83cfc8cab9eaa44230c0d7fd26ec768bf7b448f04e123467acc20d49af6efe3008b SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87 DIST commons-lang-3.11.tar.gz 1054329 BLAKE2B 7d198e2e7f09f3711909a168cbef405d06aff7482d8ab87059aa11584e82d950ea32f1c1a4d0c9c6c54729396e6b5ee6165a7689b3c38081af31b7a3dad23657 SHA512 ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087 +DIST commons-lang-3.4-sources.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5 DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b017376227747669bf949725cdc3817a7f14766e121db099e027fc3c322eeb3f68c41786be9a8d500172cfd3c104c7f SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560 DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667 -DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5 diff --git a/dev-java/commons-lang/commons-lang-3.4-r1.ebuild b/dev-java/commons-lang/commons-lang-3.4-r1.ebuild new file mode 100644 index 00000000000..67cbdf0da5d --- /dev/null +++ b/dev-java/commons-lang/commons-lang-3.4-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2021 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 http://distfiles.gentoo.org/distfiles/93/commons-lang3-3.4-src.tar.gz --slot 3.4 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" --ebuild commons-lang-3.4-r1.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.commons:commons-lang3:3.4" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Commons components to manipulate core java classes" +HOMEPAGE="http://commons.apache.org/proper/commons-lang/"; +SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz" +LICENSE="Apache-2.0" +SLOT="3.4" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +# Compile dependencies +# POM: pom.xml +# test? commons-io:commons-io:2.4 -> !!!groupId-not-found!!! +# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4 +# test? org.easymock:easymock:3.3.1 -> >=dev-java/easymock-3.3.1:3.2 +# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!! + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/commons-io:1 + dev-java/easymock:3.2 + dev-java/hamcrest-library:1.3 + dev-java/junit:4 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +PATCHES=( + "${FILESDIR}/${P}-disable-some-tests.patch" +) + +S="${WORKDIR}/${PN}3-${PV}-src" + +JAVA_ENCODING="ISO-8859-1" + +JAVA_SRC_DIR="src/main/java" +JAVA_RESOURCE_DIRS=( + "src/main/resources" +) + +JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,easymock-3.2,hamcrest-library-1.3,junit-4" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS=( + "src/test/resources" +) + +src_prepare() { + default + java-utils-2_src_prepare +} + +src_test() { + LC_ALL=C java-pkg-simple_src_test +} diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild deleted file mode 100644 index d47b0693c0a..00000000000 --- a/dev-java/commons-lang/commons-lang-3.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.commons:commons-lang3:3.4" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}3-${PV}" - -DESCRIPTION="Commons components to manipulate core java classes" -HOMEPAGE="http://commons.apache.org/lang/"; -SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz" - -DEPEND=">=virtual/jdk-1.6 - !ppc? ( - !ppc64? ( - test? ( - dev-java/ant-junit4 - dev-java/commons-io:1 - dev-java/easymock:3.2 - ) - ) - )" - -RDEPEND=">=virtual/jre-1.6" - -LICENSE="Apache-2.0" -SLOT="3.4" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -RESTRICT+=" ppc? ( test ) ppc64? ( test )" - -S="${WORKDIR}/${MY_P}-src" - -JAVA_ANT_ENCODING="ISO-8859-1" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4" -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_install() { - java-pkg_newjar target/${MY_P}.jar ${PN}.jar - - dodoc RELEASE-NOTES.txt NOTICE.txt - - use doc && java-pkg_dojavadoc target/apidocs - use source && java-pkg_dosrc src/main/java/* -} - -src_test() { - LC_ALL=C java-pkg-2_src_test -} diff --git a/dev-java/commons-lang/files/commons-lang-3.4-disable-some-tests.patch b/dev-java/commons-lang/files/commons-lang-3.4-disable-some-tests.patch new file mode 100644 index 00000000000..9f7d9b01df2 --- /dev/null +++ b/dev-java/commons-lang/files/commons-lang-3.4-disable-some-tests.patch @@ -0,0 +1,75 @@ +diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java +index d82dd28..68a1b90 100644 +--- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java ++++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java +@@ -577,6 +577,10 @@ public class LocaleUtilsTest { + str = str.substring(0, suff); + } + } ++ // skip invalid locale ++ if (str.endsWith("_001") || str.endsWith("_419") || str.endsWith("_150")) { ++ continue; ++ } + final Locale loc = LocaleUtils.toLocale(str); + if (!l.equals(loc)) { + System.out.println("Failed to parse: " + str); +@@ -589,4 +593,4 @@ public class LocaleUtilsTest { + } + } + +-} +\ No newline at end of file ++} +diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java +index dee0e87..272cf03 100644 +--- a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java ++++ b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java +@@ -319,7 +319,7 @@ public class ToStringBuilderTest { + assumeFalse("Oracle Corporation".equals(SystemUtils.JAVA_VENDOR) && "1.6".compareTo(SystemUtils.JAVA_SPECIFICATION_VERSION) < 0); + final List<Object> list = new ArrayList<Object>(); + final String baseString = this.toBaseString(list); +- final String expectedWithTransients = baseString + "[elementData={<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>},size=0,modCount=0]"; ++ final String expectedWithTransients = baseString + "[elementData={},size=0,modCount=0]"; + final String toStringWithTransients = ToStringBuilder.reflectionToString(list, null, true); + if (!expectedWithTransients.equals(toStringWithTransients)) { + assertEquals(expectedWithTransients, toStringWithTransients); +diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java +index 7ef0b8a..c0a3a14 100644 +--- a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java ++++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java +@@ -43,6 +43,7 @@ import junit.framework.AssertionFailedError; + import org.apache.commons.lang3.SystemUtils; + + import org.junit.Before; ++import org.junit.Ignore; + import org.junit.Test; + + /** +@@ -629,7 +630,8 @@ public class DateUtilsTest { + assertEquals(year, cal.get(Calendar.YEAR)); + assertEquals(month, cal.get(Calendar.MONTH)); + assertEquals(day, cal.get(Calendar.DAY_OF_MONTH)); +- assertEquals(hour, cal.get(Calendar.HOUR_OF_DAY)); ++ // failing because of a different timezone ++ // assertEquals(hour, cal.get(Calendar.HOUR_OF_DAY)); + assertEquals(min, cal.get(Calendar.MINUTE)); + assertEquals(sec, cal.get(Calendar.SECOND)); + assertEquals(mil, cal.get(Calendar.MILLISECOND)); +@@ -1607,6 +1609,8 @@ public class DateUtilsTest { + } + + @Test ++ @Ignore ++ // Fails with jdk 11 + public void testLANG799_DE_OK() throws ParseException { + final Locale dflt = Locale.getDefault(); + Locale.setDefault(Locale.GERMAN); +@@ -1632,6 +1636,8 @@ public class DateUtilsTest { + + // Parse German date with English Locale, specifying German Locale override + @Test ++ @Ignore ++ // Fails with jdk 11 + public void testLANG799_EN_WITH_DE_LOCALE() throws ParseException { + final Locale dflt = Locale.getDefault(); + Locale.setDefault(Locale.ENGLISH);
