rpms/felix-gogo-runtime
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/felix-gogo-runtime.git#177c9383ee5c21f74a286d4158263783d6c49a46
This commit is contained in:
DistroBaker 2021-03-19 14:46:23 +00:00
parent 90f85be34e
commit e7b6cce3d3
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/org.apache.felix.gogo.runtime-0.16.2-project.tar.gz
/org.apache.felix.gogo.runtime-1.0.4-source-release.tar.gz
/org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz
/org.apache.felix.gogo.runtime-1.1.4-source-release.tar.gz

34
felix-gogo-runtime.spec
View File

@ -1,8 +1,10 @@
%global bundle org.apache.felix.gogo.runtime
%bcond_without tests
Name: felix-gogo-runtime
Version: 1.1.0
Release: 9%{?dist}
Version: 1.1.4
Release: 1%{?dist}
Summary: Apache Felix Gogo command line shell for OSGi
# One file is also MIT licensed:
# src/main/java/org/apache/felix/gogo/runtime/Expression.java
@ -14,12 +16,15 @@ Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:gogo-parent:pom:) >= 4
BuildRequires: mvn(org.apache.felix:gogo-parent:pom:) >= 5
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: mvn(org.osgi:osgi.annotation)
BuildRequires: mvn(org.osgi:osgi.cmpn)
BuildRequires: mvn(org.osgi:osgi.core)
%if %{with tests}
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.mockito:mockito-core)
%endif
%description
Apache Felix Gogo is a subproject of Apache Felix implementing a command
@ -34,13 +39,27 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{bundle}-%{version}
# 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>"
# Remove 2 failing assertions on Java 11 in TestParser.testPipe()
sed -i '/(echoout/ d' src/test/java/org/apache/felix/gogo/runtime/TestParser.java
%mvn_file : felix/%{bundle}
%build
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dsource=1.8 -DdetectJavaApiLink=false
%if %{with tests}
%mvn_build -- -Dsource=1.8 -DdetectJavaApiLink=false
%else
%mvn_build -f -- -Dsource=1.8 -DdetectJavaApiLink=false
%endif
%install
%mvn_install
@ -52,6 +71,9 @@ sed -i '/(echoout/ d' src/test/java/org/apache/felix/gogo/runtime/TestParser.jav
%license LICENSE NOTICE
%changelog
* Sat Mar 06 2021 Mat Booth <mat.booth@redhat.com> - 1.1.4-1
- Update to latest upstream release
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz) = f66ad084669770e3619b8e13d504d13ebb3dffdc86a875e7767bf5fa7f7c427abe91a754eae7dfadeaa46555fe4c07a9c2a2dfbdb23bf992d652a2c4fbd304b8
SHA512 (org.apache.felix.gogo.runtime-1.1.4-source-release.tar.gz) = 96ca48ee46e4968762ad9fcfc704e92e7dd2064ad3820c931a89893a8daf31523a35fbe87228e65750ba481f959bdeebc00a0ad346513eec51a9d0b77bc2ade7