From 8ddf95f367d5e7c6dd339744dc93bc9a936c55ff Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 19 Mar 2021 14:46:33 +0000
Subject: [PATCH] Merged update from upstream sources

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-shell.git#a845091900508df73496d150227680b8158af662
---
 .gitignore            |  1 +
 felix-gogo-shell.spec | 25 ++++++++++++++++++-------
 sources               |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e17760b..0895ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /.build-*.log
 /felix-1.0.0.tar.gz
 /org.apache.felix.gogo.shell-1.1.0-source-release.tar.gz
+/org.apache.felix.gogo.shell-1.1.4-source-release.tar.gz
diff --git a/felix-gogo-shell.spec b/felix-gogo-shell.spec
index a50ae7b..82b46a5 100644
--- a/felix-gogo-shell.spec
+++ b/felix-gogo-shell.spec
@@ -1,23 +1,27 @@
 %global bundle  org.apache.felix.gogo.shell
 
+%bcond_without tests
+
 Name:           felix-gogo-shell
-Version:        1.1.0
-Release:        7%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Apache Felix Gogo command line shell for OSGi
 License:        ASL 2.0
-URL:            http://felix.apache.org/documentation/subprojects/apache-felix-gogo.html
+URL:            https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html
 BuildArch:      noarch
 
 Source0:        http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
 
 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.apache.felix:org.apache.felix.gogo.runtime)
-BuildRequires:  mvn(org.mockito:mockito-core)
-BuildRequires:  mvn(org.osgi:osgi.cmpn)
+BuildRequires:  mvn(org.osgi:osgi.annotation)
 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
@@ -38,7 +42,11 @@ This package contains the API documentation for %{name}.
 %mvn_file : felix/%{bundle}
 
 %build
+%if %{with tests}
 %mvn_build
+%else
+%mvn_build -f
+%endif
 
 %install
 %mvn_install
@@ -50,6 +58,9 @@ This package contains the API documentation for %{name}.
 %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-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 42bdd18..76a6fed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (org.apache.felix.gogo.shell-1.1.0-source-release.tar.gz) = b69e39d6ba16bff6298a039115cbd546f11c6710d04862c1d42c03247a9419ea401406e745f015711bae035e07b3cb7144f14a6e17f6195314d065ecebbe0ddb
+SHA512 (org.apache.felix.gogo.shell-1.1.4-source-release.tar.gz) = caef827ef1f2698897d06970d5721e9cd1fccb0d4dc41f5ba0431a009058449146620310e3d073c7ac6765b93bc57668b0fea5019c64949ce3078c5e2adc5d42