* [gentoo-commits] repo/gentoo:master commit in: dev-java/antunit/files/, dev-java/antunit/
@ 2023-12-09 18:43 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2023-12-09 18:43 UTC (permalink / raw
To: gentoo-commits
commit: d67ced528545df741ecec5ee197959afcf710065
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jan 31 20:10:54 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 18:43:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67ced52
dev-java/antunit: new package, add 1.4.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34193
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/antunit/Manifest | 2 +
dev-java/antunit/antunit-1.4.1.ebuild | 69 ++++++++++++++++++++++
.../antunit/files/antunit-1.4.1-AntUnitTest.patch | 28 +++++++++
dev-java/antunit/metadata.xml | 10 ++++
4 files changed, 109 insertions(+)
diff --git a/dev-java/antunit/Manifest b/dev-java/antunit/Manifest
new file mode 100644
index 000000000000..765c72b8f4c9
--- /dev/null
+++ b/dev-java/antunit/Manifest
@@ -0,0 +1,2 @@
+DIST apache-ant-antunit-1.4.1-src.tar.bz2 125017 BLAKE2B 2c092d22eaf716c52bd6c6ce43d1e33c1f599621ee383303c97553f9dc2d0708cf58420338184f8877cd2b0fc053c9742b04cd869583db7b2fc2dedfb4a2dddd SHA512 7c59f0e918f5ec8edbf10bdbcdca1c9bd2ba2a7b27ade69aa4ca92c0c058c434be517799ce795309c0f1c00726a1c77650101b0d1cbe189db5379b15d29ad305
+DIST apache-ant-antunit-1.4.1-src.tar.bz2.asc 224 BLAKE2B c56e3d8005b1a39e42b85fad3c542aa4dd894d9e6cc61a8ea34bce33a8fb3f56d142cb77372fd4d664d46427365d24078b7429480f689245eb31d771c525f90e SHA512 3ad2cca4240e2714d7c435828b3a3d3cbe1e57647400237ce2a96a714d877605199ccf54a2266ff35081ed9f3e23ca46306b30293c1981e55ccbbc61591ad760
diff --git a/dev-java/antunit/antunit-1.4.1.ebuild b/dev-java/antunit/antunit-1.4.1.ebuild
new file mode 100644
index 000000000000..aa30e14edbec
--- /dev/null
+++ b/dev-java/antunit/antunit-1.4.1.ebuild
@@ -0,0 +1,69 @@
+# 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="org.apache.ant:ant-antunit:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="An Antlib that provides a test framework for Apache Ant tasks and types"
+HOMEPAGE="https://ant.apache.org/antlibs/antunit/"
+SRC_URI="mirror://apache/ant/antlibs/${PN}/source/apache-ant-${P}-src.tar.bz2
+ verify-sig? ( https://downloads.apache.org/ant/antlibs/antunit/source/apache-ant-${P}-src.tar.bz2.asc )"
+S="${WORKDIR}/apache-ant-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
+# reset to ant-core:0 when ready
+CP_DEPEND="
+ dev-java/ant-core:0
+ dev-java/junit:4
+"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/ant-testutil:0
+ )
+"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README WHATSNEW )
+HTML_DOCS=( README.html )
+
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-testutil"
+JAVA_TEST_SRC_DIR="src/tests/junit"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir -p "res/org/apache/ant/antunit" || die
+ cp {src/main,res}/org/apache/ant/antunit/antlib.xml || die
+
+ # Some tests expect classes in "build" instead in "target" directory.
+ sed -e 's:build\(/classes\):target\1:' \
+ -i src/etc/testcases/assert.xml \
+ -i src/tests/junit/org/apache/ant/antunit/AssertTest.java || die
+ sed -e 's:build\(/test-classes\):target\1:' \
+ -i src/etc/testcases/antunit/java-io.xml || die
+}
+
+src_test() {
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 21; then
+ eapply "${FILESDIR}/antunit-1.4.1-AntUnitTest.patch"
+ # java.lang.UnsupportedOperationException:
+ # The Security Manager is deprecated and will be removed in a future release
+ JAVA_TEST_EXCLUDES="org.apache.ant.antunit.junit3.EatYourOwnDogFoodTest"
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch b/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch
new file mode 100644
index 000000000000..896ccfee3d24
--- /dev/null
+++ b/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch
@@ -0,0 +1,28 @@
+There was 1 failure:
+1) testSystemIoHandling(org.apache.ant.antunit.AntUnitTest)
+/var/tmp/portage/dev-java/antunit-1.4.1/work/apache-ant-antunit-1.4.1/src/etc/testcases/antunit.xml:84: Tests failed with 0 failures and 1 error
+ at org.apache.ant.antunit.AntUnit.execute(AntUnit.java:231)
+ at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
+ at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+ at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+ at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+ at org.apache.tools.ant.Task.perform(Task.java:350)
+ at org.apache.tools.ant.Target.execute(Target.java:449)
+ at org.apache.tools.ant.Target.performTasks(Target.java:470)
+ at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+ at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+ at org.apache.ant.antunit.AntUnitTest.testSystemIoHandling(AntUnitTest.java:103)
+
+FAILURES!!!
+Tests run: 126, Failures: 1
+--- a/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
++++ b/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
+@@ -91,7 +91,7 @@ public class AntUnitTest extends BuildFileTest {
+ executeTarget("testNewProject");
+ }
+
+- public void testSystemIoHandling() {
++ public void noTestSystemIoHandling() {
+ PrintStream savedErr = System.err;
+ PrintStream savedOut = System.out;
+ try {
diff --git a/dev-java/antunit/metadata.xml b/dev-java/antunit/metadata.xml
new file mode 100644
index 000000000000..8c6f551aec20
--- /dev/null
+++ b/dev-java/antunit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">apache/ant-antlibs-antunit</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/antunit/files/, dev-java/antunit/
@ 2024-01-23 9:42 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2024-01-23 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 2c81609acd911ff47a524c5738ed68b84b7d8bcb
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Dec 31 12:28:19 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 09:42:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c81609a
dev-java/antunit: add 1.4.1-r1 for >=dev-java/ant-1.10.14
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...ntunit-1.4.1.ebuild => antunit-1.4.1-r1.ebuild} | 37 ++++---------
.../antunit/files/antunit-1.4.1-AntUnitTest.patch | 28 ----------
dev-java/antunit/files/antunit-1.4.1-gentoo.patch | 62 ++++++++++++++++++++++
3 files changed, 73 insertions(+), 54 deletions(-)
diff --git a/dev-java/antunit/antunit-1.4.1.ebuild b/dev-java/antunit/antunit-1.4.1-r1.ebuild
similarity index 60%
rename from dev-java/antunit/antunit-1.4.1.ebuild
rename to dev-java/antunit/antunit-1.4.1-r1.ebuild
index 3439a7908dbe..4f346ef201ab 100644
--- a/dev-java/antunit/antunit-1.4.1.ebuild
+++ b/dev-java/antunit/antunit-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,53 +17,38 @@ S="${WORKDIR}/apache-ant-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
# reset to ant-core:0 when ready
CP_DEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14:0
dev-java/junit:4
"
DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*
- test? (
- dev-java/ant-testutil:0
- )
+ test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )
"
RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
DOCS=( NOTICE README WHATSNEW )
HTML_DOCS=( README.html )
+PATCHES=(
+ # Some tests expect classes in "build" instead in "target" directory.
+ "${FILESDIR}/antunit-1.4.1-gentoo.patch"
+)
JAVA_RESOURCE_DIRS="res"
JAVA_SRC_DIR="src/main"
-
-JAVA_TEST_GENTOO_CLASSPATH="ant-testutil"
+JAVA_TEST_GENTOO_CLASSPATH="ant"
JAVA_TEST_SRC_DIR="src/tests/junit"
src_prepare() {
+ default #780585
java-pkg-2_src_prepare
+ # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
mkdir -p "res/org/apache/ant/antunit" || die
cp {src/main,res}/org/apache/ant/antunit/antlib.xml || die
-
- # Some tests expect classes in "build" instead in "target" directory.
- sed -e 's:build\(/classes\):target\1:' \
- -i src/etc/testcases/assert.xml \
- -i src/tests/junit/org/apache/ant/antunit/AssertTest.java || die
- sed -e 's:build\(/test-classes\):target\1:' \
- -i src/etc/testcases/antunit/java-io.xml || die
-}
-
-src_test() {
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 21; then
- eapply "${FILESDIR}/antunit-1.4.1-AntUnitTest.patch"
- # java.lang.UnsupportedOperationException:
- # The Security Manager is deprecated and will be removed in a future release
- JAVA_TEST_EXCLUDES="org.apache.ant.antunit.junit3.EatYourOwnDogFoodTest"
- fi
- java-pkg-simple_src_test
}
diff --git a/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch b/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch
deleted file mode 100644
index 896ccfee3d24..000000000000
--- a/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-There was 1 failure:
-1) testSystemIoHandling(org.apache.ant.antunit.AntUnitTest)
-/var/tmp/portage/dev-java/antunit-1.4.1/work/apache-ant-antunit-1.4.1/src/etc/testcases/antunit.xml:84: Tests failed with 0 failures and 1 error
- at org.apache.ant.antunit.AntUnit.execute(AntUnit.java:231)
- at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
- at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
- at java.base/java.lang.reflect.Method.invoke(Method.java:580)
- at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
- at org.apache.tools.ant.Task.perform(Task.java:350)
- at org.apache.tools.ant.Target.execute(Target.java:449)
- at org.apache.tools.ant.Target.performTasks(Target.java:470)
- at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
- at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
- at org.apache.ant.antunit.AntUnitTest.testSystemIoHandling(AntUnitTest.java:103)
-
-FAILURES!!!
-Tests run: 126, Failures: 1
---- a/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
-+++ b/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
-@@ -91,7 +91,7 @@ public class AntUnitTest extends BuildFileTest {
- executeTarget("testNewProject");
- }
-
-- public void testSystemIoHandling() {
-+ public void noTestSystemIoHandling() {
- PrintStream savedErr = System.err;
- PrintStream savedOut = System.out;
- try {
diff --git a/dev-java/antunit/files/antunit-1.4.1-gentoo.patch b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch
new file mode 100644
index 000000000000..7aeccf662bc7
--- /dev/null
+++ b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch
@@ -0,0 +1,62 @@
+--- a/src/etc/testcases/antunit/java-io.xml
++++ b/src/etc/testcases/antunit/java-io.xml
+@@ -30,7 +30,7 @@ under the License.
+ <target name="testTaskHandlingOutput">
+ <java classname="org.apache.ant.antunit.AntUnitTest$HelloWorld"
+ outputproperty="propertyToSet"
+- classpath="build/test-classes"
++ classpath="target/test-classes"
+ failonerror="true"
+ />
+ <au:assertEquals expected="HelloWorld" actual="${propertyToSet}" />
+--- a/src/etc/testcases/assert.xml
++++ b/src/etc/testcases/assert.xml
+@@ -156,28 +156,28 @@ under the License.
+ <au:assertDestIsUptodate
+ src="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertDestIsUptodateFail">
+ <au:assertDestIsUptodate
+ dest="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertDestIsOutofdatePass">
+ <au:assertDestIsOutofdate
+ dest="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertDestIsOutofdateFail">
+ <au:assertDestIsOutofdate
+ src="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertFilesMatchPass">
+--- a/src/tests/junit/org/apache/ant/antunit/AssertTest.java
++++ b/src/tests/junit/org/apache/ant/antunit/AssertTest.java
+@@ -137,11 +137,11 @@ public class AssertTest extends BuildFileTest {
+ }
+ public void testDestIsUptodateFail() {
+ testFail("assertDestIsUptodateFail",
+- "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'");
++ "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'");
+ }
+ public void testDestIsOutofdateFail() {
+ testFail("assertDestIsOutofdateFail",
+- "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'");
++ "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'");
+ }
+ public void testFilesMatchFail() {
+ testFail("assertFilesMatchFail",
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-23 9:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-09 18:43 [gentoo-commits] repo/gentoo:master commit in: dev-java/antunit/files/, dev-java/antunit/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-01-23 9:42 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox