Sync from SUSE:SLFO:Main felix-gogo-runtime revision 5cf400203582b47b8779aece7d20beb2

This commit is contained in:
Adrian Schröter 2024-05-03 12:26:49 +02:00
commit 9ae00afbc6
5 changed files with 294 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -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

View File

@ -0,0 +1,40 @@
-------------------------------------------------------------------
Thu Feb 8 17:35:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>
- Advertize capability needed by other felix-gogo artifacts
-------------------------------------------------------------------
Wed Mar 16 13:12:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>
- Specify maven.compiler.release to fix javadoc build with jdk11
-------------------------------------------------------------------
Wed May 8 11:29:37 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of felix-gogo-runtime 1.1.0

93
felix-gogo-runtime.spec Normal file
View File

@ -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" "
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
</dependency>"
# 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

BIN
org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,135 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.apache.felix.gogo.runtime" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property name="project.groupId" value="org.apache.felix"/>
<property name="project.artifactId" value="org.apache.felix.gogo.runtime"/>
<property name="project.version" value="1.1.6"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<fileset dir="lib">
<include name="**/*"/>
</fileset>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
encoding="UTF-8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
verbose="false"
encoding="UTF-8"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="UTF-8"
linksource="false"
breakiterator="false"
source="${compiler.source}">
<classpath refid="build.classpath"/>
</javadoc>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
excludes="**/package.html">
<manifest>
<attribute name="Bundle-Activator" value="org.apache.felix.gogo.runtime.activator.Activator"/>
<attribute name="Bundle-Description" value="Apache Felix Gogo Subproject"/>
<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
<attribute name="Bundle-License" value="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Name" value="Apache Felix Gogo Runtime"/>
<attribute name="Bundle-SymbolicName" value="${project.artifactId}"/>
<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
<attribute name="Bundle-Version" value="${project.version}"/>
<attribute name="Export-Package" value="org.apache.felix.gogo.runtime.activator;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.gogo.runtime,org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework&quot;,org.apache.felix.gogo.runtime.threadio;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.service.threadio&quot;,org.apache.felix.gogo.runtime;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework&quot;,org.apache.felix.service.command.annotations;version=&quot;1.0.0&quot;,org.apache.felix.service.command;version=&quot;1.0.0&quot;,org.apache.felix.service.threadio;version=&quot;1.0.0&quot;"/>
<attribute name="Import-Package" value="java.io,java.lang,java.lang.annotation,java.lang.reflect,java.math,java.net,java.nio,java.nio.channels,java.nio.channels.spi,java.nio.file,java.nio.file.attribute,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.logging,java.util.regex,org.apache.felix.gogo.runtime.threadio;version=&quot;[1.1,2)&quot;,org.apache.felix.service.command;version=&quot;[1.0,2)&quot;,org.apache.felix.service.threadio;version=&quot;[1.0,2)&quot;,org.osgi.framework;version=&quot;[1.10,2)&quot;,org.osgi.service.event;resolution:=optional;version=&quot;[1.4,2)&quot;,org.osgi.util.tracker;version=&quot;[1.5,2)&quot;"/>
<attribute name="Manifest-Version" value="1.0"/>
<attribute name="Provide-Capability" value="org.apache.felix.gogo;org.apache.felix.gogo=&quot;runtime.implementation&quot;;version:Version=&quot;1.0.0&quot;,osgi.service;objectClass=&quot;org.apache.felix.service.command.CommandProcessor&quot;,osgi.service;objectClass=&quot;org.apache.felix.service.threadio.ThreadIO&quot;"/>
<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
<attribute name="JavaPackages-Version" value="${project.version}"/>
<attribute name="Require-Capability" value="org.apache.felix.gogo;filter:=&quot;(&amp;(org.apache.felix.gogo=shell.implementation)(version>=1.0.0)(!(version>=2.0.0)))&quot;;effective:=active,osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.8))&quot;"/>
</manifest>
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
</project>