1 |
commit: 71eb2de89577fdd4f56875451a013d524874dfac |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 18 16:31:42 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 18 16:31:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71eb2de8 |
7 |
|
8 |
dev-java/commons-lang: removed unused slot 3.4 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
dev-java/commons-lang/Manifest | 1 - |
14 |
dev-java/commons-lang/commons-lang-3.4-r1.ebuild | 69 -------------------- |
15 |
.../commons-lang-3.4-disable-some-tests.patch | 75 ---------------------- |
16 |
3 files changed, 145 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest |
19 |
index aa1f5801fc5..980b82b4365 100644 |
20 |
--- a/dev-java/commons-lang/Manifest |
21 |
+++ b/dev-java/commons-lang/Manifest |
22 |
@@ -2,6 +2,5 @@ DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e8 |
23 |
DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87 |
24 |
DIST commons-lang-3.11.tar.gz 1054329 BLAKE2B 7d198e2e7f09f3711909a168cbef405d06aff7482d8ab87059aa11584e82d950ea32f1c1a4d0c9c6c54729396e6b5ee6165a7689b3c38081af31b7a3dad23657 SHA512 ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087 |
25 |
DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57 |
26 |
-DIST commons-lang-3.4-sources.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5 |
27 |
DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b017376227747669bf949725cdc3817a7f14766e121db099e027fc3c322eeb3f68c41786be9a8d500172cfd3c104c7f SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a |
28 |
DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560 |
29 |
|
30 |
diff --git a/dev-java/commons-lang/commons-lang-3.4-r1.ebuild b/dev-java/commons-lang/commons-lang-3.4-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 05d4485ed7a..00000000000 |
33 |
--- a/dev-java/commons-lang/commons-lang-3.4-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,69 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-# Skeleton command: |
40 |
-# 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 |
41 |
- |
42 |
-EAPI=7 |
43 |
- |
44 |
-JAVA_PKG_IUSE="doc source test" |
45 |
-MAVEN_ID="org.apache.commons:commons-lang3:3.4" |
46 |
-JAVA_TESTING_FRAMEWORKS="junit-4" |
47 |
- |
48 |
-inherit java-pkg-2 java-pkg-simple |
49 |
- |
50 |
-DESCRIPTION="Commons components to manipulate core java classes" |
51 |
-HOMEPAGE="http://commons.apache.org/proper/commons-lang/" |
52 |
-SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz" |
53 |
-LICENSE="Apache-2.0" |
54 |
-SLOT="3.4" |
55 |
-KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" |
56 |
- |
57 |
-# Compile dependencies |
58 |
-# POM: pom.xml |
59 |
-# test? commons-io:commons-io:2.4 -> !!!groupId-not-found!!! |
60 |
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4 |
61 |
-# test? org.easymock:easymock:3.3.1 -> >=dev-java/easymock-3.3.1:3.2 |
62 |
-# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!! |
63 |
- |
64 |
-DEPEND=" |
65 |
- >=virtual/jdk-1.8:* |
66 |
- test? ( |
67 |
- dev-java/commons-io:1 |
68 |
- dev-java/easymock:3.2 |
69 |
- dev-java/hamcrest-library:1.3 |
70 |
- dev-java/junit:4 |
71 |
- ) |
72 |
-" |
73 |
- |
74 |
-RDEPEND=" |
75 |
- >=virtual/jre-1.8:* |
76 |
-" |
77 |
- |
78 |
-PATCHES=( |
79 |
- "${FILESDIR}/${P}-disable-some-tests.patch" |
80 |
-) |
81 |
- |
82 |
-S="${WORKDIR}/${PN}3-${PV}-src" |
83 |
- |
84 |
-JAVA_ENCODING="ISO-8859-1" |
85 |
- |
86 |
-JAVA_SRC_DIR="src/main/java" |
87 |
-JAVA_RESOURCE_DIRS=( |
88 |
- "src/main/resources" |
89 |
-) |
90 |
- |
91 |
-JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,easymock-3.2,hamcrest-library-1.3,junit-4" |
92 |
-JAVA_TEST_SRC_DIR="src/test/java" |
93 |
-JAVA_TEST_RESOURCE_DIRS=( |
94 |
- "src/test/resources" |
95 |
-) |
96 |
- |
97 |
-src_prepare() { |
98 |
- default |
99 |
- java-utils-2_src_prepare |
100 |
-} |
101 |
- |
102 |
-src_test() { |
103 |
- LC_ALL=C java-pkg-simple_src_test |
104 |
-} |
105 |
|
106 |
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 |
107 |
deleted file mode 100644 |
108 |
index 9f7d9b01df2..00000000000 |
109 |
--- a/dev-java/commons-lang/files/commons-lang-3.4-disable-some-tests.patch |
110 |
+++ /dev/null |
111 |
@@ -1,75 +0,0 @@ |
112 |
-diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java |
113 |
-index d82dd28..68a1b90 100644 |
114 |
---- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java |
115 |
-+++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java |
116 |
-@@ -577,6 +577,10 @@ public class LocaleUtilsTest { |
117 |
- str = str.substring(0, suff); |
118 |
- } |
119 |
- } |
120 |
-+ // skip invalid locale |
121 |
-+ if (str.endsWith("_001") || str.endsWith("_419") || str.endsWith("_150")) { |
122 |
-+ continue; |
123 |
-+ } |
124 |
- final Locale loc = LocaleUtils.toLocale(str); |
125 |
- if (!l.equals(loc)) { |
126 |
- System.out.println("Failed to parse: " + str); |
127 |
-@@ -589,4 +593,4 @@ public class LocaleUtilsTest { |
128 |
- } |
129 |
- } |
130 |
- |
131 |
--} |
132 |
-\ No newline at end of file |
133 |
-+} |
134 |
-diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java |
135 |
-index dee0e87..272cf03 100644 |
136 |
---- a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java |
137 |
-+++ b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java |
138 |
-@@ -319,7 +319,7 @@ public class ToStringBuilderTest { |
139 |
- assumeFalse("Oracle Corporation".equals(SystemUtils.JAVA_VENDOR) && "1.6".compareTo(SystemUtils.JAVA_SPECIFICATION_VERSION) < 0); |
140 |
- final List<Object> list = new ArrayList<Object>(); |
141 |
- final String baseString = this.toBaseString(list); |
142 |
-- final String expectedWithTransients = baseString + "[elementData={<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>},size=0,modCount=0]"; |
143 |
-+ final String expectedWithTransients = baseString + "[elementData={},size=0,modCount=0]"; |
144 |
- final String toStringWithTransients = ToStringBuilder.reflectionToString(list, null, true); |
145 |
- if (!expectedWithTransients.equals(toStringWithTransients)) { |
146 |
- assertEquals(expectedWithTransients, toStringWithTransients); |
147 |
-diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java |
148 |
-index 7ef0b8a..c0a3a14 100644 |
149 |
---- a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java |
150 |
-+++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java |
151 |
-@@ -43,6 +43,7 @@ import junit.framework.AssertionFailedError; |
152 |
- import org.apache.commons.lang3.SystemUtils; |
153 |
- |
154 |
- import org.junit.Before; |
155 |
-+import org.junit.Ignore; |
156 |
- import org.junit.Test; |
157 |
- |
158 |
- /** |
159 |
-@@ -629,7 +630,8 @@ public class DateUtilsTest { |
160 |
- assertEquals(year, cal.get(Calendar.YEAR)); |
161 |
- assertEquals(month, cal.get(Calendar.MONTH)); |
162 |
- assertEquals(day, cal.get(Calendar.DAY_OF_MONTH)); |
163 |
-- assertEquals(hour, cal.get(Calendar.HOUR_OF_DAY)); |
164 |
-+ // failing because of a different timezone |
165 |
-+ // assertEquals(hour, cal.get(Calendar.HOUR_OF_DAY)); |
166 |
- assertEquals(min, cal.get(Calendar.MINUTE)); |
167 |
- assertEquals(sec, cal.get(Calendar.SECOND)); |
168 |
- assertEquals(mil, cal.get(Calendar.MILLISECOND)); |
169 |
-@@ -1607,6 +1609,8 @@ public class DateUtilsTest { |
170 |
- } |
171 |
- |
172 |
- @Test |
173 |
-+ @Ignore |
174 |
-+ // Fails with jdk 11 |
175 |
- public void testLANG799_DE_OK() throws ParseException { |
176 |
- final Locale dflt = Locale.getDefault(); |
177 |
- Locale.setDefault(Locale.GERMAN); |
178 |
-@@ -1632,6 +1636,8 @@ public class DateUtilsTest { |
179 |
- |
180 |
- // Parse German date with English Locale, specifying German Locale override |
181 |
- @Test |
182 |
-+ @Ignore |
183 |
-+ // Fails with jdk 11 |
184 |
- public void testLANG799_EN_WITH_DE_LOCALE() throws ParseException { |
185 |
- final Locale dflt = Locale.getDefault(); |
186 |
- Locale.setDefault(Locale.ENGLISH); |