diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest index d876e93214c6e..384a3ce1ffd1b 100644 --- a/dev-java/ant-ivy/Manifest +++ b/dev-java/ant-ivy/Manifest @@ -1,3 +1,2 @@ -DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268 DIST apache-ivy-2.5.3-src.tar.gz 2740477 BLAKE2B 6539b73ea49b76fdd547417265fd54ece2352a042cd40cef34b88886c994d377048710469a4b07ac7d3ff586d8816d50e10493abf4ebe78f6d90c9f1cb3a0bee SHA512 135c9cdbd3b4d291f67849e1b38964e1adef51b879de6b46ea4b72fd1bfa2d337b7468d46c4632b2bf360bdb9a25af874195f1032c61fe9fcd1f39ffa02469be DIST apache-ivy-2.5.3-src.tar.gz.asc 190 BLAKE2B a72faaa8ef1c0fc5d3073311d2fe85ae3d9d4a1494ba74ab53ad5a779787dbd13484da84d556e46d95ef712f35941a9751de7c3ac709eb556fab4ef3711e6588 SHA512 37c40100426b4e045a738570b5133845e753d3e0ebcd7a91d401be967446fed7d8d9d17275191b4cbd33f2847f042fa36fa5f125eaea305b3eef63ea668f9af3 diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild deleted file mode 100644 index da472003c39b8..0000000000000 --- a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.ivy:ivy:2.5.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple java-osgi - -DESCRIPTION="Ivy is a free java based dependency manager" -HOMEPAGE="https://ant.apache.org/ivy/" -SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" -S="${WORKDIR}/apache-ivy-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64" - -PROPERTIES="test_network" -RESTRICT="test" - -CDEPEND=" - >=dev-java/ant-1.10.14-r3:0 - dev-java/bcpg:0 - dev-java/bcprov:0 - dev-java/httpcomponents-client:4 - dev-java/commons-vfs:2 - dev-java/httpcore:0 - dev-java/jakarta-oro:2.0 - dev-java/jsch:0 - dev-java/jsch-agent-proxy:0 - test? ( - >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] - dev-java/hamcrest-core:1.3 - dev-java/hamcrest-library:1.3 - dev-java/xmlunit:1 - )" - -# Restrict to jdk:1.8 since java.util.jar.Pack200 was removed. -DEPEND="${CDEPEND} - virtual/jdk:1.8" -RDEPEND="${CDEPEND} - virtual/jre:1.8" - -DOCS=( LICENSE NOTICE README.adoc ) - -JAVA_GENTOO_CLASSPATH=" - ant - bcpg - bcprov - httpcomponents-client-4 - commons-vfs-2 - httpcore - jakarta-oro-2.0 - jsch - jsch-agent-proxy -" -JAVA_MAIN_CLASS="org.apache.ivy.Main" -JAVA_SRC_DIR="src/java" -JAVA_RESOURCE_DIRS="resources/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - ant - hamcrest-core-1.3 - hamcrest-library-1.3 - junit-4 - xmlunit-1 -" -JAVA_TEST_SRC_DIR="test-src/java" -JAVA_TEST_RESOURCE_DIRS="test" -JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar" - -# according to 57,60 build-release.xml -# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b -JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true" - -# Several tests require a certain treatment to "generate-bundles": -# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428 -# -# -# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71 -# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'. -# So the failing tests will be excluded, saved for a later attempt. -# -# Not excluding any test classes results in "Tests run: 1109, Failures: 98" -# Excluding those test classes listed below leads to "OK (812 tests)" -JAVA_TEST_EXCLUDES=( - # https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56 - # test.class.pattern = *Test - "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope - "org.apache.ivy.core.TestPerformance" # not in scope - "org.apache.ivy.util.TestXmlHelper" # not in scope - "org.apache.ivy.TestFixture" # not in scope - "org.apache.ivy.TestHelper" # not in scope - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420 - # - "org.apache.ivy.util.url.AbstractURLHandlerTest" - "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest" - "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest" - # following excluded tests cause test failures - "org.apache.ivy.ant.BuildOBRTaskTest" # Tests run: 3, Failures: 2 - "org.apache.ivy.core.deliver.DeliverTest" # Tests run: 1, Failures: 1 - "org.apache.ivy.core.module.descriptor.IvyMakePomTest" # Tests run: 1, Failures: 1 - "org.apache.ivy.core.settings.XmlSettingsParserTest" # Tests run: 29, Failures: 1 - "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" # Tests run: 3, Failures: 1 - "org.apache.ivy.osgi.obr.OBRResolverTest" # Tests run: 16, Failures: 16 - "org.apache.ivy.osgi.repo.BundleRepoTest" # Tests run: 4, Failures: 3 - "org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" # Tests run: 46, Failures: 1 - "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" # Tests run: 44, Failures: 7 - "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" # Tests run: 10, Failures: 1 - "org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" # Tests run: 14, Failures: 3 - "org.apache.ivy.plugins.resolver.JarResolverTest" # Tests run: 3, Failures: 3 - # following excluded tests can pass if run individually - "org.apache.ivy.ant.IvyConfigureTest" # OK (14 tests) - "org.apache.ivy.IvyTest" # OK (1 test) - "org.apache.ivy.MainTest" # OK (12 tests) - "org.apache.ivy.plugins.report.XmlReportWriterTest" # OK (3 tests) - "org.apache.ivy.plugins.resolver.BintrayResolverTest" # OK (12 tests) - "org.apache.ivy.plugins.resolver.ChainResolverTest" # OK (15 tests) - "org.apache.ivy.plugins.resolver.FileSystemResolverTest" # OK (27 tests) - "org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test) - "org.apache.ivy.plugins.resolver.IvyRepResolverTest" # OK (3 tests) - "org.apache.ivy.plugins.resolver.Maven2LocalTest" # OK (2 tests) - "org.apache.ivy.plugins.resolver.PackagerResolverTest" # OK (3 tests) - "org.apache.ivy.plugins.resolver.URLResolverTest" # OK (5 tests) - "org.apache.ivy.plugins.trigger.LogTriggerTest" # OK (3 tests) - # Without PROPERTIES="test_network", the following test cause additional failures. - "org.apache.ivy.core.settings.OnlineXmlSettingsParserTest" -# "org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest" - "org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest" -# "org.apache.ivy.plugins.resolver.IBiblioResolverTest" -# "org.apache.ivy.plugins.resolver.MirroredURLResolverTest" - "org.apache.ivy.util.url.ArtifactoryListingTest" -# "org.apache.ivy.util.url.BasicURLHandlerTest" -# "org.apache.ivy.util.url.HttpclientURLHandlerTest" -) - -src_prepare() { - default - - mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die - pushd "${JAVA_RESOURCE_DIRS}" - cp "${S}"/{NOTICE,LICENSE} META-INF/ || die - cp -r "${S}"/src/java/* . || die - - # DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead - # according to 210,221 build.xml and still in the upstream .jar file - cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die - - find . -type f -name '*.java' -exec rm -rf {} + || die - popd || die -} - -src_test() { - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407 - # name="build-custom-resolver-jar" - JAVA_SRC_DIR="test/custom-classpath" - JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar" - java-pkg-simple_src_compile - - # Without "license.xml" the tests won't even start. "Tests run: 1109, Failures: 318" - jar -cf test.jar \ - -C test/java org/apache/ivy/plugins/parser/xml/license.xml \ - -C test/java org/apache/ivy/plugins/parser/m2/license.xml || die - - # Reduce number of failures to "Tests run: 1109, Failures: 98" - jar -uf "test.jar" -C test/java . || die - - # Separate *.java files from test resources - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393 - mkdir test-src || die - cp -r test/java test-src/ || die - find test -type f -name '*.java' -exec rm -rf {} + || die - - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438 - # name="prepare-test-jar-repositories" - mkdir test/jar-repos || die - jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die -# jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die - - java-pkg-simple_src_test -} - -src_install() { - default - java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy" - use doc && java-pkg_dojavadoc target/api - use source && java-pkg_dosrc src/* -}