Accepting request 1145280 from Java:packages
1.1.6 OBS-URL: https://build.opensuse.org/request/show/1145280 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/felix-gogo-runtime?expand=0&rev=5
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
1ec4d29e17
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package felix-gogo-runtime
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# 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
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%global bundle org.apache.felix.gogo.runtime
|
||||
Name: felix-gogo-runtime
|
||||
Version: 1.1.0
|
||||
Version: 1.1.6
|
||||
Release: 0
|
||||
Summary: Apache Felix Gogo command line shell for OSGi
|
||||
License: Apache-2.0
|
||||
@ -28,7 +28,8 @@ Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source
|
||||
Source1: %{bundle}-build.xml
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: osgi-annotation
|
||||
BuildRequires: osgi-compendium
|
||||
BuildRequires: osgi-core
|
||||
BuildArch: noarch
|
||||
@ -48,12 +49,23 @@ This package contains the API documentation for %{name}.
|
||||
%setup -q -n %{bundle}-%{version}
|
||||
cp %{SOURCE1} build.xml
|
||||
|
||||
%pom_remove_parent
|
||||
%pom_xpath_inject pom:project "<groupId>org.apache.felix</groupId>"
|
||||
# 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-core osgi-compendium
|
||||
build-jar-repository -s lib osgi-annotation osgi-core osgi-compendium
|
||||
%{ant} jar javadoc
|
||||
|
||||
%install
|
||||
@ -63,7 +75,7 @@ install -m 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{b
|
||||
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}/felix
|
||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
|
||||
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
|
||||
%add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar
|
||||
|
||||
# javadoc
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d629b24ba1cfa3f7fae2d1028c36261c108d96c7286437fe745540f4e29d78b4
|
||||
size 113996
|
||||
BIN
org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz
(Stored with Git LFS)
Normal file
BIN
org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -8,9 +8,10 @@
|
||||
|
||||
<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.0"/>
|
||||
<property name="project.version" value="1.1.6"/>
|
||||
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<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}"/>
|
||||
@ -51,6 +52,7 @@
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
release="${compiler.release}"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
@ -112,13 +114,14 @@
|
||||
<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="${project.version}";uses:="org.apache.felix.gogo.runtime,org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework",org.apache.felix.gogo.runtime.threadio;version="${project.version}";uses:="org.apache.felix.service.threadio",org.apache.felix.gogo.runtime;version="${project.version}";uses:="org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework",org.apache.felix.service.command;version="1.0.0",org.apache.felix.service.threadio;version="1.0.0""/>
|
||||
<attribute name="Import-Package" value="java.io,java.lang,java.lang.annotation,java.lang.invoke,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.function,java.util.logging,java.util.regex,org.apache.felix.gogo.runtime.threadio;version="[1.1,2)",org.apache.felix.gogo.runtime;version="[1.1,2)",org.apache.felix.service.command;version="[1.0,2)",org.apache.felix.service.threadio;version="[1.0,2)",org.osgi.framework;version="[1.9,2)",org.osgi.service.event;resolution:=optional;version="[1.4,2)",org.osgi.util.tracker;version="[1.5,2)""/>
|
||||
<attribute name="Export-Package" value="org.apache.felix.gogo.runtime.activator;version="${project.version}";uses:="org.apache.felix.gogo.runtime,org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework",org.apache.felix.gogo.runtime.threadio;version="${project.version}";uses:="org.apache.felix.service.threadio",org.apache.felix.gogo.runtime;version="${project.version}";uses:="org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework",org.apache.felix.service.command.annotations;version="1.0.0",org.apache.felix.service.command;version="1.0.0",org.apache.felix.service.threadio;version="1.0.0""/>
|
||||
<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="[1.1,2)",org.apache.felix.service.command;version="[1.0,2)",org.apache.felix.service.threadio;version="[1.0,2)",org.osgi.framework;version="[1.10,2)",org.osgi.service.event;resolution:=optional;version="[1.4,2)",org.osgi.util.tracker;version="[1.5,2)""/>
|
||||
<attribute name="Manifest-Version" value="1.0"/>
|
||||
<attribute name="Provide-Capability" value="org.apache.felix.gogo;org.apache.felix.gogo="runtime.implementation";version:Version="1.0.0",osgi.service;objectClass="org.apache.felix.service.command.CommandProcessor",osgi.service;objectClass="org.apache.felix.service.threadio.ThreadIO""/>
|
||||
<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
|
||||
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
|
||||
<attribute name="JavaPackages-Version" value="${project.version}"/>
|
||||
<attribute name="Provide-Capability" value="org.apache.felix.gogo;org.apache.felix.gogo="runtime.implementation";version:Version="1.0.0",osgi.service;effective:=active;objectClass="org.apache.felix.service.command.CommandProcessor",osgi.service;effective:=active;objectClass="org.apache.felix.service.threadio.ThreadIO""/>
|
||||
<attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
|
||||
<attribute name="Require-Capability" value="org.apache.felix.gogo;filter:="(&(org.apache.felix.gogo=shell.implementation)(version>=1.0.0)(!(version>=2.0.0)))";effective:=active,osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))""/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user