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-command.git#db6e73ecf99ba388e4269ca9723ff2689f2979ff

.gitignore

@@ -4,3 +4,4 @@
 /.project
 /.build-*.log
 /org.apache.felix.gogo.command-1.0.2-source-release.tar.gz
+/org.apache.felix.gogo.command-1.1.2-source-release.tar.gz

felix-gogo-command.spec

@@ -1,23 +1,28 @@
 %global bundle  org.apache.felix.gogo.command
 
+%bcond_without tests
+
 Name:           felix-gogo-command
-Version:        1.0.2
-Release:        13%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Apache Felix Gogo command line shell for OSGi
 License:        ASL 2.0
 URL:            https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html
 BuildArch:      noarch
 
-Source0:        https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz
+Source0:        http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(org.apache.felix:gogo-parent:pom:)
+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.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
@@ -36,14 +41,20 @@ This package contains API documentation for %{name}.
 
 %mvn_file : felix/%{bundle}
 
-# Use provided scope because this is useful on OSGi frameworks other than Felix
-%pom_change_dep :org.osgi.core :osgi.core::provided
-%pom_change_dep :org.osgi.compendium :osgi.cmpn::provided
-
-%pom_add_dep junit:junit::test
+# Use compendium dep
+%pom_remove_dep :org.osgi.service.log
+%pom_xpath_inject "pom:dependencies" "
+<dependency>
+<groupId>org.osgi</groupId>
+<artifactId>osgi.cmpn</artifactId>
+</dependency>"
 
 %build
+%if %{with tests}
 %mvn_build
+%else
+%mvn_build -f
+%endif
 
 %install
 %mvn_install
@@ -55,6 +66,9 @@ This package contains API documentation for %{name}.
 %license LICENSE NOTICE
 
 %changelog
+* Sat Mar 06 2021 Mat Booth <mat.booth@redhat.com> - 1.1.2-1
+- Update to latest upstream release
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (org.apache.felix.gogo.command-1.0.2-source-release.tar.gz) = 43b1da06ea884e16b330d5a95d1f59de4ef6f693d55016d588e88f292318afa304fb2a4cd69e0e86933ed8ea50625a57185f8b30c95eeda22e9bcba87c2cc362
+SHA512 (org.apache.felix.gogo.command-1.1.2-source-release.tar.gz) = 0b1949e0322fc4df6c24c3aee47c3a23f6f328556c4b7d366aa484b5c61642719fa997085ec98b4054d52d488f975739ecba30798093959e4e83f93c153ccbbb