[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/
commit: 89408c7a7b45871647b51ada641abebab16ac90f Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Jun 8 17:05:44 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Jul 10 10:51:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89408c7a dev-java/httpcore: new package Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/21197/commits/2f0a4734dea3c720e590df20203a8f13cc578faf Signed-off-by: Miroslav Šulc gentoo.org> dev-java/httpcore/Manifest | 1 + dev-java/httpcore/httpcore-4.4.14.ebuild | 54 dev-java/httpcore/metadata.xml | 7 + 3 files changed, 62 insertions(+) diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest new file mode 100644 index 000..58259b00cd1 --- /dev/null +++ b/dev-java/httpcore/Manifest @@ -0,0 +1 @@ +DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713 diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild new file mode 100644 index 000..5584b7dab67 --- /dev/null +++ b/dev-java/httpcore/httpcore-4.4.14.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Apache HttpComponents Core (blocking I/O)" +HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga"; +SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +# Compile dependencies +# POM: httpcore/pom.xml +# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 +# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 +# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 + +DEPEND=">=virtual/jdk-1.8:* + test? ( + dev-java/commons-logging:0 + dev-java/mockito:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) + +S="${WORKDIR}/httpcore" + +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-deprecated" +) +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_install() { + default + java-pkg-simple_src_install +} diff --git a/dev-java/httpcore/metadata.xml b/dev-java/httpcore/metadata.xml new file mode 100644 index 000..0d49beafc75 --- /dev/null +++ b/dev-java/httpcore/metadata.xml @@ -0,0 +1,7 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + j...@gentoo.org + +
[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/
commit: f114128dd768781c1cab1b1a88f4a2608413b56a Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 7 20:38:06 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 7 20:40:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f114128d dev-java/httpcore: Keyword 4.4.14 arm, #830680 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/httpcore/httpcore-4.4.14.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild index c208cb1c3702..2151945c65ef 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ~arm ppc64 x86" # Compile dependencies # POM: httpcore/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/
commit: 684ba5f84e5345eef0839be492bf6cc2942eba3f Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 7 20:41:53 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 7 20:41:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684ba5f8 dev-java/httpcore: Keyword 4.4.14 arm64, #830680 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/httpcore/httpcore-4.4.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild index 2151945c65ef..016fad82327b 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" # Compile dependencies # POM: httpcore/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/
commit: d5179a9ac84edc218d6d5b3540e27df358076b3e Author: Arthur Zamarin gentoo org> AuthorDate: Thu Mar 31 18:18:41 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Mar 31 18:18:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5179a9a dev-java/httpcore: Stabilize 4.4.14 arm64, #835718 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/httpcore/httpcore-4.4.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild index 016fad82327b..ff51d1ba0fdb 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Compile dependencies # POM: httpcore/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/
commit: b49096a6ec24a281172928256e455992c7f1eee4 Author: Sam James gentoo org> AuthorDate: Mon Jul 19 18:34:29 2021 + Commit: Sam James gentoo org> CommitDate: Mon Jul 19 18:34:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b49096a6 dev-java/httpcore: Stabilize 4.4.14 amd64, #758302 Signed-off-by: Sam James gentoo.org> dev-java/httpcore/httpcore-4.4.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild index f5b9fdf5466..8e3fe959caa 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64 x86" +KEYWORDS="amd64 ~ppc64 x86" # Compile dependencies # POM: httpcore/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/
commit: f57a81ec6850576ae8776ba1b7ba1a16153fa44d Author: Sam James gentoo org> AuthorDate: Mon Jul 26 06:24:07 2021 + Commit: Sam James gentoo org> CommitDate: Mon Jul 26 06:24:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57a81ec dev-java/httpcore: Stabilize 4.4.14 ppc64, #758302 Signed-off-by: Sam James gentoo.org> dev-java/httpcore/httpcore-4.4.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild index 8e3fe959caa..c208cb1c370 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ppc64 x86" # Compile dependencies # POM: httpcore/pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/
commit: 851d505cda7d63f09740c3afa44432fba99a09fd Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Feb 4 12:05:53 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun May 26 08:16:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851d505c dev-java/httpcore: add verify-sig, update EAPI 7 -> 8 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35180 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/httpcore/Manifest | 1 + ...ore-4.4.14.ebuild => httpcore-4.4.14-r1.ebuild} | 25 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest index 58259b00cd12..719bf090c35f 100644 --- a/dev-java/httpcore/Manifest +++ b/dev-java/httpcore/Manifest @@ -1 +1,2 @@ DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713 +DIST httpcomponents-core-4.4.14-src.tar.gz.asc 215 BLAKE2B 52aae4a503ff720f87538283c9215b7a8be9d5d2744c5ad6e86c7d44924ba18e8ef8d55af570543c2d52f20ce8a3918266773c274382e2c495087cd3e247232a SHA512 0824d3adecc5d1cbaf19dbb8674fd192b9d04cff9091475e5e55a18f6012ef11c2d0829d643e1003e8e18f9d2f0964ee0402a7b0e2e3f21b34dcb0676e1392e9 diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild similarity index 62% rename from dev-java/httpcore/httpcore-4.4.14.ebuild rename to dev-java/httpcore/httpcore-4.4.14-r1.ebuild index f243859d5639..f554a2b55b78 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild @@ -1,31 +1,28 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Apache HttpComponents Core (blocking I/O)" -HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga"; -SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz" +HOMEPAGE="https://hc.apache.org/httpcomponents-core-5.2.x/"; +SRC_URI="https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz + verify-sig? ( + https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz.asc + )" +S="${WORKDIR}/httpcore" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Compile dependencies -# POM: httpcore/pom.xml -# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 - +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-core.hc.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )" DEPEND=">=virtual/jdk-1.8:* test? ( dev-java/commons-logging:0 @@ -36,8 +33,6 @@ RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) -S="${WORKDIR}/httpcore" - JAVA_SRC_DIR=( "src/main/java" "src/main/java-deprecated"
[gentoo-commits] repo/gentoo:master commit in: dev-java/httpcore/, dev-java/httpcore/files/
commit: b2d5b0a7b42398ddbe0fbb50c192d70280c049df Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Feb 4 10:52:34 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun May 26 08:16:00 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d5b0a7 dev-java/httpcore: handle test failures #923603 Closes: https://bugs.gentoo.org/923603 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> .../files/httpcore-4.4.14-skipFailingTest.patch| 55 ++ dev-java/httpcore/httpcore-4.4.14.ebuild | 15 -- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch new file mode 100644 index ..5c722c5e714d --- /dev/null +++ b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch @@ -0,0 +1,55 @@ +There was 1 failure: +1) testRequestTargetHostFallback(org.apache.http.protocol.TestStandardInterceptors) +org.mockito.exceptions.base.MockitoException: +Mockito cannot mock this class: class java.net.InetAddress +Mockito can only mock visible & non-final classes. +If you're not sure why you're getting this error, please report to the mailing list. + at org.apache.http.protocol.TestStandardInterceptors.testRequestTargetHostFallback(TestStandardInterceptors.java:372) + ... 31 trimmed +Caused by: org.mockito.cglib.core.CodeGenerationException: java.lang.reflect.InvocationTargetException-->null + at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:238) + at org.mockito.cglib.proxy.Enhancer.createHelper(Enhancer.java:378) + at org.mockito.cglib.proxy.Enhancer.createClass(Enhancer.java:318) + at org.mockito.internal.creation.jmock.ClassImposterizer.createProxyClass(ClassImposterizer.java:110) + at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:62) + at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:56) + at org.mockito.internal.creation.CglibMockMaker.createMock(CglibMockMaker.java:23) + at org.mockito.internal.util.MockUtil.createMock(MockUtil.java:26) + at org.mockito.internal.MockitoCore.mock(MockitoCore.java:51) + at org.mockito.Mockito.mock(Mockito.java:1243) + at org.mockito.Mockito.mock(Mockito.java:1120) + ... 33 more +Caused by: java.lang.reflect.InvocationTargetException + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:118) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.mockito.cglib.core.ReflectUtils.defineClass(ReflectUtils.java:385) + at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:220) + ... 43 more +Caused by: java.lang.IncompatibleClassChangeError: class $java.net.InetAddress$$EnhancerByMockitoWithCGLIB$$d2bd6316 cannot inherit from sealed class java.net.InetAddress + at java.base/java.lang.ClassLoader.defineClass1(Native Method) + at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1027) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + ... 46 more + +FAILURES!!! +Tests run: 665, Failures: 1 + +--- a/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java b/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java +@@ -44,6 +44,7 @@ import org.apache.http.message.BasicHttpRequest; + import org.apache.http.message.BasicHttpResponse; + import org.junit.Assert; + import org.junit.Test; ++import org.junit.Ignore; + import org.mockito.Mockito; + + public class TestStandardInterceptors { +@@ -365,7 +366,7 @@ public class TestStandardInterceptors { + Assert.assertEquals("somehost:8080", header.getValue()); + } + +-@Test ++@Test @Ignore + public void testRequestTargetHostFallback() throws Exception { + final HttpContext context = new BasicHttpContext(null); + final BasicHttpRequest request = new BasicHttpRequest("GET", "/"); diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild index ff51d1ba0fdb..f243859d5639 100644 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -48,7 +48,14 @@ JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" -src_install() { - default - java-pkg-simple_src_install +src_test() { + # https://bugs.gentoo.org/923603 + local vm