From 9ae00afbc6d8b6d1c08096c2b439206e29738c4a3a5981b21ff38c1fc920d81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 12:26:49 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main felix-gogo-runtime revision 5cf400203582b47b8779aece7d20beb2 --- .gitattributes | 23 +++ felix-gogo-runtime.changes | 40 ++++++ felix-gogo-runtime.spec | 93 ++++++++++++ ...x.gogo.runtime-1.1.6-source-release.tar.gz | 3 + org.apache.felix.gogo.runtime-build.xml | 135 ++++++++++++++++++ 5 files changed, 294 insertions(+) create mode 100644 .gitattributes create mode 100644 felix-gogo-runtime.changes create mode 100644 felix-gogo-runtime.spec create mode 100644 org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz create mode 100644 org.apache.felix.gogo.runtime-build.xml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/felix-gogo-runtime.changes b/felix-gogo-runtime.changes new file mode 100644 index 0000000..991a556 --- /dev/null +++ b/felix-gogo-runtime.changes @@ -0,0 +1,40 @@ +------------------------------------------------------------------- +Thu Feb 8 17:35:01 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 1.1.6 + * Bug + + FELIX-6509: Evaluation of subshell String results are wrong + on Windows + * Improvement + + FELIX-5970: Add requirement & capabilities model so gogo can + be resolved + + FELIX-5999: cleanup compiler warnings + + FELIX-6001: cleanup compiler warnings + + FELIX-6003: Add some resolver checks to make sure + @RequireGogo annotation works for both jline and shell + + FELIX-6007: create a gogo bom + + FELIX-5963: Gogo runtime should use named executor threads + + FELIX-6038: pull Java 7 support back in for gogo runtime, + shell and console + +------------------------------------------------------------------- +Fri Feb 10 07:33:15 UTC 2023 - Fridrich Strba + +- Advertize capability needed by other felix-gogo artifacts + +------------------------------------------------------------------- +Wed Mar 16 13:12:52 UTC 2022 - Fridrich Strba + +- Rewrite the build system to ant so that we can eventually avoid + build cycles with maven-plugin-bundle built against + felix-bundlerepository + +------------------------------------------------------------------- +Thu Nov 28 08:52:53 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix javadoc build with jdk11 + +------------------------------------------------------------------- +Wed May 8 11:29:37 UTC 2019 - Fridrich Strba + +- Initial packaging of felix-gogo-runtime 1.1.0 diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec new file mode 100644 index 0000000..6aad493 --- /dev/null +++ b/felix-gogo-runtime.spec @@ -0,0 +1,93 @@ +# +# spec file for package felix-gogo-runtime +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global bundle org.apache.felix.gogo.runtime +Name: felix-gogo-runtime +Version: 1.1.6 +Release: 0 +Summary: Apache Felix Gogo command line shell for OSGi +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html +Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz +Source1: %{bundle}-build.xml +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: javapackages-local >= 6 +BuildRequires: osgi-annotation +BuildRequires: osgi-compendium +BuildRequires: osgi-core +BuildArch: noarch + +%description +Apache Felix Gogo is a subproject of Apache Felix implementing a command +line shell for OSGi. It is used in many OSGi runtimes and servers. + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Libraries/Java + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n %{bundle}-%{version} +cp %{SOURCE1} build.xml + +# Use compendium dep +%pom_remove_dep :org.osgi.namespace.service +%pom_remove_dep :org.osgi.service.component.annotations +%pom_remove_dep :org.osgi.service.event +%pom_xpath_inject "pom:dependencies" " + +org.osgi +osgi.cmpn +" + +# These are test dependencies +%pom_change_dep junit: :::test +%pom_change_dep org.mockito: :::test + +%build +mkdir -p lib +build-jar-repository -s lib osgi-annotation osgi-core osgi-compendium +%{ant} jar javadoc + +%install +# jar +install -d -m 755 %{buildroot}%{_javadir}/felix +install -m 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{bundle}.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir}/felix +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom +%add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -r target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE NOTICE + +%changelog diff --git a/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz b/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz new file mode 100644 index 0000000..b6ce8b9 --- /dev/null +++ b/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d84b5945df650a1bf4f171328d7ef90052a16f7a9f9c6413def4294bb87b780d +size 117060 diff --git a/org.apache.felix.gogo.runtime-build.xml b/org.apache.felix.gogo.runtime-build.xml new file mode 100644 index 0000000..e7d69a2 --- /dev/null +++ b/org.apache.felix.gogo.runtime-build.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +