[gentoo-commits] repo/gentoo:master commit in: dev-java/cdi-api/, dev-java/cdi-api/files/

[Florian Schmaus]

commit:     07bd4913bcde13905038c6ad29522b2b12bef654
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jun 21 08:32:35 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 16:36:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07bd4913

dev-java/cdi-api: revival, add 4.0.1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/cdi-api/Manifest                          |   1 +
 dev-java/cdi-api/cdi-api-4.0.1.ebuild              | 100 +++++++++++++++++++++
 .../cdi-api/files/cdi-api-4.0.1-skip-tests.patch   |  72 +++++++++++++++
 dev-java/cdi-api/metadata.xml                      |  10 +++
 4 files changed, 183 insertions(+)

diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
new file mode 100644
index 000000000000..86f330ad3dd5
--- /dev/null
+++ b/dev-java/cdi-api/Manifest
@@ -0,0 +1 @@
+DIST cdi-api-4.0.1.tar.gz 280719 BLAKE2B 9c4cf34f1b0c096a3097bed658ba4c13ab6fa655cd8233b82b13a788dd047e1be89bcde69b3c69665c0987c4f62cd5e4596e51f6235c95db5239daf403dea4e9 SHA512 7f3e9ca45e0708b3c998ff6f743975a9995309d1fb93fde64ca8a0fca73e16ea653085ca743c921d52385f0fbcbdab10b45fd8b6e8b27c2e058871febbbeeb1e

diff --git a/dev-java/cdi-api/cdi-api-4.0.1.ebuild b/dev-java/cdi-api/cdi-api-4.0.1.ebuild
new file mode 100644
index 000000000000..fbadb5424e44
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-4.0.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild cdi-api-4.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi"
+SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-java/injection-api-2.0.1:0
+	>=dev-java/jakarta-annotations-api-2.1.1:0
+	>=dev-java/jakarta-el-api-5.0.1:0
+	>=dev-java/jakarta-interceptors-2.1.0:0
+	>=virtual/jdk-11:*
+"
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md )
+
+PATCHES=(
+	# https://bugs.gentoo.org/856412
+	# org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1
+	# org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5
+	"${FILESDIR}/cdi-api-4.0.1-skip-tests.patch"
+)
+
+S="${WORKDIR}/cdi-${PV}"
+
+JAVA_TEST_GENTOO_CLASSPATH="testng"
+JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" )
+JAVA_TEST_SRC_DIR="api/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="api/src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Tests run: 1, Failures: 1
+	org.jboss.cdi.api.test.privileged.CDIPrivilegedTest
+)
+
+src_prepare(){
+	default # https://bugs.gentoo.org/780585
+}
+
+src_compile() {
+	JAVA_CLASSPATH_EXTRA="
+		injection-api
+		jakarta-annotations-api
+		jakarta-el-api
+		jakarta-interceptors
+	"
+	JAVA_SRC_DIR="lang-model/src/main/java"
+	JAVA_JAR_FILENAME="lang-model.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":lang-model.jar"
+	rm -r target || die
+
+	JAVA_SRC_DIR="api/src/main/java"
+	JAVA_RESOURCE_DIRS="api/src/main/resources"
+	JAVA_JAR_FILENAME="cdi-api.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":cdi-api.jar"
+	rm -r target || die
+
+	if use doc; then
+		rm lang-model/src/main/java/module-info.java || die
+		JAVA_SRC_DIR=(
+			"lang-model/src/main/java"
+			"api/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	java-pkg_dojar "lang-model.jar"
+	java-pkg_dojar "cdi-api.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "lang-model/src/main/java/*"
+		java-pkg_dosrc "api/src/main/java/*"
+	fi
+}

diff --git a/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch b/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch
new file mode 100644
index 000000000000..f62b64b3d450
--- /dev/null
+++ b/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch
@@ -0,0 +1,72 @@
+--- a/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
++++ b/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
+@@ -48,7 +48,7 @@ public class SeContainerInitializerTest {
+         SeContainerInitializer.newInstance();
+     }
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithOneGoodSeContainerInitializer() throws Exception {
+ 
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+@@ -79,4 +79,4 @@ public class SeContainerInitializerTest {
+         Assert.assertTrue(SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer.class) ||
+                 SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer2.class));
+     }
+-}
+\ No newline at end of file
++}
+--- a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
++++ b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
+@@ -59,7 +59,7 @@ public class CDITest {
+     }
+ 
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithOneGoodCDIProvider() throws Exception {
+ 
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+@@ -90,7 +90,7 @@ public class CDITest {
+ 
+     }
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithTwoGoodCDIProvider() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProvider2.class.getName());
+@@ -101,7 +101,7 @@ public class CDITest {
+     }
+ 
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithTwoGoodCDIProviderReverse() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProvider.class.getName());
+@@ -111,7 +111,7 @@ public class CDITest {
+         Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
+     }
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithTwoCDIProviderOneWithNullCDIAndOneGood() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProviderWithNullCDI.class.getName());
+@@ -122,7 +122,7 @@ public class CDITest {
+     }
+ 
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProviderWithNullCDI.class.getName());
+@@ -163,4 +163,4 @@ public class CDITest {
+         ClosableCDIProvider.closeContainer();
+         CDI.current();
+     }
+-}
+\ No newline at end of file
++}

diff --git a/dev-java/cdi-api/metadata.xml b/dev-java/cdi-api/metadata.xml
new file mode 100644
index 000000000000..5445151724ee
--- /dev/null
+++ b/dev-java/cdi-api/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@g.o</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/cdi</remote-id>
+	</upstream>
+</pkgmetadata>