From 78754950ffa3aaba0f48b1ca1d505caa4a3dfbfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Oct 2022 13:17:38 +0100 Subject: gentoo auto-resync : 04:10:2022 - 13:17:38 --- dev-java/felix-utils/Manifest | 4 + dev-java/felix-utils/felix-utils-1.11.8.ebuild | 59 ++++++++++ .../felix-utils-1.11.8-Port-to-osgi-cmpn.patch | 123 +++++++++++++++++++++ dev-java/felix-utils/metadata.xml | 11 ++ 4 files changed, 197 insertions(+) create mode 100644 dev-java/felix-utils/Manifest create mode 100644 dev-java/felix-utils/felix-utils-1.11.8.ebuild create mode 100644 dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch create mode 100644 dev-java/felix-utils/metadata.xml (limited to 'dev-java/felix-utils') diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest new file mode 100644 index 000000000000..afa2e5d3bb9e --- /dev/null +++ b/dev-java/felix-utils/Manifest @@ -0,0 +1,4 @@ +AUX felix-utils-1.11.8-Port-to-osgi-cmpn.patch 4717 BLAKE2B 012aa489c1f063bfa5d3f8e9504bc72176493d4bd345e1aa9027d73d560c6852589a448cd96927410220286a247e2d14f4ab0a08a2ed70f9dba34b86e6be7e0d SHA512 267b3bd025fe71992b3cc3872cabbd0d13407e1aec013c671754d3ed94bd104ffb52bb22255acb0bfc4be6428f16073e37d3e79fa4b7a45bca34f3e4a1d82637 +DIST felix-utils-1.11.8.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd +EBUILD felix-utils-1.11.8.ebuild 1619 BLAKE2B dc5d8f51b54056c0e975446f7299f3db026f4ebe67f6422787d27e5eeacf687ac4b62a94929e048ba932525bf22b6d889b83c83d42158bfd367892a71f201fe4 SHA512 6f0847156d16928de2f314f5e10a39384e7c7b597c7fd890665f3a0559380bc20c504be1211e3fa635bce921bf5514aaf7891c087e707f91ac99fce226c8d397 +MISC metadata.xml 369 BLAKE2B 9cd4712616cc7fbb8010c253c0f6edf4855e190f79eac831794cf53e966f2963945f5432ae3a9f12534cbb5611986247e00b7c2981c0604e7fa0c3fffa42ec4c SHA512 1b18db4dd45409a4296c24c198e5aeaad34fd8901c041f490a2c1ecaf4f692e3140c304fd76faa18644ad0f359b551443bba096445efb819503434e35636e791 diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8.ebuild new file mode 100644 index 000000000000..170d165ff6d8 --- /dev/null +++ b/dev-java/felix-utils/felix-utils-1.11.8.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-utils-1.11.8.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.felix:org.apache.felix.utils:1.11.8" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Utility classes for OSGi" +HOMEPAGE="https://felix.apache.org/documentation/index.html" +SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +# Compile dependencies +# POM: pom.xml +# org.osgi:osgi.cmpn:5.0.0 -> >=dev-java/osgi-cmpn-8.0.0:8 +# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0 +# POM: pom.xml +# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 +# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.7.0:4 + +DEPEND=" + >=virtual/jdk-1.8:* + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + test? ( + dev-java/mockito:4 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/felix-utils-1.11.8-Port-to-osgi-cmpn.patch" +) + +DOCS=( DEPENDENCIES NOTICE doc/changelog.txt ) + +S="${WORKDIR}/org.apache.felix.utils-${PV}" + +JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_prepare() { + default # https://bugs.gentoo.org/780585 +} diff --git a/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch b/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch new file mode 100644 index 000000000000..22b0222af68b --- /dev/null +++ b/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch @@ -0,0 +1,123 @@ +From d7a2d969b55ab34a223ad1422b2e3ef7d95a347f Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Mon, 5 Nov 2018 09:59:04 +0100 +Subject: [PATCH] Port to osgi-cmpn + +--- + .../utils/repository/AggregateRepository.java | 20 +++++++++++++++++++ + .../utils/repository/BaseRepository.java | 19 ++++++++++++++++++ + .../utils/properties/MockBundleContext.java | 10 ++++++++++ + 3 files changed, 49 insertions(+) + +diff --git a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java +index 50dceaf..4da3141 100644 +--- a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java ++++ b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java +@@ -25,7 +25,12 @@ import java.util.Map; + + import org.osgi.resource.Capability; + import org.osgi.resource.Requirement; ++import org.osgi.resource.Resource; ++import org.osgi.service.repository.ExpressionCombiner; + import org.osgi.service.repository.Repository; ++import org.osgi.service.repository.RequirementBuilder; ++import org.osgi.service.repository.RequirementExpression; ++import org.osgi.util.promise.Promise; + + public class AggregateRepository implements Repository { + +@@ -52,4 +57,19 @@ public class AggregateRepository implements Repository { + } + return result; + } ++ ++ @Override ++ public Promise> findProviders(RequirementExpression expression) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public ExpressionCombiner getExpressionCombiner() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public RequirementBuilder newRequirementBuilder(String namespace) { ++ throw new UnsupportedOperationException(); ++ } + } +diff --git a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java +index 95adadd..0998ab0 100644 +--- a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java ++++ b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java +@@ -30,7 +30,11 @@ import org.osgi.framework.Constants; + import org.osgi.resource.Capability; + import org.osgi.resource.Requirement; + import org.osgi.resource.Resource; ++import org.osgi.service.repository.ExpressionCombiner; + import org.osgi.service.repository.Repository; ++import org.osgi.service.repository.RequirementBuilder; ++import org.osgi.service.repository.RequirementExpression; ++import org.osgi.util.promise.Promise; + + /** + */ +@@ -90,4 +94,19 @@ public class BaseRepository implements Repository { + } + return result; + } ++ ++ @Override ++ public Promise> findProviders(RequirementExpression expression) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public ExpressionCombiner getExpressionCombiner() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public RequirementBuilder newRequirementBuilder(String namespace) { ++ throw new UnsupportedOperationException(); ++ } + } +diff --git a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java +index 3eab444..df94a6c 100644 +--- a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java ++++ b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java +@@ -25,7 +25,9 @@ import org.osgi.framework.BundleListener; + import org.osgi.framework.Filter; + import org.osgi.framework.FrameworkListener; + import org.osgi.framework.InvalidSyntaxException; ++import org.osgi.framework.ServiceFactory; + import org.osgi.framework.ServiceListener; ++import org.osgi.framework.ServiceObjects; + import org.osgi.framework.ServiceReference; + import org.osgi.framework.ServiceRegistration; + +@@ -105,6 +107,10 @@ public class MockBundleContext implements BundleContext { + throw new UnsupportedOperationException(); + } + ++ public ServiceRegistration registerService(Class clazz, ServiceFactory factory, Dictionary properties) { ++ throw new UnsupportedOperationException(); ++ } ++ + public ServiceReference[] getServiceReferences(String s, String s1) throws InvalidSyntaxException { + throw new UnsupportedOperationException(); + } +@@ -125,6 +131,10 @@ public class MockBundleContext implements BundleContext { + throw new UnsupportedOperationException(); + } + ++ public ServiceObjects getServiceObjects(ServiceReference reference) { ++ throw new UnsupportedOperationException(); ++ } ++ + public File getDataFile(String s) { + throw new UnsupportedOperationException(); + } +-- +2.17.2 + diff --git a/dev-java/felix-utils/metadata.xml b/dev-java/felix-utils/metadata.xml new file mode 100644 index 000000000000..4af2d5d52d45 --- /dev/null +++ b/dev-java/felix-utils/metadata.xml @@ -0,0 +1,11 @@ + + + + + java@gentoo.org + + + https://felix.apache.org/documentation/documentation.html + apache/felix-dev + + -- cgit v1.2.3